httpd-win32-msi-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: httpd-win32-msi apache_1.3-win32.isv
Date Wed, 28 Feb 2001 04:47:11 GMT
wrowe       01/02/27 20:47:10

  Modified:    .        apache_1.3-win32.isv
  Log:
    Introduce the ValidateServerName test, although we still need a fix for
    the problem that the ValidateServerName error message never pops up.
  
  Revision  Changes    Path
  1.8       +31 -13    httpd-win32-msi/apache_1.3-win32.isv
  
  Index: apache_1.3-win32.isv
  ===================================================================
  RCS file: /home/cvs/httpd-win32-msi/apache_1.3-win32.isv,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- apache_1.3-win32.isv	2001/02/19 20:29:57	1.7
  +++ apache_1.3-win32.isv	2001/02/28 04:47:10	1.8
  @@ -1,7 +1,7 @@
   # InstallShield for Windows Installer Generated Project File
   # ** Do Not Edit **
   --------------------------------------------------------
  -KeyCount146664
  +KeyCount146675
   --------------------------------------------------------
   1	035	133ACTION	233	333	1033
   2	035	133ACTIONTEXT	233	333	TKey33f	1033f	1133f
  @@ -3244,8 +3244,8 @@
   S1075IDS__IsRegisterUserDlg_12	STRINGS	S1075		IDS__IsRegisterUserDlg_12	&Next >
	0	
   S1075IDS__IsRegisterUserDlg_13	STRINGS	S1075		IDS__IsRegisterUserDlg_13	Install Start
Menu shortcuts to [ApplicationName] for:		36921.4283449074	
   S1075IDS__IsRegisterUserDlg_16	STRINGS	S1075		IDS__IsRegisterUserDlg_16			0	
  -S1075IDS__IsRegisterUserDlg_14	STRINGS	S1075		IDS__IsRegisterUserDlg_14	&Anyone who
uses this computer (all users)		0	
  -S1075IDS__IsRegisterUserDlg_15	STRINGS	S1075		IDS__IsRegisterUserDlg_15	Only for &me
([USERNAME])		0	
  +S1075IDS__IsRegisterUserDlg_14	STRINGS	S1075		IDS__IsRegisterUserDlg_14	As a service for
&All Users (starts automatically) -- Recommended		36949.9446064815	
  +S1075IDS__IsRegisterUserDlg_15	STRINGS	S1075		IDS__IsRegisterUserDlg_15	Only for &me
([USERNAME])  -- Won't start automatically.		36949.9446064815	
   S1075IDS__IsRegisterUserDlg_18	STRINGS	S1075		IDS__IsRegisterUserDlg_18	&Serial Number:
	0	
   S1075IDS_Shortcuts_Configure	STRINGS	S1075		IDS_Shortcuts_Configure	Configure Apache Server
	36921.3480902778	
   S1075IDS_Shortcuts_ReviewLogs	STRINGS	S1075		IDS_Shortcuts_ReviewLogs	Review Server Log
Files		36901.8044444444	
  @@ -3258,8 +3258,16 @@
   S1075IDS_Shortcut_Description_FAQ	STRINGS	S1075		IDS_Shortcut_Description_FAQ	Frequently
Asked Questions about the Apache Server		36921.4562384259	
   S1075IDS_Shortcut_Description_OnlineDocs	STRINGS	S1075		IDS_Shortcut_Description_OnlineDocs
The Apache 1.3 Document at http://httpd.apache.org/docs/		36921.4585648148	
   S1075IDS__IsRegisterUserDlg_19	STRINGS	S1075		IDS__IsRegisterUserDlg_19	{\TahomaBoldRed8}Warning:
	36923.8387152778	
  -S1075IDS__IsRegisterUserDlg_20	STRINGS	S1075		IDS__IsRegisterUserDlg_20	This installer
does not support installation by any user other than an Administrator.  Please Cancel this
setup, log off, and login to Windows as an Administrator to install [ApplicationName].		36923.8387731481

  +S1075IDS__IsRegisterUserDlg_20	STRINGS	S1075		IDS__IsRegisterUserDlg_20	The Installation
Wizard does not support installation by any user other than an Administrator.  We strongly
recommend you Cancel this setup, log off, and login to Windows as an Administrator to install
[ApplicationName].		36949.9476851852	
   S1075ApacheWizardLogo	STRINGS	S1075		ApacheWizardLogo	<ISProjectFolder>\side_main.bmp
	0	
  +S1075NEW_STRING1	STRINGS	S1075		NEW_STRING1	You must install a TCP/IP completely WinSock2
compliant driver.  TCP/IP failed to respond to a request to start WinSock2.  Please review
your configuration and try again.		36949.9355671296	
  +S1075NEW_STRING2	STRINGS	S1075		NEW_STRING2	The Network Domain cannot be blank.  Please
