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 2018/01/08 16:47:11 UTC
Re: svn commit: r1820578 - /httpd/httpd/branches/2.4.x-mod_md/os/win32/BaseAddr.ref
On Mon, Jan 8, 2018 at 4:56 PM, <st...@apache.org> wrote:
> Author: steffenal
> Date: Mon Jan 8 15:56:30 2018
> New Revision: 1820578
>
> URL: http://svn.apache.org/viewvc?rev=1820578&view=rev
> Log:
> mod_md maxsize was less than the resulting image size
>
> Modified:
> httpd/httpd/branches/2.4.x-mod_md/os/win32/BaseAddr.ref
>
> Modified: httpd/httpd/branches/2.4.x-mod_md/os/win32/BaseAddr.ref
> URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x-mod_md/os/win32/BaseAddr.ref?rev=1820578&r1=1820577&r2=1820578&view=diff
> ==============================================================================
> --- httpd/httpd/branches/2.4.x-mod_md/os/win32/BaseAddr.ref (original)
> +++ httpd/httpd/branches/2.4.x-mod_md/os/win32/BaseAddr.ref Mon Jan 8 15:56:30 2018
> @@ -130,4 +130,4 @@ mod_proxy_hcheck.so 0x70C10000
> mod_proxy_http2.so 0x70C30000 0x00020000
> mod_http2.so 0x70C50000 0x00040000
> mod_brotli.so 0x70C90000 0x000C0000
> -mod_md.so 0x70D50000 0x00020000
> +mod_md.so 0x70D50000 0x00030000
It seems that the same change is required in trunk.
Ideally it should have been changed in trunk first and then backported
to 2.4.x-mod_md, but now it probably is simpler to change trunk
accordingly (done in r1820583).
Thanks for the catch anyway!
Re: svn commit: r1820578 - /httpd/httpd/branches/2.4.x-mod_md/os/win32/BaseAddr.ref
Posted by Steffen <in...@apachelounge.com>.
On first sight mod_brotli is not building.
> Op 9 jan. 2018 om 18:06 heeft Gregg Smith <gl...@gknw.net> het volgende geschreven:
>
> Everything in 2.4 is also in trunk with the exception of the .mak/dep files AFAIK. BaseAddr.ref will not merge/backport to 2.4 w/o conflict is all, like CHANGES.
>
> If any module in trunk is not being built then please do share Steffen on which module/s is/are not being built.
>
> Yann, your change to BaseAddr.ref is fine.
>
>
> Gregg
>
>
>> On 1/9/2018 3:59 AM, Steffen wrote:
>> Mod_md looks ok in trunk, it is the rest.
>> I think Gregg can comment to this.
>>>> Op 9 jan. 2018 om 12:52 heeft Yann Ylavic <yl...@gmail.com> het volgende geschreven:
>>>>
>>>> On Tue, Jan 9, 2018 at 12:33 PM, Steffen <in...@apachelounge.com> wrote:
>>>> Reason not to update trunk: As pointed here before, trunk is not up
>>>> to date concerning Win build-files.
>>>
>>> Do you mean that 2.4.x(-mod_md) is up to date but not trunk?
>>> This shouldn't happen (no commit should land in 2.4.x without being
>>> first committed in trunk).
>>> Can we fix this?
Re: svn commit: r1820578 -
/httpd/httpd/branches/2.4.x-mod_md/os/win32/BaseAddr.ref
Posted by Gregg Smith <gl...@gknw.net>.
Everything in 2.4 is also in trunk with the exception of the .mak/dep
files AFAIK. BaseAddr.ref will not merge/backport to 2.4 w/o conflict is
all, like CHANGES.
If any module in trunk is not being built then please do share Steffen
on which module/s is/are not being built.
Yann, your change to BaseAddr.ref is fine.
Gregg
On 1/9/2018 3:59 AM, Steffen wrote:
> Mod_md looks ok in trunk, it is the rest.
>
> I think Gregg can comment to this.
>
>
>
>> Op 9 jan. 2018 om 12:52 heeft Yann Ylavic <yl...@gmail.com> het volgende geschreven:
>>
>>> On Tue, Jan 9, 2018 at 12:33 PM, Steffen <in...@apachelounge.com> wrote:
>>> Reason not to update trunk: As pointed here before, trunk is not up
>>> to date concerning Win build-files.
>>
>> Do you mean that 2.4.x(-mod_md) is up to date but not trunk?
>> This shouldn't happen (no commit should land in 2.4.x without being
>> first committed in trunk).
>> Can we fix this?
>
Re: svn commit: r1820578 - /httpd/httpd/branches/2.4.x-mod_md/os/win32/BaseAddr.ref
Posted by Steffen <in...@apachelounge.com>.
Mod_md looks ok in trunk, it is the rest.
I think Gregg can comment to this.
> Op 9 jan. 2018 om 12:52 heeft Yann Ylavic <yl...@gmail.com> het volgende geschreven:
>
>> On Tue, Jan 9, 2018 at 12:33 PM, Steffen <in...@apachelounge.com> wrote:
>> Reason not to update trunk: As pointed here before, trunk is not up
>> to date concerning Win build-files.
>
> Do you mean that 2.4.x(-mod_md) is up to date but not trunk?
> This shouldn't happen (no commit should land in 2.4.x without being
> first committed in trunk).
> Can we fix this?
Re: svn commit: r1820578 - /httpd/httpd/branches/2.4.x-mod_md/os/win32/BaseAddr.ref
Posted by Yann Ylavic <yl...@gmail.com>.
On Tue, Jan 9, 2018 at 12:33 PM, Steffen <in...@apachelounge.com> wrote:
> Reason not to update trunk: As pointed here before, trunk is not up
> to date concerning Win build-files.
Do you mean that 2.4.x(-mod_md) is up to date but not trunk?
This shouldn't happen (no commit should land in 2.4.x without being
first committed in trunk).
Can we fix this?
Re: svn commit: r1820578 - /httpd/httpd/branches/2.4.x-mod_md/os/win32/BaseAddr.ref
Posted by Steffen <in...@apachelounge.com>.
Reason not to update trunk: As pointed here before, trunk is not up to date concerning Win build-files.
> Op 8 jan. 2018 om 17:47 heeft Yann Ylavic <yl...@gmail.com> het volgende geschreven:
>
>> On Mon, Jan 8, 2018 at 4:56 PM, <st...@apache.org> wrote:
>> Author: steffenal
>> Date: Mon Jan 8 15:56:30 2018
>> New Revision: 1820578
>>
>> URL: http://svn.apache.org/viewvc?rev=1820578&view=rev
>> Log:
>> mod_md maxsize was less than the resulting image size
>>
>> Modified:
>> httpd/httpd/branches/2.4.x-mod_md/os/win32/BaseAddr.ref
>>
>> Modified: httpd/httpd/branches/2.4.x-mod_md/os/win32/BaseAddr.ref
>> URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x-mod_md/os/win32/BaseAddr.ref?rev=1820578&r1=1820577&r2=1820578&view=diff
>> ==============================================================================
>> --- httpd/httpd/branches/2.4.x-mod_md/os/win32/BaseAddr.ref (original)
>> +++ httpd/httpd/branches/2.4.x-mod_md/os/win32/BaseAddr.ref Mon Jan 8 15:56:30 2018
>> @@ -130,4 +130,4 @@ mod_proxy_hcheck.so 0x70C10000
>> mod_proxy_http2.so 0x70C30000 0x00020000
>> mod_http2.so 0x70C50000 0x00040000
>> mod_brotli.so 0x70C90000 0x000C0000
>> -mod_md.so 0x70D50000 0x00020000
>> +mod_md.so 0x70D50000 0x00030000
>
> It seems that the same change is required in trunk.
> Ideally it should have been changed in trunk first and then backported
> to 2.4.x-mod_md, but now it probably is simpler to change trunk
> accordingly (done in r1820583).
> Thanks for the catch anyway!