Commit 4a807ea0 authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files

Per discussion on list and based on user feedback, merge ApacheMonitor code 

back to the trunk/ development effort.  Provides for internationalized versions
of ApacheMonitor, and interoperability under Windows User Access Control (UAC)
restrictions.  When ApacheMonitor cannot control a service, it will attempt
to launch a new version of itself, prompting the user for Admin-rights credentials.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@660224 13f79535-47bb-0310-9956-ffa450edef68
parent 713e444a

STATUS

+0 −14
Changes for STATUS: 0 added lines, 14 removed lines.
Original line number Diff line number Diff line
@@ -300,20 +300,6 @@ PATCHES TO BACKPORT THAT ARE ON HOLD OR NOT GOING ANYWHERE SOON: 
       +1: niq, wrowe

         wrowe adds; looks good, no way to apply this without a minor bump



 * ApacheMonitor (win32); Sync to current trunk/.  This would

   Introduce the --kill flag, for use by the installer, solve

   a leak when using ApacheMonitor against another machine,

   update to international service names etc (unicoding it)

   and finally will allow Windows 2008 admins, and earlier

   versions' users to invoke the start|stop|restart etc with

   admin permissions.  Trouble is, an Admin under UAC does

   not actually launch admin-capable applications without

   being show a dialog to do so.  We could force this at the

   start of ApacheMonitor, but it would be bogus to present

   this on every login.

   http://svn.apache.org/viewvc/httpd/httpd/trunk/support/win32/ApacheMonitor.c?view=log

   +1: wrowe



CURRENT VOTES:



    *) httpd-std.conf and friends;

support/win32/ApacheMonitor.c

+328 −147

File changed.

Preview size limit exceeded, changes collapsed.

support/win32/ApacheMonitor.dsp

+22 −54
Changes for support/win32/ApacheMonitor.dsp: 22 added lines, 54 removed lines.
Original line number Diff line number Diff line
@@ -43,17 +43,23 @@ RSC=rc.exe 
# PROP Ignore_Export_Lib 0

# PROP Target_Dir ""

# ADD BASE CPP /nologo /MD /W3 /EHsc /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /FD /c

# ADD CPP /nologo /MD /W3 /EHsc /Zi /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "STRICT" /Fd"Release/ApacheMonitor_src" /FD /c

# ADD CPP /nologo /MD /W3 /EHsc /O2 /Oy- /Zi /I "../../include" /I "../../srclib/apr/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "STRICT" /Fd"Release/ApacheMonitor_src" /FD /c

# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

# ADD BASE RSC /l 0x409 /d "NDEBUG"

# ADD RSC /l 0x409 /i ".\\" /d "NDEBUG"

# ADD RSC /l 0x409 /i "../../include" /I "../../srclib/apr/include" /d "NDEBUG" /d "APP_FILE"

BSC32=bscmake.exe

# ADD BASE BSC32 /nologo

# ADD BSC32 /nologo

LINK32=link.exe

# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib comctl32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib /nologo /subsystem:windows

# ADD LINK32 kernel32.lib user32.lib gdi32.lib comctl32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib /nologo /subsystem:windows /debug /opt:ref

# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib comctl32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib wtsapi32.lib /nologo /subsystem:windows

# ADD LINK32 kernel32.lib user32.lib gdi32.lib comctl32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib wtsapi32.lib /nologo /subsystem:windows /debug /opt:ref

# Begin Special Build Tool

TargetPath=.\Release\ApacheMonitor.exe

SOURCE="$(InputPath)"

PostBuild_Desc=Embed .manifest

PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2

# End Special Build Tool



!ELSEIF  "$(CFG)" == "ApacheMonitor - Win32 Debug"
@@ -69,17 +75,23 @@ LINK32=link.exe 
# PROP Ignore_Export_Lib 0

# PROP Target_Dir ""

# ADD BASE CPP /nologo /W3 /Gm /EHsc /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /FD /c

# ADD CPP /nologo /MDd /W3 /Gm /EHsc /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "STRICT" /Fd"Debug/ApacheMonitor_src" /FD /c

# ADD CPP /nologo /MDd /W3 /Gm /EHsc /Zi /Od /I "../../include" /I "../../srclib/apr/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "STRICT" /Fd"Debug/ApacheMonitor_src" /FD /c

# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

# ADD BASE RSC /l 0x409 /d "_DEBUG"