fill in your domain prefix, such as 'somenet.com'.		36949.9357986111	
  +S1075NEW_STRING3	STRINGS	S1075		NEW_STRING3	The character '[2]' is not allowed in the
Network Domain name.  Please correct the Network Domain name.		36949.9359837963	
  +S1075NEW_STRING4	STRINGS	S1075		NEW_STRING4	The Server Name cannot be blank.  Please fill
in your fully qualified server name, such as 'www.somenet.com' or numeric IP address, such
as '123.45.67.89'.		36949.9361921296	
  +S1075NEW_STRING5	STRINGS	S1075		NEW_STRING5	The character '[2]' is not allowed in the
Server Name.  Please correct the Network Domain name.		36949.9363773148	
  +S1075NEW_STRING6	STRINGS	S1075		NEW_STRING6	The Administrator's Email Address cannot be
blank.  Please fill in the web server administrator's email address, such as 'webmaster@mydomain.com'.
	36949.9365625	
  +S1075NEW_STRING7	STRINGS	S1075		NEW_STRING7	The character '[2]' is not allowed in the
Administrator's Email Address.  Please correct the Network Domain name.		36949.936712963	
  +S1075NEW_STRING8	STRINGS	S1075		NEW_STRING8	The Administrator's Email Address does not
appear correctly formatted.  Please correct the email address , including the '@' sign.		36949.9368981481

   CHECKBOX_LAYOUT	CHECKBOX_LAYOUT	CHECKBOX_LAYOUT	1
   LAUNCHPROGRAM	CHECKBOX	C16328	1	
   LAUNCHREADME	CHECKBOX	C16329	1	
  @@ -3361,12 +3369,13 @@
   CUSTOM_ACTION_LAYOUT	CUSTOM_ACTION_LAYOUT	CUSTOM_ACTION_LAYOUT	1
   RewriteConfFiles	CUSTOM_ACTION	C32245	1	1602		-f "[#F46421_RewriteConf.awk]" "[#F98940_httpd.confinstwin]"
"[APACHEDIR]conf\httpd.default.conf" "[APACHEDIR] " "[SERVERDOMAIN]" "[SERVERNAME]" "[SERVERADMIN]"
	awk_exe	
   DuplicateConfFiles	CUSTOM_ACTION	C49209	1	1602		-f "[#F49208_DuplicateConf.awk]" "[APACHEDIR]conf\"
awk_exe	
  -SelfInstallService	CUSTOM_ACTION	C98237	1	1618	Self install the httpd service	-i -n Apache
-f "[APACHEDIR]conf\httpd.conf" -d "[APACHEDIR]"	F98246_Apache.exe	
  +SelfInstallService	CUSTOM_ACTION	C98237	1	1618		-i -n Apache -f "[APACHEDIR]conf\httpd.conf"
-d "[APACHEDIR]"	F98246_Apache.exe	
   SelfRemoveService	CUSTOM_ACTION	C98238	1	1106		-u -n Apache	F98246_Apache.exe	
  -ResolveServerName	CUSTOM_ACTION	C98243	1	193		ResolveServerName	real_features_dll	
  +ResolveServerName	CUSTOM_ACTION	C98243	1	65		ResolveServerName	real_features_dll	
   SelfStartService	CUSTOM_ACTION	C120055	1	1746		-k start -n Apache	F98246_Apache.exe	
   SelfStopService	CUSTOM_ACTION	C120056	1	1106		-k stop -n Apache	F98246_Apache.exe	
   RemovePriorService	CUSTOM_ACTION	C130014	1	1618		-u -n Apache	F98246_Apache.exe	
  +ValidateServerName	CUSTOM_ACTION	C146672	1	65		ValidateServerName	real_features_dll	
   DIALOG_SEQ_LAYOUT	DIALOG_SEQ_LAYOUT	DIALOG_SEQ_LAYOUT	1
   ACTIONTEXT_LAYOUT	ACTIONTEXT_LAYOUT	ACTIONTEXT_LAYOUT	1
   Default	ACTIONTEXT	A138	2
  @@ -3567,6 +3576,14 @@
   E7611930	ERROR	E761		1930	##IDS_ERROR_125##
   E7611931	ERROR	E761		1931	##IDS_ERROR_126##
   E7611932	ERROR	E761		1932	##IDS_ERROR_127##
  +E76120001	ERROR	E761		20001	##NEW_STRING1##
  +E76120011	ERROR	E761		20011	##NEW_STRING2##
  +E76120012	ERROR	E761		20012	##NEW_STRING3##
  +E76120021	ERROR	E761		20021	##NEW_STRING4##
  +E76120022	ERROR	E761		20022	##NEW_STRING5##
  +E76120031	ERROR	E761		20031	##NEW_STRING6##
  +E76120032	ERROR	E761		20032	##NEW_STRING7##
  +E76120033	ERROR	E761		20033	##NEW_STRING8##
   UITEXT_LAYOUT	UITEXT_LAYOUT	UITEXT_LAYOUT	1
   Default	UITEXT	U928	2
   U928AbsentPath	UITEXT	U928		AbsentPath	
  @@ -4070,10 +4087,10 @@
   ServerDomainEdit	CONTROL	C109405	1	ServerNameLabel	17	Edit	##IDS__IsServerInformation_4##
