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 2013/07/10 05:16:35 UTC
svn commit: r1501638 - in /httpd/httpd/win32-msi/trunk: License-2.0.rtf
License-2.2.rtf README-win32.txt apache_2.0-win32.ism apache_2.2-win32.ism
Author: wrowe
Date: Wed Jul 10 03:16:33 2013
New Revision: 1501638
URL: http://svn.apache.org/r1501638
Log:
Preparing for .msi builds of 2.0.65/2.2.25
Modified:
httpd/httpd/win32-msi/trunk/License-2.0.rtf
httpd/httpd/win32-msi/trunk/License-2.2.rtf
httpd/httpd/win32-msi/trunk/README-win32.txt
httpd/httpd/win32-msi/trunk/apache_2.0-win32.ism
httpd/httpd/win32-msi/trunk/apache_2.2-win32.ism
Modified: httpd/httpd/win32-msi/trunk/License-2.0.rtf
URL: http://svn.apache.org/viewvc/httpd/httpd/win32-msi/trunk/License-2.0.rtf?rev=1501638&r1=1501637&r2=1501638&view=diff
==============================================================================
--- httpd/httpd/win32-msi/trunk/License-2.0.rtf (original)
+++ httpd/httpd/win32-msi/trunk/License-2.0.rtf Wed Jul 10 03:16:33 2013
@@ -1,5 +1,5 @@
{\rtf1\ansi\ansicpg1252\deff0{\fonttbl{\f0\fswiss\fprq2\fcharset0 Arial;}}
-{\*\generator Msftedit 5.41.15.1507;}\viewkind4\uc1\pard\qc\lang1033\b\f0\fs18 Apache License\par
+{\*\generator Msftedit 5.41.21.2500;}\viewkind4\uc1\pard\qc\lang1033\b\f0\fs18 Apache License\par
Version 2.0, January 2004\par
http://www.apache.org/licenses/\par
\b0\par
@@ -70,7 +70,7 @@ Unless required by applicable law or agr
\par
\b Apache HTTP Server\par
\b0\par
-Copyright 2008 The Apache Software Foundation.\par
+Copyright 2013 The Apache Software Foundation.\par
\par
This product includes software developed at\par
The Apache Software Foundation (http://www.apache.org/).\par
@@ -265,6 +265,7 @@ Thanks to the following people for their
For the expat xml parser component:\par
\b0\par
Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd and Clark Cooper\par
+Copyright (c) 2001, 2002 Expat maintainers.\par
\par
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:\par
\par
@@ -327,7 +328,9 @@ The licence and distribution terms for a
\par
For the mod_deflate zlib compression component:\par
\par
-\b0 (C) 1995-2002 Jean-loup Gailly and Mark Adler\par
+\b0 Copyright notice:\par
+\par
+(C) 1995-2012 Jean-loup Gailly and Mark Adler\par
\par
This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software.\par
\par
Modified: httpd/httpd/win32-msi/trunk/License-2.2.rtf
URL: http://svn.apache.org/viewvc/httpd/httpd/win32-msi/trunk/License-2.2.rtf?rev=1501638&r1=1501637&r2=1501638&view=diff
==============================================================================
--- httpd/httpd/win32-msi/trunk/License-2.2.rtf (original)
+++ httpd/httpd/win32-msi/trunk/License-2.2.rtf Wed Jul 10 03:16:33 2013
@@ -1,8 +1,7 @@
{\rtf1\ansi\ansicpg1252\deff0{\fonttbl{\f0\fswiss\fprq2\fcharset0 Arial;}}
-{\colortbl ;\red0\green0\blue255;}
-{\*\generator Msftedit 5.41.21.2510;}\viewkind4\uc1\pard\qc\lang1033\b\f0\fs18 Apache License\par
+{\*\generator Msftedit 5.41.21.2500;}\viewkind4\uc1\pard\qc\lang1033\b\f0\fs18 Apache License\par
Version 2.0, January 2004\par
-{\field{\*\fldinst{HYPERLINK "http://www.apache.org/licenses/"}}{\fldrslt{\ul\cf1 http://www.apache.org/licenses/}}}\f0\fs18\par
+http://www.apache.org/licenses/\par
\b0\par
\pard TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\par
\par
@@ -64,17 +63,17 @@ To apply the Apache License to your work
\par
Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at\par
\par
-\pard\li360{\field{\*\fldinst{HYPERLINK "http://www.apache.org/licenses/LICENSE-2.0"}}{\fldrslt{\ul\cf1 http://www.apache.org/licenses/LICENSE-2.0}}}\f0\fs18\par
+\pard\li360 http://www.apache.org/licenses/LICENSE-2.0\par
\pard\li180\par
Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.\par
\pard\par
\par
\b APACHE HTTP SERVER:\par
\b0\par
-Copyright 2012 The Apache Software Foundation.\par
+Copyright 2013 The Apache Software Foundation.\par
\par
This product includes software developed at\par
-The Apache Software Foundation ({\field{\*\fldinst{HYPERLINK "http://www.apache.org/"}}{\fldrslt{\ul\cf1 http://www.apache.org/}}}\f0\fs18 ).\par
+The Apache Software Foundation (http://www.apache.org/).\par
\par
Portions of this software were developed at the National Center\par
for Supercomputing Applications (NCSA) at the University of\par
@@ -89,7 +88,7 @@ Regular expression support is provided b
which is open source software, written by Philip Hazel, and copyright\par
by the University of Cambridge, England. The original software is\par
available from\par
- {\field{\*\fldinst{HYPERLINK "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/"}}{\fldrslt{\ul\cf1 ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/}}}\f0\fs18\par
+ ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/\par
\par
\par
\b APACHE HTTP SERVER SUBCOMPONENTS: \par
@@ -232,7 +231,7 @@ Permission is granted to anyone to use t
\pard\li180\par
somewhere reasonably visible in your documentation and in any relevant files or online help data or similar. A reference to the ftp site for the source, that is, to\par
\par
-\pard\li360{\field{\*\fldinst{HYPERLINK "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/"}}{\fldrslt{\ul\cf1 ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/}}}\f0\fs18\par
+\pard\li360 ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/\par
\pard\li180\par
should also be given in the documentation.\par
\par
@@ -275,14 +274,9 @@ The above copyright notice and this perm
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\par
\par
\par
-\b For the libeay32.dll, ssleay32.dll and openssl.exe components:\par
-\b0\par
-The OpenSSL toolkit stays under a dual license, i.e. both the conditions of the OpenSSL License and the original SSLeay license apply to the toolkit. See below for the actual license texts. Actually both licenses are BSD-style Open Source licenses. In case of any license issues related to OpenSSL please contact openssl-core@openssl.org.\par
-\par
-\par
\b\i OpenSSL License\par
\b0\i0\par
-Copyright (c) 1998-2011 The OpenSSL Project. All rights reserved.\par
+Copyright (c) 1998-2007 The OpenSSL Project. All rights reserved.\par
\par
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:\par
\par
@@ -291,13 +285,13 @@ Redistribution and use in source and bin
2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.\par
\par
3. All advertising materials mentioning features or use of this software must display the following acknowledgment:\par
-"This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit. ({\field{\*\fldinst{HYPERLINK "http://www.openssl.org/"}}{\fldrslt{\ul\cf1 http://www.openssl.org/}}}\f0\fs18 )"\par
+"This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit. (http://www.openssl.org/)"\par
\par
4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to endorse or promote products derived from this software without prior written permission. For written permission, please contact openssl\_core@openssl.org.\par
\par
5. Products derived from this software may not be called "OpenSSL" nor may "OpenSSL" appear in their names without prior written permission of the OpenSSL Project.\par
\par
-6. Redistributions of any form whatsoever must retain the following acknowledgment: "This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit ({\field{\*\fldinst{HYPERLINK "http://www.openssl.org/"}}{\fldrslt{\ul\cf1 http://www.openssl.org/}}}\f0\fs18 )"\par
+6. Redistributions of any form whatsoever must retain the following acknowledgment: "This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/)"\par
\par
THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\par
\par
@@ -329,7 +323,9 @@ The licence and distribution terms for a
\par
For the zlib1.dll compression component:\par
\par
-\b0 (C) 1995-2010 Jean-loup Gailly and Mark Adler\par
+\b0 Copyright notice:\par
+\par
+(C) 1995-2012 Jean-loup Gailly and Mark Adler\par
\par
This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software.\par
\par
Modified: httpd/httpd/win32-msi/trunk/README-win32.txt
URL: http://svn.apache.org/viewvc/httpd/httpd/win32-msi/trunk/README-win32.txt?rev=1501638&r1=1501637&r2=1501638&view=diff
==============================================================================
--- httpd/httpd/win32-msi/trunk/README-win32.txt (original)
+++ httpd/httpd/win32-msi/trunk/README-win32.txt Wed Jul 10 03:16:33 2013
@@ -1,7 +1,7 @@
New version of APR
------------------
-Note that the included APR is now version 1.4, which adds several
+Note that the included APR is now version 1.5, which adds several
subtle changes in the behavior of file handling, pipes and process
creation. Most importantly, there is finer control over the handles
inherited by processes, so the mod_fastcgi or mod_fcgid modules must
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=1501638&r1=1501637&r2=1501638&view=diff
==============================================================================
--- httpd/httpd/win32-msi/trunk/apache_2.0-win32.ism (original)
+++ httpd/httpd/win32-msi/trunk/apache_2.0-win32.ism Wed Jul 10 03:16:33 2013
@@ -2389,8 +2389,8 @@
<col def="S255">Value</col>
<col def="S255">TestValue</col>
<col def="i4">Type</col>
- <row><td>ApacheBuildFolder</td><td>c:\local0\asf\release\build-2.0.64\</td><td/><td>2</td></row>
- <row><td>ApacheTargetFolder</td><td>c:\local0\asf\release\target-2.0.64\</td><td/><td>2</td></row>
+ <row><td>ApacheBuildFolder</td><td>c:\local0\asf\release\build-2.0.65\</td><td/><td>2</td></row>
+ <row><td>ApacheTargetFolder</td><td>c:\local0\asf\release\target-2.0.65\</td><td/><td>2</td></row>
<row><td>CommonFilesFolder</td><td/><td/><td>1</td></row>
<row><td>ISPROJECTDIR</td><td/><td/><td>1</td></row>
<row><td>ISProductFolder</td><td/><td/><td>1</td></row>
@@ -2422,8 +2422,8 @@
<row><td>win32</td><td>Comments</td><td>##IDS_Dev_Warning##</td></row>
<row><td>win32</td><td>PackageCode</td><td>{495826D5-C9CF-4E88-B694-382EE6A85AEC}</td></row>
<row><td>win32</td><td>ProductCode</td><td>{3A862C7D-0504-48BC-AEF8-7F7479C7C158}</td></row>
- <row><td>win32</td><td>ProductName</td><td>Apache HTTP Server 2.0.64</td></row>
- <row><td>win32</td><td>ProductVersion</td><td>2.0.64</td></row>
+ <row><td>win32</td><td>ProductName</td><td>Apache HTTP Server 2.0.65</td></row>
+ <row><td>win32</td><td>ProductVersion</td><td>2.0.65</td></row>
<row><td>win32</td><td>SetupFileName</td><td>setup</td></row>
<row><td>win32</td><td>Subject</td><td>##AppProduct_Description##</td></row>
<row><td>win32</td><td>Title</td><td>##IDS_Package_Title##</td></row>
@@ -2676,7 +2676,7 @@
<col def="I2">Encoded</col>
<col def="S0">Comment</col>
<col def="I4">TimeStamp</col>
- <row><td>AppProduct</td><td>1033</td><td>Apache HTTP Server 2.0.64</td><td>0</td><td>SYSTEM_GENERATED</td><td>1360611656</td></row>
+ <row><td>AppProduct</td><td>1033</td><td>Apache HTTP Server 2.0.65</td><td>0</td><td>SYSTEM_GENERATED</td><td>1360611656</td></row>
<row><td>AppProduct_Description</td><td>1033</td><td>The Apache HTTP Web Server</td><td>0</td><td/><td>1360611656</td></row>
<row><td>AppProduct_ShortLongName</td><td>1033</td><td>APACHE~1.0|Apache HTTP Server 2.0</td><td>0</td><td/><td>1360611656</td></row>
<row><td>AppPublisher</td><td>1033</td><td>Apache Software Foundation</td><td>0</td><td/><td>1360611656</td></row>
@@ -2697,7 +2697,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.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_OpenSSL_Description</td><td>1033</td><td>Minimal OpenSSL files to use mod_ssl. If OpenSSL 0.9.8y 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>
@@ -4568,7 +4568,7 @@ bQBzAGkAXwBuAG8AXwBzAHMAbAAtADIALgAwAAEA
<row><td>PROGMSG_IIS_ROLLBACKWEBSERVICEEXTENSIONS</td><td>##IDS_PROGMSG_IIS_ROLLBACKWEBSERVICEEXTENSIONS##</td><td/></row>
<row><td>ProductCode</td><td>{50B6484E-E43A-473B-A97A-710439BAEF58}</td><td/></row>
<row><td>ProductName</td><td>Apache HTTP Server 2.0</td><td/></row>
- <row><td>ProductVersion</td><td>2.0.64</td><td/></row>
+ <row><td>ProductVersion</td><td>2.0.65</td><td/></row>
<row><td>ProgressType0</td><td>install</td><td/></row>
<row><td>ProgressType1</td><td>Installing</td><td/></row>
<row><td>ProgressType2</td><td>installed</td><td/></row>
@@ -4640,10 +4640,10 @@ bQBzAGkAXwBuAG8AXwBzAHMAbAAtADIALgAwAAEA
<col def="S0">Value</col>
<col def="s72">Component_</col>
<col def="I4">ISAttributes</col>
- <row><td>Registry1</td><td>2</td><td>SOFTWARE\Apache Group\Apache\2.0.64</td><td>ServerRoot</td><td>[APACHEDIR]</td><td>ApacheAdmin</td><td>0</td></row>
+ <row><td>Registry1</td><td>2</td><td>SOFTWARE\Apache Group\Apache\2.0.65</td><td>ServerRoot</td><td>[APACHEDIR]</td><td>ApacheAdmin</td><td>0</td></row>
<row><td>Registry10</td><td>2</td><td>SOFTWARE\Classes\sofile</td><td/><td>Apache Loadable Module</td><td>ApacheAdmin</td><td>0</td></row>
- <row><td>Registry11</td><td>1</td><td>SOFTWARE\Apache Group\Apache\2.0.64</td><td>Installed</td><td>#1</td><td>ApacheNonAdmin</td><td>0</td></row>
- <row><td>Registry2</td><td>2</td><td>SOFTWARE\Apache Group\Apache\2.0.64</td><td>Shared</td><td>#1</td><td>ApacheAdmin</td><td>0</td></row>
+ <row><td>Registry11</td><td>1</td><td>SOFTWARE\Apache Group\Apache\2.0.65</td><td>Installed</td><td>#1</td><td>ApacheNonAdmin</td><td>0</td></row>
+ <row><td>Registry2</td><td>2</td><td>SOFTWARE\Apache Group\Apache\2.0.65</td><td>Shared</td><td>#1</td><td>ApacheAdmin</td><td>0</td></row>
<row><td>Registry3</td><td>2</td><td>SOFTWARE\Classes\.conf</td><td/><td>txtfile</td><td>ApacheAdmin</td><td>0</td></row>
<row><td>Registry4</td><td>2</td><td>SOFTWARE\Classes\.conf</td><td>Content Type</td><td>text/plain</td><td>ApacheAdmin</td><td>0</td></row>
<row><td>Registry5</td><td>2</td><td>SOFTWARE\Classes\.log</td><td/><td>txtfile</td><td>ApacheAdmin</td><td>0</td></row>
Modified: httpd/httpd/win32-msi/trunk/apache_2.2-win32.ism
URL: http://svn.apache.org/viewvc/httpd/httpd/win32-msi/trunk/apache_2.2-win32.ism?rev=1501638&r1=1501637&r2=1501638&view=diff
==============================================================================
--- httpd/httpd/win32-msi/trunk/apache_2.2-win32.ism (original)
+++ httpd/httpd/win32-msi/trunk/apache_2.2-win32.ism Wed Jul 10 03:16:33 2013
@@ -2432,8 +2432,8 @@
<col def="S255">Value</col>
<col def="S255">TestValue</col>
<col def="i4">Type</col>
- <row><td>ApacheBuildFolder</td><td>c:\local0\asf\release\build-2.2.22\</td><td/><td>2</td></row>
- <row><td>ApacheTargetFolder</td><td>c:\local0\asf\release\target-2.2.22\</td><td/><td>2</td></row>
+ <row><td>ApacheBuildFolder</td><td>c:\local0\asf\release\build-2.2.25\</td><td/><td>2</td></row>
+ <row><td>ApacheTargetFolder</td><td>c:\local0\asf\release\target-2.2.25\</td><td/><td>2</td></row>
<row><td>CommonFilesFolder</td><td/><td/><td>1</td></row>
<row><td>ISPROJECTDIR</td><td/><td/><td>1</td></row>
<row><td>ISProductFolder</td><td/><td/><td>1</td></row>
@@ -2465,8 +2465,8 @@
<row><td>win32</td><td>Comments</td><td>##IDS_Dev_Warning##</td></row>
<row><td>win32</td><td>PackageCode</td><td>{69492F41-747E-42B4-BF27-5C49212C5F24}</td></row>
<row><td>win32</td><td>ProductCode</td><td>{85262A06-2D8C-4BC1-B6ED-5A705D09CFFC}</td></row>
- <row><td>win32</td><td>ProductName</td><td>Apache HTTP Server 2.2.22</td></row>
- <row><td>win32</td><td>ProductVersion</td><td>2.2.22</td></row>
+ <row><td>win32</td><td>ProductName</td><td>Apache HTTP Server 2.2.25</td></row>
+ <row><td>win32</td><td>ProductVersion</td><td>2.2.25</td></row>
<row><td>win32</td><td>SetupFileName</td><td>setup</td></row>
<row><td>win32</td><td>Subject</td><td>##AppProduct_Description##</td></row>
<row><td>win32</td><td>Title</td><td>##IDS_Package_Title##</td></row>
@@ -2719,7 +2719,7 @@
<col def="I2">Encoded</col>
<col def="S0">Comment</col>
<col def="I4">TimeStamp</col>
- <row><td>AppProduct</td><td>1033</td><td>Apache HTTP Server 2.2.22</td><td>0</td><td>SYSTEM_GENERATED</td><td>1578731275</td></row>
+ <row><td>AppProduct</td><td>1033</td><td>Apache HTTP Server 2.2.25</td><td>0</td><td>SYSTEM_GENERATED</td><td>1578731275</td></row>
<row><td>AppProduct_Description</td><td>1033</td><td>The Apache HTTP Web Server Version 2.2</td><td>0</td><td/><td>1712964623</td></row>
<row><td>AppProduct_ShortLongName</td><td>1033</td><td>APACHE~1.2|Apache HTTP Server 2.2</td><td>0</td><td/><td>1712971342</td></row>
<row><td>AppPublisher</td><td>1033</td><td>Apache Software Foundation</td><td>0</td><td/><td>1360611656</td></row>
@@ -2742,7 +2742,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.8t 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>1712946798</td></row>
+ <row><td>Feature_OpenSSL_Description</td><td>1033</td><td>Minimal OpenSSL files to use mod_ssl. If OpenSSL 0.9.8y 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>1712946798</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>
@@ -4600,7 +4600,7 @@ bQBzAGkAXwBzAHMAbAAtADIALgAyAAEAdwBpAG4A
<row><td>PROGMSG_IIS_ROLLBACKWEBSERVICEEXTENSIONS</td><td>##IDS_PROGMSG_IIS_ROLLBACKWEBSERVICEEXTENSIONS##</td><td/></row>
<row><td>ProductCode</td><td>{8F721A14-795E-4D11-87DC-CD5778E45D05}</td><td/></row>
<row><td>ProductName</td><td>Apache HTTP Server 2.2</td><td/></row>
- <row><td>ProductVersion</td><td>2.2.22</td><td/></row>
+ <row><td>ProductVersion</td><td>2.2.25</td><td/></row>
<row><td>ProgressType0</td><td>install</td><td/></row>
<row><td>ProgressType1</td><td>Installing</td><td/></row>
<row><td>ProgressType2</td><td>installed</td><td/></row>
@@ -4670,10 +4670,10 @@ bQBzAGkAXwBzAHMAbAAtADIALgAyAAEAdwBpAG4A
<col def="S0">Value</col>
<col def="s72">Component_</col>
<col def="I4">ISAttributes</col>
- <row><td>Registry1</td><td>2</td><td>SOFTWARE\Apache Software Foundation\Apache\2.2.22</td><td>ServerRoot</td><td>[INSTALLDIR]</td><td>ApacheAdmin</td><td>0</td></row>
+ <row><td>Registry1</td><td>2</td><td>SOFTWARE\Apache Software Foundation\Apache\2.2.25</td><td>ServerRoot</td><td>[INSTALLDIR]</td><td>ApacheAdmin</td><td>0</td></row>
<row><td>Registry10</td><td>2</td><td>SOFTWARE\Classes\sofile</td><td/><td>Apache Loadable Module</td><td>ApacheAdmin</td><td>0</td></row>
- <row><td>Registry11</td><td>1</td><td>SOFTWARE\Apache Software Foundation\Apache\2.2.22</td><td>Installed</td><td>#1</td><td>ApacheNonAdmin</td><td>0</td></row>
- <row><td>Registry2</td><td>2</td><td>SOFTWARE\Apache Software Foundation\Apache\2.2.22</td><td>Shared</td><td>#1</td><td>ApacheAdmin</td><td>0</td></row>
+ <row><td>Registry11</td><td>1</td><td>SOFTWARE\Apache Software Foundation\Apache\2.2.25</td><td>Installed</td><td>#1</td><td>ApacheNonAdmin</td><td>0</td></row>
+ <row><td>Registry2</td><td>2</td><td>SOFTWARE\Apache Software Foundation\Apache\2.2.25</td><td>Shared</td><td>#1</td><td>ApacheAdmin</td><td>0</td></row>
<row><td>Registry3</td><td>2</td><td>SOFTWARE\Classes\.conf</td><td/><td>txtfile</td><td>ApacheAdmin</td><td>0</td></row>
<row><td>Registry4</td><td>2</td><td>SOFTWARE\Classes\.conf</td><td>Content Type</td><td>text/plain</td><td>ApacheAdmin</td><td>0</td></row>
<row><td>Registry5</td><td>2</td><td>SOFTWARE\Classes\.log</td><td/><td>txtfile</td><td>ApacheAdmin</td><td>0</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