# ADD RSC /l 0x409 /i ".\\" /d "_DEBUG"

# ADD RSC /l 0x409 /i "../../include" /I "../../srclib/apr/include" /d "_DEBUG" /d "APP_FILE"

BSC32=bscmake.exe

# ADD BASE BSC32 /nologo

# ADD BSC32 /nologo

LINK32=link.exe

# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib comctl32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib /nologo /subsystem:windows /debug

# ADD LINK32 kernel32.lib user32.lib gdi32.lib comctl32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib /nologo /subsystem:windows /incremental:no /debug

# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib comctl32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib wtsapi32.lib /nologo /subsystem:windows /debug

# ADD LINK32 kernel32.lib user32.lib gdi32.lib comctl32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib wtsapi32.lib /nologo /subsystem:windows /incremental:no /debug

# Begin Special Build Tool

TargetPath=.\Debug\ApacheMonitor.exe

SOURCE="$(InputPath)"

PostBuild_Desc=Embed .manifest

PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2

# End Special Build Tool



!ENDIF
@@ -96,19 +108,10 @@ SOURCE=.\apache_header.bmp 
# End Source File

# Begin Source File



SOURCE=.\ApacheMonitor.h

# End Source File

# Begin Source File



SOURCE=.\ApacheMonitor.ico

# End Source File

# Begin Source File



SOURCE=.\ApacheMonitor.rc

# PROP Exclude_From_Build 1

# End Source File

# Begin Source File



SOURCE=.\aprun.ico

# End Source File

# Begin Source File
@@ -130,46 +133,11 @@ SOURCE=.\ApacheMonitor.c 
# End Source File

# Begin Source File



SOURCE=.\ApacheMonitorVer.rc

SOURCE=.\ApacheMonitor.h

# End Source File

# Begin Source File



SOURCE=..\..\build\win32\win32ver.awk



!IF  "$(CFG)" == "ApacheMonitor - Win32 Release"



# PROP Ignore_Default_Tool 1

USERDEP__WIN32="..\..\include\ap_release.h"	".\ApacheMonitor.rc"	

# Begin Custom Build - Creating versioned resources

InputPath=..\..\build\win32\win32ver.awk



".\ApacheMonitorVer.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

	echo /* This file is autogenerated from ApacheMonitor.rc > ApacheMonitorVer.rc 

	echo  * DO NOT EDIT! >> ApacheMonitorVer.rc 

	echo  */ >> ApacheMonitorVer.rc 

	type ApacheMonitor.rc >> ApacheMonitorVer.rc 

	awk -f ../../build/win32/win32ver.awk ApacheMonitor.exe "Apache HTTP Server Monitor" ../../include/ap_release.h >> ApacheMonitorVer.rc 

	

# End Custom Build



!ELSEIF  "$(CFG)" == "ApacheMonitor - Win32 Debug"



# PROP Ignore_Default_Tool 1

USERDEP__WIN32="..\..\include\ap_release.h"	".\ApacheMonitor.rc"	

# Begin Custom Build - Creating versioned resources

InputPath=..\..\build\win32\win32ver.awk



".\ApacheMonitorVer.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

	echo /* This file is autogenerated from ApacheMonitor.rc > ApacheMonitorVer.rc 

	echo  * DO NOT EDIT! >> ApacheMonitorVer.rc 

	echo  */ >> ApacheMonitorVer.rc 

	type ApacheMonitor.rc >> ApacheMonitorVer.rc 

	awk -f ../../build/win32/win32ver.awk ApacheMonitor.exe "Apache HTTP Server Monitor" ../../include/ap_release.h >> ApacheMonitorVer.rc 

	

# End Custom Build



!ENDIF 



SOURCE=.\ApacheMonitor.rc

# End Source File

# End Target

# End Project

support/win32/ApacheMonitor.h

+4 −1
Changes for support/win32/ApacheMonitor.h: 4 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -14,8 +14,11 @@ 
 * limitations under the License.

 */



/* Resource definitions for ApacheMonitor.rc and ApacheMonitor.c

/**

 * @file  ApacheMonitor.h

 * @brief Resource definitions for ApacheMonitor.rc and ApacheMonitor.c

 */

#define BIN_NAME  ApacheMonitor.exe



#define IDD_DLGSERVICES                 101

#define IDS_APMONITORTITLE              102