Upstream tarball 2.2.19upstream/2.2.19

6 files changed, 36 insertions, 5 deletions

diff --git a/include/ap_config.h b/include/ap_config.h
index f729adc0..dd977a6c 100644
--- a/include/ap_config.h
+++ b/include/ap_config.h
@@ -230,7 +230,7 @@
         APR_OPTIONAL_HOOK(ap,name,fn,pre,succ,order)
 
 #include "os.h"
-#if !defined(WIN32) && !defined(NETWARE)
+#if (!defined(WIN32) && !defined(NETWARE)) || defined(__MINGW32__)
 #include "ap_config_auto.h"
 #include "ap_config_layout.h"
 #endif
diff --git a/include/ap_mmn.h b/include/ap_mmn.h
index ba1ca0bf..58951c0e 100644
--- a/include/ap_mmn.h
+++ b/include/ap_mmn.h
@@ -140,6 +140,12 @@
  *                      and conditional cmdtype member of piped_log struct
  * 20051115.24 (2.2.15) Add forward member to proxy_conn_rec
  * 20051115.25 (2.2.17) Add errstatuses member to proxy_balancer
+ * 20051115.26 (2.2.18) Add ap_cache_check_allowed()
+ * 20051115.27 (2.2.18) BROKEN ABI fixed in 2.2.19: 
+ *                      ap_unescape_url_keep2f() signature change
+ *                      Add core_dir_config.decode_encoded_slashes.
+ * 20051115.28 (2.2.19) Restore ap_unescape_url_keep2f(char *url) signature 
+ *                      altered in 2.2.18.  Add ap_unescape_url_keep2f_ex().
  */
 
 #define MODULE_MAGIC_COOKIE 0x41503232UL /* "AP22" */
@@ -147,7 +153,7 @@
 #ifndef MODULE_MAGIC_NUMBER_MAJOR
 #define MODULE_MAGIC_NUMBER_MAJOR 20051115
 #endif
-#define MODULE_MAGIC_NUMBER_MINOR 25                    /* 0...n */
+#define MODULE_MAGIC_NUMBER_MINOR 28                    /* 0...n */
 
 /**
  * Determine if the server's current MODULE_MAGIC_NUMBER is at least a
diff --git a/include/ap_release.h b/include/ap_release.h
index 546493d2..b4735260 100644
--- a/include/ap_release.h
+++ b/include/ap_release.h
@@ -25,7 +25,7 @@
 #include "apr_general.h" /* stringify */
 
 #define AP_SERVER_COPYRIGHT \
-    "Copyright 2009 The Apache Software Foundation."
+    "Copyright 2011 The Apache Software Foundation."
 
 /*
  * The below defines the base string of the Server: header. Additional
@@ -45,7 +45,7 @@
 
 #define AP_SERVER_MAJORVERSION_NUMBER 2
 #define AP_SERVER_MINORVERSION_NUMBER 2
-#define AP_SERVER_PATCHLEVEL_NUMBER   17
+#define AP_SERVER_PATCHLEVEL_NUMBER   19
 #define AP_SERVER_DEVBUILD_BOOLEAN    0
 
 #if AP_SERVER_DEVBUILD_BOOLEAN
diff --git a/include/http_core.h b/include/http_core.h
index f124f219..0b96cca5 100644
--- a/include/http_core.h
+++ b/include/http_core.h
@@ -568,6 +568,8 @@ typedef struct {
 #define USE_CANONICAL_PHYS_PORT_UNSET (2)
     unsigned use_canonical_phys_port : 2;
 
+
+    unsigned int decode_encoded_slashes : 1; /* whether to decode encoded slashes in URLs */
 } core_dir_config;
 
 /* Per-server core configuration */
diff --git a/include/httpd.h b/include/httpd.h
index 40351b79..81175280 100644
--- a/include/httpd.h
+++ b/include/httpd.h
@@ -154,9 +154,11 @@ extern "C" {
 #endif
 
 /** The path to the suExec wrapper, can be overridden in Configuration */
+#if !defined(NETWARE) && !defined(WIN32)
 #ifndef SUEXEC_BIN
 #define SUEXEC_BIN  HTTPD_ROOT "/bin/suexec"
 #endif
+#endif
 
 /** The timeout for waiting for messages */
 #ifndef DEFAULT_TIMEOUT
@@ -1448,13 +1450,21 @@ AP_DECLARE(int) ap_is_url(const char *u);
 AP_DECLARE(int) ap_unescape_url(char *url);
 
 /**
- * Unescape a URL, but leaving %2f (slashes) escaped
+ * Unescape a URL, including encoded slashes.
  * @param url The url to unescape
  * @return 0 on success, non-zero otherwise
  */
 AP_DECLARE(int) ap_unescape_url_keep2f(char *url);
 
 /**
+ * Unescape a URL, including encoded slashes.
+ * @param url The url to unescape
+ * @param decode_slashes Whether or not slashes should be decoded or not
+ * @return 0 on success, non-zero otherwise
+ */
+AP_DECLARE(int) ap_unescape_url_keep2f_ex(char *url, int decode_slashes);
+
+/**
  * Convert all double slashes to single slashes
  * @param name The string to convert
  */
diff --git a/include/mpm_common.h b/include/mpm_common.h
index bacf76f2..125fe809 100644
--- a/include/mpm_common.h
+++ b/include/mpm_common.h
@@ -216,6 +216,19 @@ AP_DECLARE(gid_t) ap_gname2id(const char *name);
 
 #define AP_MPM_HARD_LIMITS_FILE APACHE_MPM_DIR "/mpm_default.h"
 
+#ifndef HAVE_INITGROUPS
+/**
+ * The initgroups() function initializes the group access list by reading the
+ * group database /etc/group and using all groups of which user is a member.
+ * The additional group basegid is also added to the list. 
+ * @param name The user name - must be non-NULL
+ * @param basegid The basegid to add
+ * @return returns 0 on success
+ * @fn int initgroups(const char *name, gid_t basegid)
+ */
+int initgroups(const char *name, gid_t basegid);
+#endif
+
 #ifdef AP_MPM_USES_POD
 
 typedef struct ap_pod_t ap_pod_t;