core: Use the proper macro for HTTP/1.1.

trunk patch: http://svn.apache.org/r1482996
Submitted by: minfrin
Reviewed by: covener, jailletc36

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1483029 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index f48e338551cce6ea8a6f32330418264b2c724d69..cdf95d89f4fab10256f3501cb26639c2c7f45fa2 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,8 @@
 
 Changes with Apache 2.4.5
 
+  *) core: Use the proper macro for HTTP/1.1. [Graham Leggett]
+
   *) event MPM: Provide error handling for ThreadStackSize. PR 54311
      [Tianyin Xu <tixu cs.ucsd.edu>, Christophe Jaillet]
 

diff --git a/STATUS b/STATUS
index 62804e170335892a21fc7206359c2d056a379633..ef5515ea1fcc86895a2d851be9f4fd830f649ee3 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -90,11 +90,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-    * core: Use the proper macro for HTTP/1.1.
-      trunk patch: http://svn.apache.org/r1482996
-      2.4.x patch: trunk works
-      +1: minfrin, covener, jailletc36
-
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]

diff --git a/server/protocol.c b/server/protocol.c
index 30553e536d6eea7c6455ef6af411efa5d4eb6388..c2b1f48cd865c2472f2f85f555a685e58e7564d0 100644 (file)
--- a/server/protocol.c
+++ b/server/protocol.c
@@ -1717,7 +1717,7 @@ AP_DECLARE(void) ap_send_interim_response(request_rec *r, int send_headers)
     char *status_line = NULL;
     request_rec *rr;
 
-    if (r->proto_num < 1001) {
+    if (r->proto_num < HTTP_VERSION(1,1)) {
         /* don't send interim response to HTTP/1.0 Client */
         return;
     }