Loading CHANGES +3 −0 Original line number Diff line number Diff line Loading @@ -2,6 +2,9 @@ Changes with Apache 2.1.5 [Remove entries to the current 2.0 section below, when backported] *) Added makefile and doc for building mod_ssl on the NetWare platform. [Guenter Knauf, Brad Nicholes] *) mod_deflate: Merge the Vary header, isntead of Setting it. Fixes applications that send the Vary Header themselves, and also apply mod_defalte as an output filter. [Paul Querna] Loading NWGNUmakefile +6 −2 Original line number Diff line number Diff line Loading @@ -288,7 +288,7 @@ FILES_nlm_Ximports = \ GetCurrentAddressSpace \ $(EOLIST) # Build in mod_nw_ssl if Winsock is being used # Don't link with Winsock if standard sockets are being used ifndef USE_STDSOCKETS FILES_nlm_Ximports += @ws2nlm.imp \ $(EOLIST) Loading Loading @@ -329,7 +329,11 @@ install :: nlms FORCE -copy CHANGES $(INSTALL)\Apache2\*.* -copy support\dbmmanage.in $(INSTALL)\Apache2\bin\dbmmanage.pl -copy support\logresolve.pl.in $(INSTALL)\Apache2\bin\logresolve.pl ifdef USE_STDSOCKETS -awk -f build\mkconfnw.awk docs\conf\httpd.conf.in >$(INSTALL)\Apache2\conf\httpd.conf else -awk -v SSL=1 -f build\mkconfnw.awk docs\conf\httpd.conf.in >$(INSTALL)\Apache2\conf\httpd.conf endif $(CHKNOT) $(INSTALL)\Apache2\conf\extra\nul mkdir $(INSTALL)\Apache2\conf\extra -awk -f build\mkconfnw.awk docs\conf\extra\httpd-autoindex.conf.in >$(INSTALL)\Apache2\conf\extra\httpd-autoindex.conf -awk -f build\mkconfnw.awk docs\conf\extra\httpd-dav.conf.in >$(INSTALL)\Apache2\conf\extra\httpd-dav.conf Loading @@ -339,7 +343,7 @@ install :: nlms FORCE -awk -f build\mkconfnw.awk docs\conf\extra\httpd-manual.conf.in >$(INSTALL)\Apache2\conf\extra\httpd-manual.conf -awk -f build\mkconfnw.awk docs\conf\extra\httpd-mpm.conf.in >$(INSTALL)\Apache2\conf\extra\httpd-mpm.conf -awk -f build\mkconfnw.awk docs\conf\extra\httpd-multilang-errordoc.conf.in >$(INSTALL)\Apache2\conf\extra\httpd-multilang-errordoc.conf -awk -v SSL=1 -f build\mkconfnw.awk <nul >$(INSTALL)\Apache2\conf\extra\httpd-ssl.conf -awk -f build\mkconfnw.awk docs\conf\extra\httpd-ssl.conf.in >$(INSTALL)\Apache2\conf\extra\httpd-ssl.conf -awk -f build\mkconfnw.awk docs\conf\extra\httpd-userdir.conf.in >$(INSTALL)\Apache2\conf\extra\httpd-userdir.conf -awk -f build\mkconfnw.awk docs\conf\extra\httpd-vhosts.conf.in >$(INSTALL)\Apache2\conf\extra\httpd-vhosts.conf -copy docs\conf\magic $(INSTALL)\Apache2\conf\magic Loading build/mkconfNW.awk +1 −1 Original line number Diff line number Diff line Loading @@ -116,6 +116,6 @@ END { print "# Change this to SecureListen on specific IP addresses as shown below to " print "# prevent Apache from glomming onto all bound IP addresses (0.0.0.0)" print "#" print "SecureListen 443 \"SSL CertificateDNS\"" print "#SecureListen 443 \"SSL CertificateDNS\"" } } docs/manual/platform/netware.xml +47 −0 Original line number Diff line number Diff line Loading @@ -600,6 +600,53 @@ </section> <section id="comp-mod_ssl"> <title>Building mod_ssl for the NetWare platform</title> <p>By default Apache for NetWare uses the built-in module <module>mod_nw_ssl</module> to provide SSL services. This module simply enables the native SSL services implemented in NetWare OS to handle all encryption for a given port. Alternatively, mod_ssl can also be used in the same manner as on other platforms.</p> <p>Before mod_ssl can be built for the NetWare platform, the OpenSSL libraries must be provided. This can be done through the following steps:</p> <ul> <li>Download the latest NetWare patch for OpenSSL from the <a href="http://www.openssl.org/contrib/">OpenSSL Contribution</a> page.</li> <li>Download the corresponding OpenSSL source code from the <a href="http://www.openssl.org/source/">OpenSSL Source</a> page.</li> <li>At the root of the OpenSSL source directory, apply the NetWare patch using the "patch" utility, for example: <example>patch -p 1 -i netwarepatch-0.9.7g.diff</example></li> <li>Edit the file <code>NetWare/set_env.bat</code> and modify any tools and utilities paths so that they correspond to your build environment.</li> <li>From the root of the OpenSSL source directory, run the following scripts: <example> Netware/set_env netware-libc<br /> Netware/build netware-libc </example></li> <li>Before building Apache, set the environment variable <code>OSSLSDK</code> to the full path to the root of the openssl source code directory. <example>Set OSSLSDK=d:\openssl-0.9.7x</example></li> </ul> </section> </section> </manualpage> Loading modules/NWGNUmakefile +7 −0 Original line number Diff line number Diff line Loading @@ -25,6 +25,13 @@ SUBDIRS += ldap \ $(EOLIST) endif # If OSSLSDK has been defined then build the mod_ssl module ifndef USE_STDSOCKETS ifneq "$(OSSLSDK)" "" SUBDIRS += ssl \ $(EOLIST) endif endif #If the mod_edir directory exists then build the mod_edir module ifeq "$(wildcard $(AP_WORK)\modules\mod_edir)" "$(AP_WORK)\modules\mod_edir" Loading Loading
CHANGES +3 −0 Original line number Diff line number Diff line Loading @@ -2,6 +2,9 @@ Changes with Apache 2.1.5 [Remove entries to the current 2.0 section below, when backported] *) Added makefile and doc for building mod_ssl on the NetWare platform. [Guenter Knauf, Brad Nicholes] *) mod_deflate: Merge the Vary header, isntead of Setting it. Fixes applications that send the Vary Header themselves, and also apply mod_defalte as an output filter. [Paul Querna] Loading
NWGNUmakefile +6 −2 Original line number Diff line number Diff line Loading @@ -288,7 +288,7 @@ FILES_nlm_Ximports = \ GetCurrentAddressSpace \ $(EOLIST) # Build in mod_nw_ssl if Winsock is being used # Don't link with Winsock if standard sockets are being used ifndef USE_STDSOCKETS FILES_nlm_Ximports += @ws2nlm.imp \ $(EOLIST) Loading Loading @@ -329,7 +329,11 @@ install :: nlms FORCE -copy CHANGES $(INSTALL)\Apache2\*.* -copy support\dbmmanage.in $(INSTALL)\Apache2\bin\dbmmanage.pl -copy support\logresolve.pl.in $(INSTALL)\Apache2\bin\logresolve.pl ifdef USE_STDSOCKETS -awk -f build\mkconfnw.awk docs\conf\httpd.conf.in >$(INSTALL)\Apache2\conf\httpd.conf else -awk -v SSL=1 -f build\mkconfnw.awk docs\conf\httpd.conf.in >$(INSTALL)\Apache2\conf\httpd.conf endif $(CHKNOT) $(INSTALL)\Apache2\conf\extra\nul mkdir $(INSTALL)\Apache2\conf\extra -awk -f build\mkconfnw.awk docs\conf\extra\httpd-autoindex.conf.in >$(INSTALL)\Apache2\conf\extra\httpd-autoindex.conf -awk -f build\mkconfnw.awk docs\conf\extra\httpd-dav.conf.in >$(INSTALL)\Apache2\conf\extra\httpd-dav.conf Loading @@ -339,7 +343,7 @@ install :: nlms FORCE -awk -f build\mkconfnw.awk docs\conf\extra\httpd-manual.conf.in >$(INSTALL)\Apache2\conf\extra\httpd-manual.conf -awk -f build\mkconfnw.awk docs\conf\extra\httpd-mpm.conf.in >$(INSTALL)\Apache2\conf\extra\httpd-mpm.conf -awk -f build\mkconfnw.awk docs\conf\extra\httpd-multilang-errordoc.conf.in >$(INSTALL)\Apache2\conf\extra\httpd-multilang-errordoc.conf -awk -v SSL=1 -f build\mkconfnw.awk <nul >$(INSTALL)\Apache2\conf\extra\httpd-ssl.conf -awk -f build\mkconfnw.awk docs\conf\extra\httpd-ssl.conf.in >$(INSTALL)\Apache2\conf\extra\httpd-ssl.conf -awk -f build\mkconfnw.awk docs\conf\extra\httpd-userdir.conf.in >$(INSTALL)\Apache2\conf\extra\httpd-userdir.conf -awk -f build\mkconfnw.awk docs\conf\extra\httpd-vhosts.conf.in >$(INSTALL)\Apache2\conf\extra\httpd-vhosts.conf -copy docs\conf\magic $(INSTALL)\Apache2\conf\magic Loading
build/mkconfNW.awk +1 −1 Original line number Diff line number Diff line Loading @@ -116,6 +116,6 @@ END { print "# Change this to SecureListen on specific IP addresses as shown below to " print "# prevent Apache from glomming onto all bound IP addresses (0.0.0.0)" print "#" print "SecureListen 443 \"SSL CertificateDNS\"" print "#SecureListen 443 \"SSL CertificateDNS\"" } }
docs/manual/platform/netware.xml +47 −0 Original line number Diff line number Diff line Loading @@ -600,6 +600,53 @@ </section> <section id="comp-mod_ssl"> <title>Building mod_ssl for the NetWare platform</title> <p>By default Apache for NetWare uses the built-in module <module>mod_nw_ssl</module> to provide SSL services. This module simply enables the native SSL services implemented in NetWare OS to handle all encryption for a given port. Alternatively, mod_ssl can also be used in the same manner as on other platforms.</p> <p>Before mod_ssl can be built for the NetWare platform, the OpenSSL libraries must be provided. This can be done through the following steps:</p> <ul> <li>Download the latest NetWare patch for OpenSSL from the <a href="http://www.openssl.org/contrib/">OpenSSL Contribution</a> page.</li> <li>Download the corresponding OpenSSL source code from the <a href="http://www.openssl.org/source/">OpenSSL Source</a> page.</li> <li>At the root of the OpenSSL source directory, apply the NetWare patch using the "patch" utility, for example: <example>patch -p 1 -i netwarepatch-0.9.7g.diff</example></li> <li>Edit the file <code>NetWare/set_env.bat</code> and modify any tools and utilities paths so that they correspond to your build environment.</li> <li>From the root of the OpenSSL source directory, run the following scripts: <example> Netware/set_env netware-libc<br /> Netware/build netware-libc </example></li> <li>Before building Apache, set the environment variable <code>OSSLSDK</code> to the full path to the root of the openssl source code directory. <example>Set OSSLSDK=d:\openssl-0.9.7x</example></li> </ul> </section> </section> </manualpage> Loading
modules/NWGNUmakefile +7 −0 Original line number Diff line number Diff line Loading @@ -25,6 +25,13 @@ SUBDIRS += ldap \ $(EOLIST) endif # If OSSLSDK has been defined then build the mod_ssl module ifndef USE_STDSOCKETS ifneq "$(OSSLSDK)" "" SUBDIRS += ssl \ $(EOLIST) endif endif #If the mod_edir directory exists then build the mod_edir module ifeq "$(wildcard $(AP_WORK)\modules\mod_edir)" "$(AP_WORK)\modules\mod_edir" Loading