237	SERVERDOMAIN	63	-1			3	21
   ServerDomainLabel	CONTROL	C109406	1		10	Text	##IDS__IsServerInformation_3##	75		52	0		
3	21
   Next	CONTROL	C109407	1	Cancel	17	PushButton	##IDS__IsServerInformation_12##	66		243	0	
	3	230
  -NewDialog	CONTROL_EVENT	C109411	1	SetupType	1	1
  +DoAction	CONTROL_EVENT	C109411	1	ValidateServerName	1	1
   CONTROL_CONDITION	CONTROL_CONDITION	C125801	2
  -C1258011	CONTROL_CONDITION	C125801		1	Enable	SERVERDOMAIN > "" AND SERVERNAME >
"" AND SERVERADMIN > "" AND RESOLVED_WINSOCK2
  -C1258012	CONTROL_CONDITION	C125801		2	Disable	Not (SERVERDOMAIN > "" AND SERVERNAME
> "" AND SERVERADMIN > "" AND RESOLVED_WINSOCK2)
  +NewDialog	CONTROL_EVENT	C146673	1	SetupType	2	Not FIELDINVALID
  +NewDialog	CONTROL_EVENT	C146674	1	ServerInformation	3	FIELDINVALID
   ServerNameEdit	CONTROL	C109424	1	ServerAdminLabel	17	Edit		237	SERVERNAME	101	0			3	21
   ServerNameLabel	CONTROL	C109425	1	ServerNameEdit	10	Text	##IDS__IsServerInformation_5##
225		89	0			3	21
   ServerAdminEdit	CONTROL	C109430	1	Next	17	Edit		237	SERVERADMIN	140	0			3	21
  @@ -4112,13 +4129,11 @@
   AppUsersText	CONTROL	C109461	1		14	Text	##IDS__IsRegisterUserDlg_13##	300		161	0			3	21
   CONTROL_CONDITION	CONTROL_CONDITION	C109462	2
   C1094620	CONTROL_CONDITION	C109462		0	Hide	ProductState > 0
  -C1094621	CONTROL_CONDITION	C109462		1	Hide	NOT AdminUser
  -C1094622	CONTROL_CONDITION	C109462		2	Hide	Version9X
  +C1094621	CONTROL_CONDITION	C109462		1	Hide	Not (AdminUser Or Version9X)
   AppUsersGroup	CONTROL	C109463	1	Next	50	RadioButtonGroup	##IDS__IsRegisterUserDlg_16##
300	ApplicationUsers	170	0			3	63
   CONTROL_CONDITION	CONTROL_CONDITION	C109464	2
   C1094640	CONTROL_CONDITION	C109464		0	Hide	ProductState > 0
  -C1094641	CONTROL_CONDITION	C109464		1	Hide	NOT AdminUser
  -C1094642	CONTROL_CONDITION	C109464		2	Hide	Version9X
  +C1094641	CONTROL_CONDITION	C109464		1	Hide	Not (AdminUser Or Version9X)
   SerialLabel	CONTROL	C109465	1	AppUsersGroup	10	Text	##IDS__IsRegisterUserDlg_18##	109	
127	0			2	21
   CONTROL_CONDITION	CONTROL_CONDITION	C109466	2
   C1094661	CONTROL_CONDITION	C109466		1	Show	SERIALNUMSHOW
  @@ -6501,6 +6516,7 @@
   C120055CUSTOM_ACTION_LAYOUT	0
   C120056CUSTOM_ACTION_LAYOUT	0
   C130014CUSTOM_ACTION_LAYOUT	0
  +C146672CUSTOM_ACTION_LAYOUT	0
   DIALOG_SEQ_LAYOUTPROJECTROOT	0
   ACTIONTEXT_LAYOUTPROJECTROOT	0
   A138ACTIONTEXT_LAYOUT	0
  @@ -6939,6 +6955,8 @@
   C109407C109391	0
   C109411C109407	0
   C125801C109407	0
  +C146673C109407	0
  +C146674C109407	0
   C109424C109391	0
   C109425C109391	0
   C109430C109391	0
  
  
  

Mime
View raw message