Upstream tarball 2.2.16upstream/2.2.16

4 files changed, 12 insertions, 6 deletions

diff --git a/include/ap_config_auto.h.in b/include/ap_config_auto.h.in
index 8b630c08..6ea7e6f1 100644
--- a/include/ap_config_auto.h.in
+++ b/include/ap_config_auto.h.in
@@ -205,6 +205,9 @@
 /* Define to the one symbol short name of this package. */
 #undef PACKAGE_TARNAME
 
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
diff --git a/include/ap_release.h b/include/ap_release.h
index 528c4d70..0bbd9dc9 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   15
+#define AP_SERVER_PATCHLEVEL_NUMBER   16
 #define AP_SERVER_DEVBUILD_BOOLEAN    0
 
 #if AP_SERVER_DEVBUILD_BOOLEAN
diff --git a/include/httpd.h b/include/httpd.h
index 30bdc71b..40351b79 100644
--- a/include/httpd.h
+++ b/include/httpd.h
@@ -940,7 +940,7 @@ struct request_rec {
 
     /** The URI without any parsing performed */
     char *unparsed_uri;	
-    /** The path portion of the URI */
+    /** The path portion of the URI, or "/" if no path provided */
     char *uri;
     /** The filename on disk corresponding to this response */
     char *filename;
diff --git a/include/util_filter.h b/include/util_filter.h
index d0846d9f..dbcb4370 100644
--- a/include/util_filter.h
+++ b/include/util_filter.h
@@ -221,10 +221,13 @@ struct ap_filter_rec_t {
     /** The function to call when this filter is invoked. */
     ap_filter_func filter_func;
 
-    /** The function to call before the handlers are invoked. Notice
-     * that this function is called only for filters participating in
-     * the http protocol. Filters for other protocols are to be
-     * initialized by the protocols themselves.
+    /** The function to call directly before the handlers are invoked
+     * for a request.  The init function is called once directly
+     * before running the handlers for a request or subrequest.  The
+     * init function is never called for a connection filter (with
+     * ftype >= AP_FTYPE_CONNECTION).  Any use of this function for
+     * filters for protocols other than HTTP is specified by the
+     * module supported that protocol.
      */
     ap_init_filter_func filter_init_func;