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 07:04:35 GMT
wrowe       01/02/27 23:04:35

  Modified:    .        apache_1.3-win32.isv
  Log:
    Update for release 1.3.19 and attempt to use the ResolveServerName
    test for bad name strings.
  
  Revision  Changes    Path
  1.9       +10 -12    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.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- apache_1.3-win32.isv	2001/02/28 04:47:10	1.8
  +++ apache_1.3-win32.isv	2001/02/28 07:04:35	1.9
  @@ -1,7 +1,7 @@
   # InstallShield for Windows Installer Generated Project File
   # ** Do Not Edit **
   --------------------------------------------------------
  -KeyCount146675
  +KeyCount146676
   --------------------------------------------------------
   1	035	133ACTION	233	333	1033
   2	035	133ACTIONTEXT	233	333	TKey33f	1033f	1133f
  @@ -1883,7 +1883,7 @@
   R55608(Default)	REGISTRYKEY	R55608		(Default)		%%%%NOVALUESET%%%%	1
   Apache	REGISTRYKEY	R55609	2	0	0	-1	-1	0	0	0	0	
   R55609(Default)	REGISTRYKEY	R55609		(Default)		%%%%NOVALUESET%%%%	1
  -1.3.18	REGISTRYKEY	R55610	2	0	0	-1	-1	0	0	0	0	
  +1.3.19	REGISTRYKEY	R55610	2	0	0	-1	-1	0	0	0	0	
   R55610(Default)	REGISTRYKEY	R55610		(Default)		%%%%NOVALUESET%%%%	1
   R55610ServerRoot	REGISTRYKEY	R55610		ServerRoot		[APACHEDIR]	1
   REG_HKU	REGISTRYKEY	R55601	2	0	0	-1	-1	0	0	0	0	
  @@ -3205,7 +3205,7 @@
   S1075IDS_Shortcut_ReviewErrors	STRINGS	S1075		IDS_Shortcut_ReviewErrors	Review Error Log
	36894.8510416667	
   S1075IDS_Shortcut_OnlineDocs	STRINGS	S1075		IDS_Shortcut_OnlineDocs	Apache Docs Online
	36901.7782291667	
   S1075IDS_Shortcut_FAQ	STRINGS	S1075		IDS_Shortcut_FAQ	Help I'm Stuck!		36895.0636342593

  -S1075IDS_Build_Version	STRINGS	S1075		IDS_Build_Version	Version 1.3.18 Win32		36921.3817939815

  +S1075IDS_Build_Version	STRINGS	S1075		IDS_Build_Version	Version 1.3.19 Win32		36921.3817939815

   S1075IDS__ReadMe_8	STRINGS	S1075		IDS__ReadMe_8	{&MSSWhiteSerif8}InstallShield		36894.8574537037

   S1075IDS__ReadMe_9	STRINGS	S1075		IDS__ReadMe_9	{&Tahoma8}InstallShield		36894.8575

   S1075IDS__ReadMe_6	STRINGS	S1075		IDS__ReadMe_6	<ISProjectFolder>\top_main.bmp	
36894.8567361111	
  @@ -3375,7 +3375,7 @@
   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	
  +ValidateServerName	CUSTOM_ACTION	C146672	1	1		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
  @@ -4073,8 +4073,8 @@
   ServerInformation	DIALOG	D109390	1	Next	267		ServerDomainEdit	374	Identification	##IDS__IsServerInformation_0##
