Upstream tarball 2.2.8upstream/2.2.8

6 files changed, 37 insertions, 3 deletions

diff --git a/include/ap_mmn.h b/include/ap_mmn.h
index 95871f1b..380346b2 100644
--- a/include/ap_mmn.h
+++ b/include/ap_mmn.h
@@ -114,6 +114,12 @@
  * 20051115.4 (2.2.4)  Added ap_get_server_banner() and
  *                         ap_get_server_description() (minor)
  * 20051115.5 (2.2.5)  Added ap_mpm_safe_kill() (minor)
+ * 20051115.6 (2.2.7)  Added retry_set to proxy_worker (minor)
+ * 20051115.7 (2.2.7)  Added conn_rec::clogging_input_filters (minor)
+ * 20051115.8 (2.2.7)  Added flags to proxy_alias (minor)
+ * 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
  *
  */
 
@@ -122,7 +128,7 @@
 #ifndef MODULE_MAGIC_NUMBER_MAJOR
 #define MODULE_MAGIC_NUMBER_MAJOR 20051115
 #endif
-#define MODULE_MAGIC_NUMBER_MINOR 5                     /* 0...n */
+#define MODULE_MAGIC_NUMBER_MINOR 11                    /* 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 1777fd05..1e505f06 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 2007 The Apache Software Foundation."
+    "Copyright 2008 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   6
+#define AP_SERVER_PATCHLEVEL_NUMBER   8
 #define AP_SERVER_DEVBUILD_BOOLEAN    0
 
 #if AP_SERVER_DEVBUILD_BOOLEAN
diff --git a/include/http_protocol.h b/include/http_protocol.h
index e8355e17..276d09bf 100644
--- a/include/http_protocol.h
+++ b/include/http_protocol.h
@@ -664,6 +664,13 @@ AP_DECLARE(void) ap_set_sub_req_protocol(request_rec *rnew, const request_rec *r
  * @param sub_r Subrequest that is now compete
  */
 AP_DECLARE(void) ap_finalize_sub_req_protocol(request_rec *sub_r);
+
+/**
+ * Send an interim (HTTP 1xx) response immediately.
+ * @param r The request
+ * @param send_headers Whether to send&clear headers in r->headers_out
+ */
+AP_DECLARE(void) ap_send_interim_response(request_rec *r, int send_headers);
                                                                                 
 #ifdef __cplusplus
 }
diff --git a/include/httpd.h b/include/httpd.h
index d4f61c4f..15e1f11d 100644
--- a/include/httpd.h
+++ b/include/httpd.h
@@ -233,6 +233,14 @@ extern "C" {
 #define DEFAULT_CONTENT_TYPE "text/plain"
 #endif
 
+/**
+ * NO_CONTENT_TYPE is an alternative DefaultType value that suppresses
+ * setting any default type when there's no information (e.g. a proxy).
+ */
+#ifndef NO_CONTENT_TYPE
+#define NO_CONTENT_TYPE "none"
+#endif
+
 /** The name of the MIME types file */
 #ifndef AP_TYPES_CONFIG_FILE
 #define AP_TYPES_CONFIG_FILE "conf/mime.types"
@@ -1088,6 +1096,11 @@ struct conn_rec {
     conn_state_t *cs;
     /** Is there data pending in the input filters? */ 
     int data_in_input_filters;
+    
+    /** Are there any filters that clogg/buffer the input stream, breaking
+     *  the event mpm.
+     */
+    int clogging_input_filters;
 };
 
 /** 
diff --git a/include/scoreboard.h b/include/scoreboard.h
index 103cea7b..bf43cd3f 100644
--- a/include/scoreboard.h
+++ b/include/scoreboard.h
@@ -197,6 +197,7 @@ AP_DECLARE(lb_score *) ap_get_scoreboard_lb(int lb_num);
 AP_DECLARE_DATA extern scoreboard *ap_scoreboard_image;
 AP_DECLARE_DATA extern const char *ap_scoreboard_fname;
 AP_DECLARE_DATA extern int ap_extended_status;
+AP_DECLARE_DATA extern int ap_mod_status_reqtail;
 
 AP_DECLARE_DATA extern ap_generation_t volatile ap_my_generation;
 
diff --git a/include/util_ldap.h b/include/util_ldap.h
index f0dca264..75a9d70a 100644
--- a/include/util_ldap.h
+++ b/include/util_ldap.h
@@ -30,6 +30,13 @@
 #include "apr_time.h"
 #include "apr_ldap.h"
 
+#if APR_HAS_MICROSOFT_LDAPSDK
+#define AP_LDAP_IS_SERVER_DOWN(s)                ((s) == LDAP_SERVER_DOWN \
+                ||(s) == LDAP_UNAVAILABLE)
+#else
+#define AP_LDAP_IS_SERVER_DOWN(s)                ((s) == LDAP_SERVER_DOWN)
+#endif
+
 #if APR_HAS_SHARED_MEMORY
 #include "apr_rmm.h"
 #include "apr_shm.h"