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 2007/12/23 19:04:49 UTC
svn commit: r606586 - in /httpd/httpd/win32-msi/trunk: apache_2.0-win32.ism
apache_2.2-win32.ism
Author: wrowe
Date: Sun Dec 23 10:04:48 2007
New Revision: 606586
URL: http://svn.apache.org/viewvc?rev=606586&view=rev
Log:
Correct sequence to ValidateServerName; First set up
ALLUSERS, PORT and SSLPORT (in order to add PORT/SSLPORT
in the future), then validate, set up our return dialog
and finally invoke NewDialog.
Resolves PR 41220
Modified:
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/apache_2.0-win32.ism
URL: http://svn.apache.org/viewvc/httpd/httpd/win32-msi/trunk/apache_2.0-win32.ism?rev=606586&r1=606585&r2=606586&view=diff
==============================================================================
--- httpd/httpd/win32-msi/trunk/apache_2.0-win32.ism (original)
+++ httpd/httpd/win32-msi/trunk/apache_2.0-win32.ism Sun Dec 23 10:04:48 2007
@@ -1062,15 +1062,16 @@
<row><td>ServerInformation</td><td>Back</td><td>NewDialog</td><td>ReadMe</td><td>1</td><td>1</td></row>
<row><td>ServerInformation</td><td>Cancel</td><td>SpawnDialog</td><td>CancelSetup</td><td>1</td><td>1</td></row>
<row><td>ServerInformation</td><td>Next</td><td>ControlEvent1</td><td>InstallWelcome</td><td> </td><td>10</td></row>
- <row><td>ServerInformation</td><td>Next</td><td>DoAction</td><td>ValidateServerName</td><td>RESOLVED_WINSOCK2 = "1"</td><td>13</td></row>
- <row><td>ServerInformation</td><td>Next</td><td>NewDialog</td><td>SetupType</td><td>Not INVALIDFIELD</td><td>11</td></row>
- <row><td>ServerInformation</td><td>Next</td><td>NewDialog</td><td>ValidationError</td><td>INVALIDFIELD</td><td>12</td></row>
- <row><td>ServerInformation</td><td>Next</td><td>[ALLUSERS]</td><td>1</td><td>ApplicationUsers = "AllUsers" And (AdminUser Or Version9X)</td><td>1</td></row>
- <row><td>ServerInformation</td><td>Next</td><td>[ALLUSERS]</td><td>{}</td><td>ApplicationUsers <> "AllUsers" Or Not (AdminUser Or Version9X)</td><td>2</td></row>
- <row><td>ServerInformation</td><td>Next</td><td>[INVALIDDIALOG]</td><td>ServerInformation</td><td>INVALIDFIELD</td><td>14</td></row>
- <row><td>ServerInformation</td><td>Next</td><td>[SERVERPORT]</td><td>80</td><td>ALLUSERS</td><td>3</td></row>
- <row><td>ServerInformation</td><td>Next</td><td>[SERVERPORT]</td><td>8080</td><td>Not ALLUSERS</td><td>4</td></row>
- <row><td>ServerInformation</td><td>Next</td><td>[SERVERSSLPORT]</td><td>443</td><td>ALLUSERS</td><td>5</td></row>
+ <row><td>ServerInformation</td><td>Next</td><td>DoAction</td><td>ValidateServerName</td><td>RESOLVED_WINSOCK2 = "1"</td><td>6</td></row>
+ <row><td>ServerInformation</td><td>Next</td><td>NewDialog</td><td>SetupType</td><td>Not INVALIDFIELD</td><td>8</td></row>
+ <row><td>ServerInformation</td><td>Next</td><td>NewDialog</td><td>ValidationError</td><td>INVALIDFIELD</td><td>9</td></row>
+ <row><td>ServerInformation</td><td>Next</td><td>[ALLUSERS]</td><td>1</td><td>ApplicationUsers = "AllUsers" And (AdminUser Or Version9X)</td><td>0</td></row>
+ <row><td>ServerInformation</td><td>Next</td><td>[ALLUSERS]</td><td>{}</td><td>ApplicationUsers <> "AllUsers" Or Not (AdminUser Or Version9X)</td><td>1</td></row>
+ <row><td>ServerInformation</td><td>Next</td><td>[INVALIDDIALOG]</td><td>ServerInformation</td><td>INVALIDFIELD</td><td>7</td></row>
+ <row><td>ServerInformation</td><td>Next</td><td>[SERVERPORT]</td><td>80</td><td>ALLUSERS</td><td>2</td></row>
+ <row><td>ServerInformation</td><td>Next</td><td>[SERVERPORT]</td><td>8080</td><td>Not ALLUSERS</td><td>3</td></row>
+ <row><td>ServerInformation</td><td>Next</td><td>[SERVERSSLPORT]</td><td>443</td><td>ALLUSERS</td><td>4</td></row>
+ <row><td>ServerInformation</td><td>Next</td><td>[SERVERSSLPORT]</td><td>8443</td><td>Not ALLUSERS</td><td>5</td></row>
<row><td>SetupCompleteError</td><td>Back</td><td>EndDialog</td><td>Return</td><td>1</td><td>2</td></row>
<row><td>SetupCompleteError</td><td>Back</td><td>[Suspend]</td><td>{}</td><td>1</td><td>1</td></row>
<row><td>SetupCompleteError</td><td>Cancel</td><td>EndDialog</td><td>Return</td><td>1</td><td>2</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=606586&r1=606585&r2=606586&view=diff
==============================================================================
--- httpd/httpd/win32-msi/trunk/apache_2.2-win32.ism (original)
+++ httpd/httpd/win32-msi/trunk/apache_2.2-win32.ism Sun Dec 23 10:04:48 2007
@@ -1039,15 +1039,15 @@
<row><td>ServerInformation</td><td>Back</td><td>NewDialog</td><td>ReadMe</td><td>1</td><td>1</td></row>
<row><td>ServerInformation</td><td>Cancel</td><td>SpawnDialog</td><td>CancelSetup</td><td>1</td><td>1</td></row>
<row><td>ServerInformation</td><td>Next</td><td>DoAction</td><td>ValidateServerName</td><td>RESOLVED_WINSOCK2 = "1"</td><td>0</td></row>
- <row><td>ServerInformation</td><td>Next</td><td>NewDialog</td><td>SetupType</td><td>Not INVALIDFIELD</td><td>0</td></row>
- <row><td>ServerInformation</td><td>Next</td><td>NewDialog</td><td>ValidationError</td><td>INVALIDFIELD</td><td>0</td></row>
+ <row><td>ServerInformation</td><td>Next</td><td>NewDialog</td><td>SetupType</td><td>Not INVALIDFIELD</td><td>8</td></row>
+ <row><td>ServerInformation</td><td>Next</td><td>NewDialog</td><td>ValidationError</td><td>INVALIDFIELD</td><td>9</td></row>
<row><td>ServerInformation</td><td>Next</td><td>[ALLUSERS]</td><td>1</td><td>ApplicationUsers = "AllUsers" And (Privileged Or Version9X)</td><td>1</td></row>
<row><td>ServerInformation</td><td>Next</td><td>[ALLUSERS]</td><td>{}</td><td>ApplicationUsers <> "AllUsers" Or Not (Privileged Or Version9X)</td><td>2</td></row>
- <row><td>ServerInformation</td><td>Next</td><td>[INVALIDDIALOG]</td><td>ServerInformation</td><td>INVALIDFIELD</td><td>0</td></row>
- <row><td>ServerInformation</td><td>Next</td><td>[SERVERPORT]</td><td>80</td><td>ALLUSERS</td><td>3</td></row>
- <row><td>ServerInformation</td><td>Next</td><td>[SERVERPORT]</td><td>8080</td><td>Not ALLUSERS</td><td>4</td></row>
- <row><td>ServerInformation</td><td>Next</td><td>[SERVERSSLPORT]</td><td>443</td><td>ALLUSERS</td><td>5</td></row>
- <row><td>ServerInformation</td><td>Next</td><td>[SERVERSSLPORT]</td><td>8443</td><td> </td><td>10</td></row>
+ <row><td>ServerInformation</td><td>Next</td><td>[INVALIDDIALOG]</td><td>ServerInformation</td><td>INVALIDFIELD</td><td>3</td></row>
+ <row><td>ServerInformation</td><td>Next</td><td>[SERVERPORT]</td><td>80</td><td>ALLUSERS</td><td>4</td></row>
+ <row><td>ServerInformation</td><td>Next</td><td>[SERVERPORT]</td><td>8080</td><td>Not ALLUSERS</td><td>5</td></row>
+ <row><td>ServerInformation</td><td>Next</td><td>[SERVERSSLPORT]</td><td>443</td><td>ALLUSERS</td><td>6</td></row>
+ <row><td>ServerInformation</td><td>Next</td><td>[SERVERSSLPORT]</td><td>8443</td><td> </td><td>7</td></row>
<row><td>SetupCompleteError</td><td>Back</td><td>EndDialog</td><td>Return</td><td>1</td><td>2</td></row>
<row><td>SetupCompleteError</td><td>Back</td><td>[Suspend]</td><td>{}</td><td>1</td><td>1</td></row>
<row><td>SetupCompleteError</td><td>Cancel</td><td>EndDialog</td><td>Return</td><td>1</td><td>2</td></row>
@@ -2424,8 +2424,8 @@
<col def="S255">Value</col>
<col def="S255">TestValue</col>
<col def="i4">Type</col>
- <row><td>ApacheBuildFolder</td><td>d:\asf-build\build-2.2.7\</td><td/><td>2</td></row>
- <row><td>ApacheTargetFolder</td><td>d:\asf-build\target-2.2.7\</td><td/><td>2</td></row>
+ <row><td>ApacheBuildFolder</td><td>d:\asf\httpd-2.2\</td><td/><td>2</td></row>
+ <row><td>ApacheTargetFolder</td><td>d:\apache2.2\</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>
---------------------------------------------------------------------
To unsubscribe, e-mail: win32-msi-cvs-unsubscribe@httpd.apache.org
For additional commands, e-mail: win32-msi-cvs-help@httpd.apache.org