Give the request_rec some information about path_info allowance.

  If some unnamed filter will consume the path_info, it may set up
  used_path_info to a non-zero value, and core.c will consume the
  request with path_info.

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

diff --git a/include/ap_mmn.h b/include/ap_mmn.h
index 3ff02e898723c4392e929088368e4cb261cdb57f..558be523a6be4dc49c156919eabb8759ffdfd4ab 100644 (file)
--- a/include/ap_mmn.h
+++ b/include/ap_mmn.h
@@ -82,12 +82,13 @@
  * 20011002 (2.0.26-dev) removed 1.3-depreciated request_rec.content_language
  * 20011127 (2.0.29-dev) bump for postconfig hook change, and removal of socket
  *                       from connection record
+ * 20011212 (2.0.30-dev) bump for new used_path_info member of request_rec
  */
 
 #define MODULE_MAGIC_COOKIE 0x41503230UL /* "AP20" */
 
 #ifndef MODULE_MAGIC_NUMBER_MAJOR
-#define MODULE_MAGIC_NUMBER_MAJOR 20011127
+#define MODULE_MAGIC_NUMBER_MAJOR 20011212
 #endif
 #define MODULE_MAGIC_NUMBER_MINOR 0                     /* 0...n */
 #define MODULE_MAGIC_NUMBER MODULE_MAGIC_NUMBER_MAJOR  /* backward compat */

diff --git a/include/httpd.h b/include/httpd.h
index a6f49f1e545be4bc96df34723b675176824e6dec..258cb407b384a9c63270ee82687e478a090efef6 100644 (file)
--- a/include/httpd.h
+++ b/include/httpd.h
@@ -695,7 +695,7 @@ struct request_rec {
      */
     /** First line of request, so we can log it */
     char *the_request;
-    /** HTTP/0.9, "simple" request */
+    /** HTTP/0.9, "simple" request (e.g. GET /foo\n w/no headers) */
     int assbackwards;
     /** A proxy request (calculated during post_read_request/translate_name)
      *  possible values PROXYREQ_NONE, PROXYREQ_PROXY, PROXYREQ_REVERSE
@@ -854,6 +854,11 @@ struct request_rec {
     /** components of uri, dismantled */
     apr_uri_t parsed_uri;
 
+    /** Flag for the core handler to permit path_info on the current
+        filename, to be consumed by some filter.  Unless this is
+        toggled, path_info requests are rejected by the core */
+    int used_path_info;
+
     /* Various other config info which may change with .htaccess files
      * These are config vectors, with one void* pointer for each module
      * (the thing pointed to being the module's business).