From 378d62ec7b8fea73f1e2deb69521f589c5e7774e Mon Sep 17 00:00:00 2001 From: Graham Leggett Date: Wed, 15 May 2013 19:31:06 +0000 Subject: [PATCH] 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 --- CHANGES | 2 ++ STATUS | 5 ----- server/protocol.c | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/CHANGES b/CHANGES index f48e338551..cdf95d89f4 100644 --- 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 , Christophe Jaillet] diff --git a/STATUS b/STATUS index 62804e1703..ef5515ea1f 100644 --- 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 30553e536d..c2b1f48cd8 100644 --- 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; } -- 2.40.0