You are viewing a plain text version of this content. The canonical link for it is here.
Posted to win32-msi-cvs@httpd.apache.org by wr...@apache.org on 2010/10/18 08:52:37 UTC
svn commit: r1023665 - /httpd/httpd/win32-msi/trunk/apache_2.0-win32.ism
Author: wrowe
Date: Mon Oct 18 06:52:36 2010
New Revision: 1023665
URL: http://svn.apache.org/viewvc?rev=1023665&view=rev
Log:
Sprinkle zlib1.dll into the mix for the shift from openssl 0.9.7x into
openssl 0.9.8x built w/ zlib1.dll, and mod_deflate compiled against the
same zlib1.dll.
Modified:
httpd/httpd/win32-msi/trunk/apache_2.0-win32.ism
Modified: httpd/httpd/win32-msi/trunk/apache_2.0-win32.ism
URL: http://svn.apache.org/viewvc/httpd/httpd/win32-msi/trunk/apache_2.0-win32.ism?rev=1023665&r1=1023664&r2=1023665&view=diff
==============================================================================
--- httpd/httpd/win32-msi/trunk/apache_2.0-win32.ism (original)
+++ httpd/httpd/win32-msi/trunk/apache_2.0-win32.ism Mon Oct 18 06:52:36 2010
@@ -452,6 +452,7 @@
<row><td>ssleay32</td><td>{4D3B76F1-E181-4152-BC06-2F23ECEBECDB}</td><td>OPENSSLBINDIR</td><td>0</td><td/><td>F164880_ssleay32.dll</td><td>1</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
<row><td>util_ldap</td><td>{C1F85F6D-B8E2-403B-8C1B-A02A0249A83A}</td><td>APACHEMODULESDIR</td><td>0</td><td/><td>F222265_util_ldap.so</td><td>1</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
<row><td>wintty</td><td>{D0ECE91F-B9D7-43D9-9E07-303F5E865DBE}</td><td>APACHEBINDIR</td><td>0</td><td/><td>F162991_wintty.exe</td><td>1</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
+ <row><td>zlib1</td><td>{0A50F346-7853-4C57-A63F-A4AB413EB2EC}</td><td>APACHEBINDIR</td><td>0</td><td/><td>zlib1.dll</td><td>1</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
</table>
<table name="Condition">
@@ -1633,6 +1634,7 @@
<row><td>ApacheRuntime</td><td>rotatelogs</td></row>
<row><td>ApacheRuntime</td><td>util_ldap</td></row>
<row><td>ApacheRuntime</td><td>wintty</td></row>
+ <row><td>ApacheRuntime</td><td>zlib1</td></row>
<row><td>BuildFiles</td><td>include</td></row>
<row><td>BuildFiles</td><td>lib</td></row>
<row><td>Iconv</td><td>iconv_bin</td></row>
@@ -1765,6 +1767,7 @@
<row><td>openssl.cnf</td><td>conf_openssl</td><td>openssl.cnf</td><td>0</td><td/><td/><td/><td>1</td><td><ApacheBuildFolder>\srclib\openssl\apps\openssl.cnf</td><td>1</td><td/></row>
<row><td>notice.txt</td><td>read</td><td>NOTICE.txt</td><td>0</td><td/><td/><td/><td>1</td><td><ApacheTargetFolder>\NOTICE.txt</td><td>1</td><td/></row>
<row><td>ssl_std.conf.in</td><td>conf_ssl_temp</td><td>SSL-ST~1.IN|ssl-std.conf.in</td><td>0</td><td/><td/><td/><td>1</td><td><ApacheBuildFolder>\docs\conf\ssl-std.conf.in</td><td>1</td><td/></row>
+ <row><td>zlib1.dll</td><td>zlib1</td><td>zlib1.dll</td><td>0</td><td/><td/><td/><td>1</td><td><ApacheTargetFolder>\bin\zlib1.dll</td><td>1</td><td/></row>
</table>
<table name="FileSFPCatalog">
@@ -2034,6 +2037,7 @@
<row><td>ssleay32</td><td/><td/><td>_6ECF9A8D_B095_4A3D_B9EA_539D116596C6_FILTER</td><td/><td/><td/><td/></row>
<row><td>util_ldap</td><td/><td/><td>_B8A230BC_95FC_4437_B020_2076F185A926_FILTER</td><td/><td/><td/><td/></row>
<row><td>wintty</td><td/><td/><td>_9B0D90CC_154A_4FE1_93F3_F4BE56A637D1_FILTER</td><td/><td/><td/><td/></row>
+ <row><td>zlib1</td><td/><td/><td>_6EC92D1B_9B8B_4395_B625_ED718FE691D1_FILTER</td><td/><td/><td/><td/></row>
</table>
<table name="ISDIMDependency">
@@ -2689,7 +2693,7 @@
<row><td>Feature_Iconv</td><td>1033</td><td>APR Iconv Code Pages</td><td>0</td><td/><td>1360611656</td></row>
<row><td>Feature_Iconv_Description</td><td>1033</td><td>APR Iconv Character Set Translation Modules (required for mod_charset_lite and some 3rd party modules)</td><td>0</td><td/><td>1360611656</td></row>
<row><td>Feature_OpenSSL</td><td>1033</td><td>OpenSSL Runtime</td><td>0</td><td/><td>1360611656</td></row>
- <row><td>Feature_OpenSSL_Description</td><td>1033</td><td>Minimal OpenSSL files to use mod_ssl. If OpenSSL 0.9.7l or later is installed in your system path, or if you won't attempt to load mod_ssl, these are not required. See <http://www.openssl.org/> to obtain the complete package</td><td>0</td><td/><td>1360611656</td></row>
+ <row><td>Feature_OpenSSL_Description</td><td>1033</td><td>Minimal OpenSSL files to use mod_ssl. If OpenSSL 0.9.8n or later is installed in your system path, or if you won't attempt to load mod_ssl, these are not required. See <http://www.openssl.org/> to obtain the complete package</td><td>0</td><td/><td>1360611656</td></row>
<row><td>Feature_SSL</td><td>1033</td><td>Ssl Binaries</td><td>0</td><td/><td>1360611656</td></row>
<row><td>Feature_SSL_Description</td><td>1033</td><td>The ssl_module and abs (ApacheBench/SSL)</td><td>0</td><td/><td>1360611656</td></row>
<row><td>IDPROP_EXPRESS_LAUNCH_CONDITION_COLOR</td><td>1033</td><td>The color settings of your system are not adequate for running [ProductName].</td><td>0</td><td/><td>-2087168511</td></row>
---------------------------------------------------------------------
To unsubscribe, e-mail: win32-msi-cvs-unsubscribe@httpd.apache.org
For additional commands, e-mail: win32-msi-cvs-help@httpd.apache.org