You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@httpd.apache.org by Yann Ylavic <yl...@gmail.com> on 2015/08/27 13:34:24 UTC
Re: svn commit: r1698117 - /httpd/httpd/branches/2.4.x/STATUS
On Thu, Aug 27, 2015 at 1:25 PM, <ic...@apache.org> wrote:
> Author: icing
> Date: Thu Aug 27 11:25:09 2015
> New Revision: 1698117
>
> URL: http://svn.apache.org/r1698117
> Log:
> adding r1698116 to core-protocols.patch to clarify new api
>
> Modified:
> httpd/httpd/branches/2.4.x/STATUS
>
> Modified: httpd/httpd/branches/2.4.x/STATUS
> URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1698117&r1=1698116&r2=1698117&view=diff
> ==============================================================================
> --- httpd/httpd/branches/2.4.x/STATUS (original)
> +++ httpd/httpd/branches/2.4.x/STATUS Thu Aug 27 11:25:09 2015
> @@ -312,6 +312,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
> http://svn.apache.org/r1610674 (partial)
> http://svn.apache.org/r1685069
> http://svn.apache.org/r1693918
> + http://svn.apache.org/r1698116
Looks like it does not belong to this patchset (and the patch below).
> 2.4.x patch: https://raw.githubusercontent.com/icing/mod_h2/master/sandbox/httpd/patches/core-protocols.patch
> +1: icing,
>
>
>
Re: svn commit: r1698117 - /httpd/httpd/branches/2.4.x/STATUS
Posted by Yann Ylavic <yl...@gmail.com>.
On Thu, Aug 27, 2015 at 2:21 PM, Stefan Eissing
<st...@greenbytes.de> wrote:
>
> The first half about http_protocol.h does. From this and all other changes, the directory modules/http2 needs to be ignored. Is that a problem?
No problem, partial merges are fine.
My bad, I thought r1698116's changes on http_protocol.h were not in
core-protocols.patch, but that's the case (maybe increasing some
number in the patch name would help when it is updated).
Re: svn commit: r1698117 - /httpd/httpd/branches/2.4.x/STATUS
Posted by Stefan Eissing <st...@greenbytes.de>.
> Am 27.08.2015 um 13:34 schrieb Yann Ylavic <yl...@gmail.com>:
>
> On Thu, Aug 27, 2015 at 1:25 PM, <ic...@apache.org> wrote:
>> Author: icing
>> Date: Thu Aug 27 11:25:09 2015
>> New Revision: 1698117
>>
>> URL: http://svn.apache.org/r1698117
>> Log:
>> adding r1698116 to core-protocols.patch to clarify new api
>>
>> Modified:
>> httpd/httpd/branches/2.4.x/STATUS
>>
>> Modified: httpd/httpd/branches/2.4.x/STATUS
>> URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1698117&r1=1698116&r2=1698117&view=diff
>> ==============================================================================
>> --- httpd/httpd/branches/2.4.x/STATUS (original)
>> +++ httpd/httpd/branches/2.4.x/STATUS Thu Aug 27 11:25:09 2015
>> @@ -312,6 +312,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
>> http://svn.apache.org/r1610674 (partial)
>> http://svn.apache.org/r1685069
>> http://svn.apache.org/r1693918
>> + http://svn.apache.org/r1698116
>
> Looks like it does not belong to this patchset (and the patch below)
The first half about http_protocol.h does. From this and all other changes, the directory modules/http2 needs to be ignored. Is that a problem?
<green/>bytes GmbH
Hafenweg 16, 48155 Münster, Germany
Phone: +49 251 2807760. Amtsgericht Münster: HRB5782