httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Gregg Smith <...@gknw.net>
Subject Re: svn commit: r1369191 - /httpd/httpd/branches/2.4.x/modules/filters/mod_deflate.dsp
Date Sat, 04 Aug 2012 11:24:55 GMT
On 8/4/2012 12:20 AM, Rainer Jung wrote:
> Hi Gregg,
>
> On 03.08.2012 22:13, gsmith@apache.org wrote:
>> Author: gsmith
>> Date: Fri Aug  3 20:13:38 2012
>> New Revision: 1369191
>>
>> URL: http://svn.apache.org/viewvc?rev=1369191&view=rev
>> Log:
>> r1364253 forces the build to find mod_ssl.h
>> This should be CTR, feel free to revert if you do
>> not like this way of finding the required header.
>>
>> Modified:
>>      httpd/httpd/branches/2.4.x/modules/filters/mod_deflate.dsp
>>
>> Modified: httpd/httpd/branches/2.4.x/modules/filters/mod_deflate.dsp
>> URL: 
>> http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/filters/mod_deflate.dsp?rev=1369191&r1=1369190&r2=1369191&view=diff
>> ============================================================================== 
>>
>> --- httpd/httpd/branches/2.4.x/modules/filters/mod_deflate.dsp 
>> (original)
>> +++ httpd/httpd/branches/2.4.x/modules/filters/mod_deflate.dsp Fri 
>> Aug  3 20:13:38 2012
>> @@ -43,7 +43,7 @@ RSC=rc.exe
>>   # PROP Ignore_Export_Lib 0
>>   # PROP Target_Dir ""
>>   # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D 
>> "_WINDOWS" /FD /c
>> -# ADD CPP /nologo /MD /W3 /O2 /Oy- /Zi /I "../../include" /I 
>> "../../srclib/apr/include" /I "../../srclib/apr-util/include" /I 
>> "../../srclib/zlib" /D "NDEBUG" /D "ZLIB_DLL" /D "HAVE_ZUTIL_H" /D 
>> "WIN32" /D "_WINDOWS" /Fd"Release\mod_deflate_src" /FD /c
>> +# ADD CPP /nologo /MD /W3 /O2 /Oy- /Zi /I "../../include" /I 
>> "../ssl" /I "../../srclib/apr/include" /I 
>> "../../srclib/apr-util/include" /I "../../srclib/zlib" /D "NDEBUG" /D 
>> "ZLIB_DLL" /D "HAVE_ZUTIL_H" /D "WIN32" /D "_WINDOWS" 
>> /Fd"Release\mod_deflate_src" /FD /c
>>   # ADD BASE MTL /nologo /D "NDEBUG" /win32
>>   # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
>>   # ADD BASE RSC /l 0x409 /d "NDEBUG"
>> @@ -75,7 +75,7 @@ PostBuild_Cmds=if exist $(TargetPath).ma
>>   # PROP Ignore_Export_Lib 0
>>   # PROP Target_Dir ""
>>   # ADD BASE CPP /nologo /MDd /W3 /EHsc /Zi /Od /D "WIN32" /D 
>> "_DEBUG" /D "_WINDOWS" /FD /c
>> -# ADD CPP /nologo /MDd /W3 /EHsc /Zi /Od /I "../../include" /I 
>> "../../srclib/apr/include" /I "../../srclib/apr-util/include" /I 
>> "../../srclib/zlib" /D "_DEBUG" /D "ZLIB_DLL" /D "HAVE_ZUTIL_H" /D 
>> "WIN32" /D "_WINDOWS" /Fd"Debug\mod_deflate_src" /FD /c
>> +# ADD CPP /nologo /MDd /W3 /EHsc /Zi /Od /I "../../include" /I 
>> "../ssl" /I "../../srclib/apr/include" /I 
>> "../../srclib/apr-util/include" /I "../../srclib/zlib" /D "_DEBUG" /D 
>> "ZLIB_DLL" /D "HAVE_ZUTIL_H" /D "WIN32" /D "_WINDOWS" 
>> /Fd"Debug\mod_deflate_src" /FD /c
>>   # ADD BASE MTL /nologo /D "_DEBUG" /win32
>>   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
>>   # ADD BASE RSC /l 0x409 /d "_DEBUG"
>
> Thanks for fixing this, but could you please apply first to trunk. It 
> seems it is needed there as well.
>
> Regards,
>
> Rainer
So revert, commit to trunk, then backport?

Regards,

Gregg

Mime
View raw message