The fix requires a bump

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94637 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index a6d4c86a9d571d17c4bd4de1e23375154e9c28cc..0e30f9342c82de07e9a7abf8cd74938b455e7522 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,10 @@
 Changes with Apache 2.0.36
 
+  *) Allow Win32 shebang scripts to follow the path (or omit the .exe
+     suffix from the shebang command), and allow ScriptInterpreterSource
+     Registry or RegistryStrict to override shebang lines, as 1.3 did.
+     [William Rowe]
+
   *) worker MPM: Fix a situation where a child exited without releasing
      the accept mutex.  Depending on the OS and mutex mechanism this 
      could result in a hang.  [Jeff Trawick]

diff --git a/include/ap_mmn.h b/include/ap_mmn.h
index 4af558f9fa1e50fd2f9a20a719007d897b826a00..706cb2728dc6857bf4d95109bb115d8d35620fc8 100644 (file)
--- a/include/ap_mmn.h
+++ b/include/ap_mmn.h
@@ -103,12 +103,13 @@
  * 20020319 (2.0.34-dev) M_INVALID changed, plus new M_* methods for RFC 3253
  * 20020327 (2.0.35-dev) Add parameter to quick_handler hook
  * 20020329 (2.0.35-dev) bump for addition of freelists to bucket API
+ * 20020413 (2.0.36-dev) bump for new arg to opt fn ap_cgi_build_command
  */
 
 #define MODULE_MAGIC_COOKIE 0x41503230UL /* "AP20" */
 
 #ifndef MODULE_MAGIC_NUMBER_MAJOR
-#define MODULE_MAGIC_NUMBER_MAJOR 20020329
+#define MODULE_MAGIC_NUMBER_MAJOR 20020413
 #endif
 #define MODULE_MAGIC_NUMBER_MINOR 0                     /* 0...n */
 #define MODULE_MAGIC_NUMBER MODULE_MAGIC_NUMBER_MAJOR  /* backward compat */