Upstream tarball 2.2.9upstream/2.2.9

5 files changed, 37 insertions, 9 deletions

diff --git a/include/ap_config_auto.h.in b/include/ap_config_auto.h.in
index 95323f08..fa084649 100644
--- a/include/ap_config_auto.h.in
+++ b/include/ap_config_auto.h.in
@@ -220,13 +220,6 @@
 /* Path to suexec binary */
 #undef SUEXEC_BIN
 
-/* Define to 1 if on AIX 3.
-   System headers sometimes define this.
-   We just want to avoid a redefinition error message.  */
-#ifndef _ALL_SOURCE
-# undef _ALL_SOURCE
-#endif
-
 /* Define to 1 if on MINIX. */
 #undef _MINIX
 
@@ -237,6 +230,28 @@
 /* Define to 1 if you need to in order for `stat' and other things to work. */
 #undef _POSIX_SOURCE
 
+/* Enable extensions on AIX 3, Interix.  */
+#ifndef _ALL_SOURCE
+# undef _ALL_SOURCE
+#endif
+/* Enable GNU extensions on systems that have them.  */
+#ifndef _GNU_SOURCE
+# undef _GNU_SOURCE
+#endif
+/* Enable threading extensions on Solaris.  */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# undef _POSIX_PTHREAD_SEMANTICS
+#endif
+/* Enable extensions on HP NonStop.  */
+#ifndef _TANDEM_SOURCE
+# undef _TANDEM_SOURCE
+#endif
+/* Enable general extensions on Solaris.  */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
+#endif
+
+
 /* Define to empty if `const' does not conform to ANSI C. */
 #undef const
 
diff --git a/include/ap_mmn.h b/include/ap_mmn.h
index 380346b2..2c226b6c 100644
--- a/include/ap_mmn.h
+++ b/include/ap_mmn.h
@@ -120,6 +120,14 @@
  * 20051115.9 (2.2.7)  Add ap_send_interim_response API
  * 20051115.10(2.2.7)  Added ap_mod_status_reqtail (minor)
  * 20051115.11(2.2.7)  Add *ftp_directory_charset to proxy_dir_conf
+ * 20051115.12(2.2.8)  Add optional function ap_logio_add_bytes_in() to mog_logio
+ * 20051115.13(2.2.9)  Add disablereuse and disablereuse_set
+ *                     to proxy_worker struct (minor)
+ * 20051115.14(2.2.9)  Add ap_proxy_ssl_connection_cleanup and
+ *                     add *scpool, *r and need_flush to proxy_conn_rec
+ *                     structure
+ * 20051115.15(2.2.9)  Add interpolate_env to proxy_dir_conf and
+ *                     introduce proxy_req_conf.
  *
  */
 
@@ -128,7 +136,7 @@
 #ifndef MODULE_MAGIC_NUMBER_MAJOR
 #define MODULE_MAGIC_NUMBER_MAJOR 20051115
 #endif
-#define MODULE_MAGIC_NUMBER_MINOR 11                    /* 0...n */
+#define MODULE_MAGIC_NUMBER_MINOR 15                    /* 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 1e505f06..af9b3233 100644
--- a/include/ap_release.h
+++ b/include/ap_release.h
@@ -45,7 +45,7 @@
 
 #define AP_SERVER_MAJORVERSION_NUMBER 2
 #define AP_SERVER_MINORVERSION_NUMBER 2
-#define AP_SERVER_PATCHLEVEL_NUMBER   8
+#define AP_SERVER_PATCHLEVEL_NUMBER   9
 #define AP_SERVER_DEVBUILD_BOOLEAN    0
 
 #if AP_SERVER_DEVBUILD_BOOLEAN
diff --git a/include/http_core.h b/include/http_core.h
index 28f2856f..395ac421 100644
--- a/include/http_core.h
+++ b/include/http_core.h
@@ -672,6 +672,9 @@ AP_DECLARE_HOOK(int, get_mgmt_items,
 APR_DECLARE_OPTIONAL_FN(void, ap_logio_add_bytes_out,
                         (conn_rec *c, apr_off_t bytes));
 
+APR_DECLARE_OPTIONAL_FN(void, ap_logio_add_bytes_in,
+                        (conn_rec *c, apr_off_t bytes));
+
 /* ----------------------------------------------------------------------
  *
  * ident lookups with mod_ident
diff --git a/include/httpd.h b/include/httpd.h
index 15e1f11d..542b6eaa 100644
--- a/include/httpd.h
+++ b/include/httpd.h
@@ -666,6 +666,8 @@ struct ap_method_list_t {
 #define LF '\n'
 #define CRLF "\r\n"
 #endif /* APR_CHARSET_EBCDIC */                                   
+/** Useful for common code with either platform charset. */
+#define CRLF_ASCII "\015\012"
 
 /**
  * @defgroup values_request_rec_body Possible values for request_rec.read_body