You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by mi...@apache.org on 2013/05/15 21:31:06 UTC
svn commit: r1483029 - in /httpd/httpd/branches/2.4.x: ./ CHANGES STATUS
server/protocol.c
Author: minfrin
Date: Wed May 15 19:31:06 2013
New Revision: 1483029
URL: http://svn.apache.org/r1483029
Log:
core: Use the proper macro for HTTP/1.1.
trunk patch: http://svn.apache.org/r1482996
Submitted by: minfrin
Reviewed by: covener, jailletc36
Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/CHANGES
httpd/httpd/branches/2.4.x/STATUS
httpd/httpd/branches/2.4.x/server/protocol.c
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1482996
Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1483029&r1=1483028&r2=1483029&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Wed May 15 19:31:06 2013
@@ -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]
Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1483029&r1=1483028&r2=1483029&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Wed May 15 19:31:06 2013
@@ -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 ]
Modified: httpd/httpd/branches/2.4.x/server/protocol.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/server/protocol.c?rev=1483029&r1=1483028&r2=1483029&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/server/protocol.c (original)
+++ httpd/httpd/branches/2.4.x/server/protocol.c Wed May 15 19:31:06 2013
@@ -1717,7 +1717,7 @@ AP_DECLARE(void) ap_send_interim_respons
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;
}