From: William A. Rowe Jr <wrowe@apache.org>
Date: Tue, 16 Aug 2016 22:29:39 +0000 (+0000)
Subject: Correct AP_HTTP_CONFORMANCE_ flags with an ap_mmn.h bump
X-Git-Tag: 2.5.0-alpha~1274
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=35f12766bc8e9e18e5e4a39e9b94fba60f872fd0;p=thirdparty%2Fapache%2Fhttpd.git

Correct AP_HTTP_CONFORMANCE_ flags with an ap_mmn.h bump


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

diff --git a/include/ap_mmn.h b/include/ap_mmn.h
index 940b3cc8524..a5936778633 100644
--- a/include/ap_mmn.h
+++ b/include/ap_mmn.h
@@ -539,6 +539,9 @@
  * 20160608.7 (2.5.0-dev)  Add ap_check_pipeline().
  * 20160608.8 (2.5.0-dev)  Rename ap_proxy_check_backend() to
  *                         ap_proxy_check_connection().
+ * 20160608.9 (2.5.0-dev)  Renamed AP_HTTP_CONFORMANCE_LIBERAL to 
+ *                         AP_HTTP_CONFORMANCE_UNSAFE, and
+ *                         eliminated AP_HTTP_CONFORMANCE_LOGONLY
  */
 
 #define MODULE_MAGIC_COOKIE 0x41503235UL /* "AP25" */
@@ -546,7 +549,7 @@
 #ifndef MODULE_MAGIC_NUMBER_MAJOR
 #define MODULE_MAGIC_NUMBER_MAJOR 20160608
 #endif
-#define MODULE_MAGIC_NUMBER_MINOR 8                 /* 0...n */
+#define MODULE_MAGIC_NUMBER_MINOR 9                 /* 0...n */
 
 /**
  * Determine if the server's current MODULE_MAGIC_NUMBER is at least a
diff --git a/include/http_core.h b/include/http_core.h
index 3bd6663657a..0a434d34aa3 100644
--- a/include/http_core.h
+++ b/include/http_core.h
@@ -735,9 +735,8 @@ typedef struct {
     char http09_enable;
 
 #define AP_HTTP_CONFORMANCE_UNSET     0
-#define AP_HTTP_CONFORMANCE_LIBERAL   1
+#define AP_HTTP_CONFORMANCE_UNSAFE    1
 #define AP_HTTP_CONFORMANCE_STRICT    2
-#define AP_HTTP_CONFORMANCE_LOGONLY   4
     char http_conformance;
 
 #define AP_HTTP_CL_HEAD_ZERO_UNSET    0