50	1	50	Cancel	3	50
   Default	CONTROL_GROUP	C109391	1
   Back	CONTROL	C109392	1	ServerDomainEdit	17	PushButton	##IDS__IsServerInformation_11##	66
	243	0			3	164
  -NewDialog	CONTROL_EVENT	C109393	1	CustomerInformation	1	1
   CONTROL_CONDITION	CONTROL_CONDITION	C126507	2
  +NewDialog	CONTROL_EVENT	C146675	1	CustomerInformation	1	1
   Banner	CONTROL	C109394	1		44	Bitmap	##IDS__IsServerInformation_10##	374		0	0			1	0
   BannerLine	CONTROL	C109395	1		0	Line		374		44	0			1	0
   Branding1	CONTROL	C109396	1		13	Text	##IDS__IsServerInformation_18##	50		229	0			3	4
  @@ -4090,7 +4090,6 @@
   DoAction	CONTROL_EVENT	C109411	1	ValidateServerName	1	1
   CONTROL_CONDITION	CONTROL_CONDITION	C125801	2
   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
  @@ -4162,16 +4161,16 @@
   P791CommonFilesFolder	PATHVARIABLES	P791		CommonFilesFolder		1	
   P791ISProjectFolder	PATHVARIABLES	P791		ISProjectFolder		1	
   P791ISProductFolder	PATHVARIABLES	P791		ISProductFolder		1	
  -P791ApacheBuildFolder	PATHVARIABLES	P791		ApacheBuildFolder	<IsProjectFolder>\apache_1.3.18
2	
  -P791ApacheTargetFolder	PATHVARIABLES	P791		ApacheTargetFolder	<IsProjectFolder>\target_1.3.18
2	
  +P791ApacheBuildFolder	PATHVARIABLES	P791		ApacheBuildFolder	<IsProjectFolder>\apache_1.3.19
2	
  +P791ApacheTargetFolder	PATHVARIABLES	P791		ApacheTargetFolder	<IsProjectFolder>\target_1.3.19
2	
   ISAUTMERGEMODULE_LAYOUT	ISAUTMERGEMODULE_LAYOUT	ISAUTMERGEMODULE_LAYOUT	1
   DISKMAP_LAYOUT	DISKMAP_LAYOUT	DISKMAP_LAYOUT	1
   BUILDLABEL_LAYOUT	BUILDLABEL_LAYOUT	BUILDLABEL_LAYOUT	1
  -win32	BUILDLABEL	B4077	1	##IDS_Build_Version##		1.3.18			##IDS_Dev_Warning##		##AppProduct##
Apache httpd Server 1.3.18		{BF32468F-3C63-4F63-9721-34984A5E68B0}			0	0		IncludeSource	1
  +win32	BUILDLABEL	B4077	1	##IDS_Build_Version##		1.3.19			##IDS_Dev_Warning##		##AppProduct##
Apache httpd Server 1.3.19		{BF32468F-3C63-4F63-9721-34984A5E68B0}			0	0		IncludeSource	1
   Default	PROPERTIES	P4078	2
   P4078ProductCode	PROPERTIES	P4078		ProductCode	{D43B5451-9526-433D-B6D6-1BAE4CDA68A5}
	0
   P4078UpgradeCode	PROPERTIES	P4078		UpgradeCode	{5ED0E850-2FEE-4733-B85D-5E1324ADCB53}
	0
  -win32_nosrc	BUILDLABEL	B141268	1	##IDS_Build_Version##		1.3.18			##IDS_Dev_Warning##		##AppProduct##
Apache httpd Server 1.3.18		{2EB9D1F0-66BB-4005-9E83-779183AC8E0C}			0	0		NoSources	1
  +win32_nosrc	BUILDLABEL	B141268	1	##IDS_Build_Version##		1.3.19			##IDS_Dev_Warning##		##AppProduct##
Apache httpd Server 1.3.19		{2EB9D1F0-66BB-4005-9E83-779183AC8E0C}			0	0		NoSources	1
   Default	PROPERTIES	P141269	2
   P141269ProductCode	PROPERTIES	P141269		ProductCode	{E48E4AC2-AF60-413E-9AE7-C0E7ED220395}
	0
   P141269UpgradeCode	PROPERTIES	P141269		UpgradeCode	{67F6AAB9-150F-42FD-87CD-8343BD61FED9}
	0
  @@ -6939,8 +6938,8 @@
   D109390DIALOG_LAYOUT	0
   C109391D109390	0
   C109392C109391	0
  -C109393C109392	0
   C126507C109392	0
  +C146675C109392	0
   C109394C109391	0
   C109395C109391	0
   C109396C109391	0
  @@ -6956,7 +6955,6 @@
   C109411C109407	0
   C125801C109407	0
   C146673C109407	0
  -C146674C109407	0
   C109424C109391	0
   C109425C109391	0
   C109430C109391	0
  
  
  

Mime
View raw message