cvs: php4 /sapi/apache2handler apache_config.c php4apache2.dsp php_functions.c sapi_apache2.c
| From: | Edin Kadribasic | Date: | Tue, 25 Mar 2003 11:50:18 +0000 |
| Subject: | cvs: php4 /sapi/apache2handler apache_config.c php4apache2.dsp php_functions.c sapi_apache2.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-19770@lists.php.net to get a copy of this message | ||
edink Tue Mar 25 06:50:18 2003 EDT
Modified files:
/php4/sapi/apache2handler apache_config.c php4apache2.dsp
php_functions.c sapi_apache2.c
Log:
MFB and more. Fixed various win32 compilation issues. Also the sapi
is now built as php4apach2.dll since the filter is being obsoleted.
Index: php4/sapi/apache2handler/apache_config.c diff -u php4/sapi/apache2handler/apache_config.c:1.2 php4/sapi/apache2handler/apache_config.c:1.3 --- php4/sapi/apache2handler/apache_config.c:1.2 Fri Mar 7 08:45:33 2003 +++ php4/sapi/apache2handler/apache_config.c Tue Mar 25 06:50:18 2003 @@ -16,7 +16,9 @@ +----------------------------------------------------------------------+ */ -/* $Id: apache_config.c,v 1.2 2003/03/07 13:45:33 iliaa Exp $ */ +/* $Id: apache_config.c,v 1.3 2003/03/25 11:50:18 edink Exp $ */ + +#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS #include "php.h" #include "php_ini.h" Index: php4/sapi/apache2handler/php4apache2.dsp diff -u php4/sapi/apache2handler/php4apache2.dsp:1.1 php4/sapi/apache2handler/php4apache2.dsp:1.2 --- php4/sapi/apache2handler/php4apache2.dsp:1.1 Tue Feb 11 12:40:11 2003 +++ php4/sapi/apache2handler/php4apache2.dsp Tue Mar 25 06:50:18 2003 @@ -1,25 +1,25 @@ -# Microsoft Developer Studio Project File - Name="php4apache2h" - Package Owner=<4> +# Microsoft Developer Studio Project File - Name="php4apache2" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 -CFG=php4apache2h - Win32 Debug_TS +CFG=php4apache2 - Win32 Debug_TS !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE -!MESSAGE NMAKE /f "php4apache2h.mak". +!MESSAGE NMAKE /f "php4apache2.mak". !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE -!MESSAGE NMAKE /f "php4apache2h.mak" CFG="php4apache2h - Win32 Debug_TS" +!MESSAGE NMAKE /f "php4apache2.mak" CFG="php4apache2 - Win32 Debug_TS" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "php4apache2h - Win32 Release_TS" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "php4apache2h - Win32 Release_TS_inline" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "php4apache2h - Win32 Debug_TS" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "php4apache2 - Win32 Release_TS" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "php4apache2 - Win32 Release_TS_inline" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "php4apache2 - Win32 Debug_TS" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE # Begin Project @@ -30,7 +30,7 @@ MTL=midl.exe RSC=rc.exe -!IF "$(CFG)" == "php4apache2h - Win32 Release_TS" +!IF "$(CFG)" == "php4apache2 - Win32 Release_TS" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 @@ -43,7 +43,7 @@ # PROP Intermediate_Dir "Release_TS" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "php4apache2h_EXPORTS" /YX /FD /c +# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHP_APACHE2_EXPORTS" /YX /FD /c # ADD CPP /nologo /MD /W3 /GX /O2 /I "...\..\include" /I "..\..\win32" /I "..\..\Zend" /I "..\.." /I "..\..\..\bindlib_w32" /I "..\..\main" /I "..\..\TSRM" /D ZEND_DEBUG=0 /D "NDEBUG" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "_WINDOWS" /D "_USRDLL" /D "WIN32" /D "_MBCS" /D "_WINSOCK2API_" /D "_MSWSOCK_" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 @@ -56,7 +56,7 @@ # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 # ADD LINK32 php4ts.lib libhttpd.lib libapr.lib libaprutil.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /libpath:"..\..\Release_TS" /libpath:"..\..\TSRM\Release_TS" /libpath:"..\..\Zend\Release_TS" -!ELSEIF "$(CFG)" == "php4apache2h - Win32 Release_TS_inline" +!ELSEIF "$(CFG)" == "php4apache2 - Win32 Release_TS_inline" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 @@ -69,7 +69,7 @@ # PROP Intermediate_Dir "Release_TS_inline" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "php4apache2h_EXPORTS" /YX /FD /c +# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHP_APACHE2_EXPORTS" /YX /FD /c # ADD CPP /nologo /MD /W3 /GX /O2 /I "...\..\include" /I "..\..\win32" /I "..\..\Zend" /I "..\.." /I "..\..\..\bindlib_w32" /I "..\..\main" /I "..\..\TSRM" /D ZEND_DEBUG=0 /D "ZEND_WIN32_FORCE_INLINE" /D "NDEBUG" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "_WINDOWS" /D "_USRDLL" /D "WIN32" /D "_MBCS" /D "_WINSOCK2API_" /D "_MSWSOCK_" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 @@ -80,9 +80,9 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 php4ts.lib libhttpd.lib libapr.lib libaprutil.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS_inline/php4apache2h.dll" /libpath:"..\..\Release_TS_inline" /libpath:"..\..\TSRM\Release_TS_inline" /libpath:"..\..\Zend\Release_TS_inline" +# ADD LINK32 php4ts.lib libhttpd.lib libapr.lib libaprutil.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS_inline/php4apache2.dll" /libpath:"..\..\Release_TS_inline" /libpath:"..\..\TSRM\Release_TS_inline" /libpath:"..\..\Zend\Release_TS_inline" -!ELSEIF "$(CFG)" == "php4apache2h - Win32 Debug_TS" +!ELSEIF "$(CFG)" == "php4apache2 - Win32 Debug_TS" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 @@ -94,7 +94,7 @@ # PROP Output_Dir "..\..\Debug_TS" # PROP Intermediate_Dir "Debug_TS" # PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "php4apache2h_EXPORTS" /YX /FD /GZ /c +# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHP_APACHE2_EXPORTS" /YX /FD /GZ /c # ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "...\..\include" /I "..\..\win32" /I "..\..\Zend" /I "..\.." /I "..\..\..\bindlib_w32" /I "..\..\main" /I "..\..\TSRM" /D "_DEBUG" /D ZEND_DEBUG=1 /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "_WINDOWS" /D "_USRDLL" /D "WIN32" /D "_MBCS" /D "_WINSOCK2API_" /D "_MSWSOCK_" /YX /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 @@ -111,9 +111,9 @@ # Begin Target -# Name "php4apache2h - Win32 Release_TS" -# Name "php4apache2h - Win32 Release_TS_inline" -# Name "php4apache2h - Win32 Debug_TS" +# Name "php4apache2 - Win32 Release_TS" +# Name "php4apache2 - Win32 Release_TS_inline" +# Name "php4apache2 - Win32 Debug_TS" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" Index: php4/sapi/apache2handler/php_functions.c diff -u php4/sapi/apache2handler/php_functions.c:1.6 php4/sapi/apache2handler/php_functions.c:1.7 --- php4/sapi/apache2handler/php_functions.c:1.6 Tue Mar 25 03:07:13 2003 +++ php4/sapi/apache2handler/php_functions.c Tue Mar 25 06:50:18 2003 @@ -16,7 +16,9 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_functions.c,v 1.6 2003/03/25 08:07:13 sebastian Exp $ */ +/* $Id: php_functions.c,v 1.7 2003/03/25 11:50:18 edink Exp $ */ + +#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS #include "php.h" #include "ext/standard/php_smart_str.h" @@ -361,8 +363,8 @@ server_rec *serv = ((php_struct *) SG(server_context))->r->server; #if !defined(WIN32) && !defined(WINNT) AP_DECLARE_DATA extern unixd_config_rec unixd_config; -#endif extern int ap_max_requests_per_child; +#endif AP_DECLARE_DATA extern const char *ap_server_root; for (n = 0; ap_loaded_modules[n]; ++n) { @@ -395,9 +397,11 @@ #if !defined(WIN32) && !defined(WINNT) sprintf(tmp, "%s(%d)/%d", unixd_config.user_name, unixd_config.user_id, unixd_config.group_id); php_info_print_table_row(2, "User/Group", tmp); -#endif - sprintf(tmp, "Per Child: %d - Keep Alive: %s - Max Per Connection: %d", ap_max_requests_per_child, (serv->keep_alive ? "on":"off"), serv->keep_alive_max); +#else + sprintf(tmp, "Keep Alive: %s - Max Per Connection: %d", (serv->keep_alive ? "on":"off"), serv->keep_alive_max); +#endif + php_info_print_table_row(2, "Max Requests", tmp); sprintf(tmp, "Connection: %lld - Keep-Alive: %lld", (serv->timeout / 1000000), (serv->keep_alive_timeout / 1000000)); Index: php4/sapi/apache2handler/sapi_apache2.c diff -u php4/sapi/apache2handler/sapi_apache2.c:1.8 php4/sapi/apache2handler/sapi_apache2.c:1.9 --- php4/sapi/apache2handler/sapi_apache2.c:1.8 Mon Mar 24 20:34:32 2003 +++ php4/sapi/apache2handler/sapi_apache2.c Tue Mar 25 06:50:18 2003 @@ -18,9 +18,11 @@ +----------------------------------------------------------------------+ */ -/* $Id: sapi_apache2.c,v 1.8 2003/03/25 01:34:32 iliaa Exp $ */ +/* $Id: sapi_apache2.c,v 1.9 2003/03/25 11:50:18 edink Exp $ */ #include <fcntl.h> + +#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS #include "php.h" #include "php_main.h"
Index: php4/sapi/apache2handler/apache_config.c diff -u php4/sapi/apache2handler/apache_config.c:1.2 php4/sapi/apache2handler/apache_config.c:1.3 --- php4/sapi/apache2handler/apache_config.c:1.2 Fri Mar 7 08:45:33 2003 +++ php4/sapi/apache2handler/apache_config.c Tue Mar 25 06:50:18 2003 @@ -16,7 +16,9 @@ +----------------------------------------------------------------------+ */ -/* $Id: apache_config.c,v 1.2 2003/03/07 13:45:33 iliaa Exp $ */ +/* $Id: apache_config.c,v 1.3 2003/03/25 11:50:18 edink Exp $ */ + +#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS #include "php.h" #include "php_ini.h" Index: php4/sapi/apache2handler/php4apache2.dsp diff -u php4/sapi/apache2handler/php4apache2.dsp:1.1 php4/sapi/apache2handler/php4apache2.dsp:1.2 --- php4/sapi/apache2handler/php4apache2.dsp:1.1 Tue Feb 11 12:40:11 2003 +++ php4/sapi/apache2handler/php4apache2.dsp Tue Mar 25 06:50:18 2003 @@ -1,25 +1,25 @@ -# Microsoft Developer Studio Project File - Name="php4apache2h" - Package Owner=<4> +# Microsoft Developer Studio Project File - Name="php4apache2" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 -CFG=php4apache2h - Win32 Debug_TS +CFG=php4apache2 - Win32 Debug_TS !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE -!MESSAGE NMAKE /f "php4apache2h.mak". +!MESSAGE NMAKE /f "php4apache2.mak". !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE -!MESSAGE NMAKE /f "php4apache2h.mak" CFG="php4apache2h - Win32 Debug_TS" +!MESSAGE NMAKE /f "php4apache2.mak" CFG="php4apache2 - Win32 Debug_TS" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "php4apache2h - Win32 Release_TS" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "php4apache2h - Win32 Release_TS_inline" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "php4apache2h - Win32 Debug_TS" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "php4apache2 - Win32 Release_TS" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "php4apache2 - Win32 Release_TS_inline" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "php4apache2 - Win32 Debug_TS" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE # Begin Project @@ -30,7 +30,7 @@ MTL=midl.exe RSC=rc.exe -!IF "$(CFG)" == "php4apache2h - Win32 Release_TS" +!IF "$(CFG)" == "php4apache2 - Win32 Release_TS" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 @@ -43,7 +43,7 @@ # PROP Intermediate_Dir "Release_TS" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "php4apache2h_EXPORTS" /YX /FD /c +# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHP_APACHE2_EXPORTS" /YX /FD /c # ADD CPP /nologo /MD /W3 /GX /O2 /I "...\..\include" /I "..\..\win32" /I "..\..\Zend" /I "..\.." /I "..\..\..\bindlib_w32" /I "..\..\main" /I "..\..\TSRM" /D ZEND_DEBUG=0 /D "NDEBUG" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "_WINDOWS" /D "_USRDLL" /D "WIN32" /D "_MBCS" /D "_WINSOCK2API_" /D "_MSWSOCK_" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 @@ -56,7 +56,7 @@ # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 # ADD LINK32 php4ts.lib libhttpd.lib libapr.lib libaprutil.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /libpath:"..\..\Release_TS" /libpath:"..\..\TSRM\Release_TS" /libpath:"..\..\Zend\Release_TS" -!ELSEIF "$(CFG)" == "php4apache2h - Win32 Release_TS_inline" +!ELSEIF "$(CFG)" == "php4apache2 - Win32 Release_TS_inline" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 @@ -69,7 +69,7 @@ # PROP Intermediate_Dir "Release_TS_inline" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "php4apache2h_EXPORTS" /YX /FD /c +# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHP_APACHE2_EXPORTS" /YX /FD /c # ADD CPP /nologo /MD /W3 /GX /O2 /I "...\..\include" /I "..\..\win32" /I "..\..\Zend" /I "..\.." /I "..\..\..\bindlib_w32" /I "..\..\main" /I "..\..\TSRM" /D ZEND_DEBUG=0 /D "ZEND_WIN32_FORCE_INLINE" /D "NDEBUG" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "_WINDOWS" /D "_USRDLL" /D "WIN32" /D "_MBCS" /D "_WINSOCK2API_" /D "_MSWSOCK_" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 @@ -80,9 +80,9 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 php4ts.lib libhttpd.lib libapr.lib libaprutil.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS_inline/php4apache2h.dll" /libpath:"..\..\Release_TS_inline" /libpath:"..\..\TSRM\Release_TS_inline" /libpath:"..\..\Zend\Release_TS_inline" +# ADD LINK32 php4ts.lib libhttpd.lib libapr.lib libaprutil.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS_inline/php4apache2.dll" /libpath:"..\..\Release_TS_inline" /libpath:"..\..\TSRM\Release_TS_inline" /libpath:"..\..\Zend\Release_TS_inline" -!ELSEIF "$(CFG)" == "php4apache2h - Win32 Debug_TS" +!ELSEIF "$(CFG)" == "php4apache2 - Win32 Debug_TS" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 @@ -94,7 +94,7 @@ # PROP Output_Dir "..\..\Debug_TS" # PROP Intermediate_Dir "Debug_TS" # PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "php4apache2h_EXPORTS" /YX /FD /GZ /c +# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHP_APACHE2_EXPORTS" /YX /FD /GZ /c # ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "...\..\include" /I "..\..\win32" /I "..\..\Zend" /I "..\.." /I "..\..\..\bindlib_w32" /I "..\..\main" /I "..\..\TSRM" /D "_DEBUG" /D ZEND_DEBUG=1 /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "_WINDOWS" /D "_USRDLL" /D "WIN32" /D "_MBCS" /D "_WINSOCK2API_" /D "_MSWSOCK_" /YX /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 @@ -111,9 +111,9 @@ # Begin Target -# Name "php4apache2h - Win32 Release_TS" -# Name "php4apache2h - Win32 Release_TS_inline" -# Name "php4apache2h - Win32 Debug_TS" +# Name "php4apache2 - Win32 Release_TS" +# Name "php4apache2 - Win32 Release_TS_inline" +# Name "php4apache2 - Win32 Debug_TS" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" Index: php4/sapi/apache2handler/php_functions.c diff -u php4/sapi/apache2handler/php_functions.c:1.6 php4/sapi/apache2handler/php_functions.c:1.7 --- php4/sapi/apache2handler/php_functions.c:1.6 Tue Mar 25 03:07:13 2003 +++ php4/sapi/apache2handler/php_functions.c Tue Mar 25 06:50:18 2003 @@ -16,7 +16,9 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_functions.c,v 1.6 2003/03/25 08:07:13 sebastian Exp $ */ +/* $Id: php_functions.c,v 1.7 2003/03/25 11:50:18 edink Exp $ */ + +#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS #include "php.h" #include "ext/standard/php_smart_str.h" @@ -361,8 +363,8 @@ server_rec *serv = ((php_struct *) SG(server_context))->r->server; #if !defined(WIN32) && !defined(WINNT) AP_DECLARE_DATA extern unixd_config_rec unixd_config; -#endif extern int ap_max_requests_per_child; +#endif AP_DECLARE_DATA extern const char *ap_server_root; for (n = 0; ap_loaded_modules[n]; ++n) { @@ -395,9 +397,11 @@ #if !defined(WIN32) && !defined(WINNT) sprintf(tmp, "%s(%d)/%d", unixd_config.user_name, unixd_config.user_id, unixd_config.group_id); php_info_print_table_row(2, "User/Group", tmp); -#endif - sprintf(tmp, "Per Child: %d - Keep Alive: %s - Max Per Connection: %d", ap_max_requests_per_child, (serv->keep_alive ? "on":"off"), serv->keep_alive_max); +#else + sprintf(tmp, "Keep Alive: %s - Max Per Connection: %d", (serv->keep_alive ? "on":"off"), serv->keep_alive_max); +#endif + php_info_print_table_row(2, "Max Requests", tmp); sprintf(tmp, "Connection: %lld - Keep-Alive: %lld", (serv->timeout / 1000000), (serv->keep_alive_timeout / 1000000)); Index: php4/sapi/apache2handler/sapi_apache2.c diff -u php4/sapi/apache2handler/sapi_apache2.c:1.8 php4/sapi/apache2handler/sapi_apache2.c:1.9 --- php4/sapi/apache2handler/sapi_apache2.c:1.8 Mon Mar 24 20:34:32 2003 +++ php4/sapi/apache2handler/sapi_apache2.c Tue Mar 25 06:50:18 2003 @@ -18,9 +18,11 @@ +----------------------------------------------------------------------+ */ -/* $Id: sapi_apache2.c,v 1.8 2003/03/25 01:34:32 iliaa Exp $ */ +/* $Id: sapi_apache2.c,v 1.9 2003/03/25 11:50:18 edink Exp $ */ #include <fcntl.h> + +#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS #include "php.h" #include "php_main.h"