← Back to branch summary

~ubuntu-branches/ubuntu/karmic/apache2/karmic-security

« back to all changes in this revision

Viewing changes to modules/mappers/mod_negotiation.dsp

  • Committer: Bazaar Package Importer
  • Author(s): Stefan Fritsch
  • Date: 2008-10-01 11:50:18 UTC
  • mfrom: (34 intrepid)
  • mto: (14.2.1 squeeze)
  • mto: This revision was merged to the branch mainline in revision 40.
  • Revision ID: james.westby@ubuntu.com-20081001115018-1022gw429ce4pqyp
Tags: 2.2.9-10
Regression fix from upstream svn for mod_proxy_http:
Don't trigger a retry by the client if a failure to read the response line
was the result of a timeout.

Show diffs side-by-side

added added

removed removed

Lines of Context:
modules/mappers/mod_negotiation.dsp
47
47
# ADD BASE MTL /nologo /D "NDEBUG" /win32
48
48
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
49
49
# ADD BASE RSC /l 0x409 /d "NDEBUG"
50
 
# ADD RSC /l 0x409 /fo"Release/mod_negotiation.res" /i "../../include" /i "../../srclib/apr/include" /d "NDEBUG" /d "BIN_NAME=mod_negotiation.so" /d "LONG_NAME=negotiation_module for Apache"
 
50
# ADD RSC /l 0x409 /fo"Release/mod_negotiation.res" /i "../../include" /i "../../srclib/apr/include" /d "NDEBUG" /d BIN_NAME="mod_negotiation.so" /d LONG_NAME="negotiation_module for Apache"
51
51
BSC32=bscmake.exe
52
52
# ADD BASE BSC32 /nologo
53
53
# ADD BSC32 /nologo
54
54
LINK32=link.exe
55
 
# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /out:"Release/mod_negotiation.so" /base:@..\..\os\win32\BaseAddr.ref,mod_negotiation.so
56
 
# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /out:"Release/mod_negotiation.so" /base:@..\..\os\win32\BaseAddr.ref,mod_negotiation.so /opt:ref
 
55
# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /out:".\Release\mod_negotiation.so" /base:@..\..\os\win32\BaseAddr.ref,mod_negotiation.so
 
56
# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /out:".\Release\mod_negotiation.so" /base:@..\..\os\win32\BaseAddr.ref,mod_negotiation.so /opt:ref
 
57
# Begin Special Build Tool
 
58
TargetPath=.\Release\mod_negotiation.so
 
59
SOURCE="$(InputPath)"
 
60
PostBuild_Desc=Embed .manifest
 
61
PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2
 
62
# End Special Build Tool
57
63
 
58
64
!ELSEIF  "$(CFG)" == "mod_negotiation - Win32 Debug"
59
65
 
73
79
# ADD BASE MTL /nologo /D "_DEBUG" /win32
74
80
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
75
81
# ADD BASE RSC /l 0x409 /d "_DEBUG"
76
 
# ADD RSC /l 0x409 /fo"Debug/mod_negotiation.res" /i "../../include" /i "../../srclib/apr/include" /d "_DEBUG" /d "BIN_NAME=mod_negotiation.so" /d "LONG_NAME=negotiation_module for Apache"
 
82
# ADD RSC /l 0x409 /fo"Debug/mod_negotiation.res" /i "../../include" /i "../../srclib/apr/include" /d "_DEBUG" /d BIN_NAME="mod_negotiation.so" /d LONG_NAME="negotiation_module for Apache"
77
83
BSC32=bscmake.exe
78
84
# ADD BASE BSC32 /nologo
79
85
# ADD BSC32 /nologo
80
86
LINK32=link.exe
81
 
# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /out:"Debug/mod_negotiation.so" /base:@..\..\os\win32\BaseAddr.ref,mod_negotiation.so
82
 
# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /out:"Debug/mod_negotiation.so" /base:@..\..\os\win32\BaseAddr.ref,mod_negotiation.so
 
87
# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /out:".\Debug\mod_negotiation.so" /base:@..\..\os\win32\BaseAddr.ref,mod_negotiation.so
 
88
# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /out:".\Debug\mod_negotiation.so" /base:@..\..\os\win32\BaseAddr.ref,mod_negotiation.so
 
89
# Begin Special Build Tool
 
90
TargetPath=.\Debug\mod_negotiation.so
 
91
SOURCE="$(InputPath)"
 
92
PostBuild_Desc=Embed .manifest
 
93
PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2
 
94
# End Special Build Tool
83
95
 
84
96
!ENDIF 
85
97