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/06/10 16:28:08 UTC
svn commit: r1491466 - in /httpd/httpd/branches/2.4.x: ./ CHANGES STATUS
modules/proxy/proxy_util.c
Author: minfrin
Date: Mon Jun 10 14:28:08 2013
New Revision: 1491466
URL: http://svn.apache.org/r1491466
Log:
proxy_util: NULL terminate the right buffer in 'send_http_connect'
trunk patch: http://svn.apache.org/r1490994
Submitted by: jailletc36
Reviewed by: covener, minfrin
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/modules/proxy/proxy_util.c
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1490994
Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1491466&r1=1491465&r2=1491466&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Mon Jun 10 14:28:08 2013
@@ -2,6 +2,9 @@
Changes with Apache 2.4.5
+ *) proxy_util: NULL terminate the right buffer in 'send_http_connect'.
+ [Christophe Jaillet]
+
*) mod_remoteip: close file in error path. [Christophe Jaillet]
*) mod_lua: Sync 2.4 branch with trunk. This includes (but is not limited to)
Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1491466&r1=1491465&r2=1491466&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Mon Jun 10 14:28:08 2013
@@ -100,11 +100,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
2.4.x patch: trunk patch works modulo CHANGES and mmn bump
+1: minfrin, jim, sf
- * proxy_util: NULL terminate the right buffer in 'send_http_connect'
- trunk patch: http://svn.apache.org/r1490994
- 2.4.x patch: trunk patch works
- +1: jailletc36, covener, minfrin
-
PATCHES PROPOSED TO BACKPORT FROM TRUNK:
[ New proposals should be added at the end of the list ]
Modified: httpd/httpd/branches/2.4.x/modules/proxy/proxy_util.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/proxy/proxy_util.c?rev=1491466&r1=1491465&r2=1491466&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/proxy/proxy_util.c (original)
+++ httpd/httpd/branches/2.4.x/modules/proxy/proxy_util.c Mon Jun 10 14:28:08 2013
@@ -2316,7 +2316,7 @@ static apr_status_t send_http_connect(pr
nbytes = sizeof(drain_buffer) - 1;
while (status == APR_SUCCESS && nbytes) {
status = apr_socket_recv(backend->sock, drain_buffer, &nbytes);
- buffer[nbytes] = '\0';
+ drain_buffer[nbytes] = '\0';
nbytes = sizeof(drain_buffer) - 1;
if (strstr(drain_buffer, "\r\n\r\n") != NULL) {
break;
Re: svn commit: r1491466 - in /httpd/httpd/branches/2.4.x: ./ CHANGES
STATUS modules/proxy/proxy_util.c
Posted by Christophe JAILLET <ch...@wanadoo.fr>.
Le 11/06/2013 13:21, Graham Leggett a écrit :
> On 11 Jun 2013, at 1:08 PM, Christophe JAILLET <ch...@wanadoo.fr> wrote:
>
>>> + *) proxy_util: NULL terminate the right buffer in 'send_http_connect'.
>>> + [Christophe Jaillet]
>>> +
>>> *) mod_remoteip: close file in error path. [Christophe Jaillet]
>>> *) mod_lua: Sync 2.4 branch with trunk. This includes (but is not limited to)
>> Is this entry really useful ?
>> If it worth mentioning it, at least the wording should be improved. IMO, just remove it.
> Yes, it is useful - if someone has deployed a new version, and suddenly that version doesn't work properly, they need a list of things that have changed between the old version and the new version for them to check as possible causes.
>
> If we arbitrarily leave messages off we risk the wrath of an administrator who believes the changelog they are looking at is complete, but arbitrarily isn't.
>
> Regards,
> Graham
> --
Ok.
I had in mind some previous commits (like r1455219 or r1470527) for
which no CHANGE entry had been added.
I understand your point and will be more careful about it.
Thanks for the quick feedback.
CJ
Re: svn commit: r1491466 - in /httpd/httpd/branches/2.4.x: ./ CHANGES STATUS modules/proxy/proxy_util.c
Posted by Graham Leggett <mi...@sharp.fm>.
On 11 Jun 2013, at 1:08 PM, Christophe JAILLET <ch...@wanadoo.fr> wrote:
>> + *) proxy_util: NULL terminate the right buffer in 'send_http_connect'.
>> + [Christophe Jaillet]
>> +
>> *) mod_remoteip: close file in error path. [Christophe Jaillet]
>> *) mod_lua: Sync 2.4 branch with trunk. This includes (but is not limited to)
>
> Is this entry really useful ?
> If it worth mentioning it, at least the wording should be improved. IMO, just remove it.
Yes, it is useful - if someone has deployed a new version, and suddenly that version doesn't work properly, they need a list of things that have changed between the old version and the new version for them to check as possible causes.
If we arbitrarily leave messages off we risk the wrath of an administrator who believes the changelog they are looking at is complete, but arbitrarily isn't.
Regards,
Graham
--
Re: svn commit: r1491466 - in /httpd/httpd/branches/2.4.x: ./ CHANGES STATUS modules/proxy/proxy_util.c
Posted by Jim Jagielski <ji...@jaguNET.com>.
STATUS is for userland and user-view changes... enhancements, bug-fixes,
etc that the end-user will likely want to be aware of.
On Jun 11, 2013, at 7:08 AM, Christophe JAILLET <ch...@wanadoo.fr> wrote:
> Le 10/06/2013 16:28, minfrin@apache.org a écrit :
>> Modified: httpd/httpd/branches/2.4.x/CHANGES
>> URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1491466&r1=1491465&r2=1491466&view=diff
>> ==============================================================================
>> --- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
>> +++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Mon Jun 10 14:28:08 2013
>> @@ -2,6 +2,9 @@
>> Changes with Apache 2.4.5
>> + *) proxy_util: NULL terminate the right buffer in 'send_http_connect'.
>> + [Christophe Jaillet]
>> +
>> *) mod_remoteip: close file in error path. [Christophe Jaillet]
>> *) mod_lua: Sync 2.4 branch with trunk. This includes (but is not limited to)
>
> Is this entry really useful ?
> If it worth mentioning it, at least the wording should be improved. IMO, just remove it.
>
> CJ
>
Re: svn commit: r1491466 - in /httpd/httpd/branches/2.4.x: ./ CHANGES
STATUS modules/proxy/proxy_util.c
Posted by Jeff Trawick <tr...@gmail.com>.
On Tue, Jun 11, 2013 at 7:08 AM, Christophe JAILLET <
christophe.jaillet@wanadoo.fr> wrote:
> Le 10/06/2013 16:28, minfrin@apache.org a écrit :
>
> Modified: httpd/httpd/branches/2.4.x/**CHANGES
>> URL: http://svn.apache.org/viewvc/**httpd/httpd/branches/2.4.x/**
>> CHANGES?rev=1491466&r1=**1491465&r2=1491466&view=diff<http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1491466&r1=1491465&r2=1491466&view=diff>
>> ==============================**==============================**
>> ==================
>> --- httpd/httpd/branches/2.4.x/**CHANGES [utf-8] (original)
>> +++ httpd/httpd/branches/2.4.x/**CHANGES [utf-8] Mon Jun 10 14:28:08 2013
>> @@ -2,6 +2,9 @@
>> Changes with Apache 2.4.5
>> + *) proxy_util: NULL terminate the right buffer in
>> 'send_http_connect'.
>> + [Christophe Jaillet]
>> +
>> *) mod_remoteip: close file in error path. [Christophe Jaillet]
>> *) mod_lua: Sync 2.4 branch with trunk. This includes (but is not
>> limited to)
>>
>
> Is this entry really useful ?
> If it worth mentioning it, at least the wording should be improved. IMO,
> just remove it.
>
> CJ
>
It certainly sounds like a good thing to know for someone investigating an
issue with mod_proxy_connect. How about
*) mod_proxy_connect: Fix possible buffer corruption in connection setup
processing. [you]
--
Born in Roswell... married an alien...
http://emptyhammock.com/
Re: svn commit: r1491466 - in /httpd/httpd/branches/2.4.x: ./ CHANGES
STATUS modules/proxy/proxy_util.c
Posted by Christophe JAILLET <ch...@wanadoo.fr>.
Le 10/06/2013 16:28, minfrin@apache.org a écrit :
> Modified: httpd/httpd/branches/2.4.x/CHANGES
> URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1491466&r1=1491465&r2=1491466&view=diff
> ==============================================================================
> --- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
> +++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Mon Jun 10 14:28:08 2013
> @@ -2,6 +2,9 @@
>
> Changes with Apache 2.4.5
>
> + *) proxy_util: NULL terminate the right buffer in 'send_http_connect'.
> + [Christophe Jaillet]
> +
> *) mod_remoteip: close file in error path. [Christophe Jaillet]
>
> *) mod_lua: Sync 2.4 branch with trunk. This includes (but is not limited to)
Is this entry really useful ?
If it worth mentioning it, at least the wording should be improved. IMO,
just remove it.
CJ