CVS update: php31/sapi

Date: Tuesday September 22, 1998 @ 15:19 Author: shane Update of /repository/php31/sapi In directory asf:/u2/tmp/cvs-serv25775/sapi Modified Files: apache_sapi.c isapi_sapi.c phpsapi_apache.dsp sapi.h wsapi_sapi.c Log Message: Fix memory manager start/shutdown remove NT specific code so we can run on 95/98 again fix some compile warnings Index: php31/sapi/apache_sapi.c diff -c php31/sapi/apache_sapi.c:2.18 php31/sapi/apache_sapi.c:2.19 *** php31/sapi/apache_sapi.c:2.18 Wed Sep 16 15:15:25 1998 --- php31/sapi/apache_sapi.c Tue Sep 22 15:19:51 1998 *************** *** 562,568 **** */ ! PHPAPI int apache_php3_module_main(request_rec * r, int fd, int display_source_mode, int preprocessed) { struct sapi_request_info *sapi_info; int ret=0; --- 562,568 ---- */ ! int apache_php3_module_main(request_rec * r, int fd, int display_source_mode, int preprocessed) { struct sapi_request_info *sapi_info; int ret=0; Index: php31/sapi/isapi_sapi.c diff -c php31/sapi/isapi_sapi.c:2.23 php31/sapi/isapi_sapi.c:2.24 *** php31/sapi/isapi_sapi.c:2.23 Wed Sep 16 15:15:25 1998 --- php31/sapi/isapi_sapi.c Tue Sep 22 15:19:52 1998 *************** *** 10,16 **** --- 10,18 ---- #include "snprintf.h" #include "ext/standard/php3_string.h" #include "ext/standard/base64.h" + #if USE_NT_SPECIFIC #include "os/nt/fileaccess.h" + #endif char *empty_string = ""; char *undefined_variable_string = "\0"; *************** *** 397,403 **** sapi_info->quiet_mode = 0; /*page stat info */ ! #if (WIN32|WINNT) sapi_info->page_uid = GetFileOwner(sapi_info->rqst_filename); /* contains SID on windows nt */ #else sapi_info->page_uid = -1; --- 399,405 ---- sapi_info->quiet_mode = 0; /*page stat info */ ! #if (WIN32|WINNT) && USE_NT_SPECIFIC sapi_info->page_uid = GetFileOwner(sapi_info->rqst_filename); /* contains SID on windows nt */ #else sapi_info->page_uid = -1; *************** *** 411,417 **** if (sapi_info->rqst_filename)free(sapi_info->rqst_filename); if (sapi_info->script_name)free(sapi_info->script_name); if (sapi_info->cookies)free(sapi_info->cookies); ! #if (WIN32|WINNT) if(sapi_info->page_uid)LocalFree(sapi_info->page_uid); #endif if (sapi_info)free(sapi_info); --- 413,419 ---- if (sapi_info->rqst_filename)free(sapi_info->rqst_filename); if (sapi_info->script_name)free(sapi_info->script_name); if (sapi_info->cookies)free(sapi_info->cookies); ! #if (WIN32|WINNT) && USE_NT_SPECIFIC if(sapi_info->page_uid)LocalFree(sapi_info->page_uid); #endif if (sapi_info)free(sapi_info); Index: php31/sapi/phpsapi_apache.dsp diff -c php31/sapi/phpsapi_apache.dsp:2.1 php31/sapi/phpsapi_apache.dsp:2.2 *** php31/sapi/phpsapi_apache.dsp:2.1 Thu Aug 27 17:07:16 1998 --- php31/sapi/phpsapi_apache.dsp Tue Sep 22 15:19:52 1998 *************** *** 69,75 **** # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c ! # ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "./" /I "../" /I "../main" /I "d:\apache\src\include" /D "HAVE_AP_COMPAT_H" /D "CRASH_DETECTION" /D "DEBUG" /D "_DEBUG" /D "THREAD_SAFE" /D "MSVC5" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 # ADD BASE RSC /l 0x409 /d "_DEBUG" --- 69,75 ---- # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c ! # ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "./" /I "../" /I "../main" /I "d:\apache\src\include" /D "COMPILE_DL" /D "HAVE_AP_COMPAT_H" /D "CRASH_DETECTION" /D "DEBUG" /D "_DEBUG" /D "THREAD_SAFE" /D "MSVC5" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 # ADD BASE RSC /l 0x409 /d "_DEBUG" Index: php31/sapi/sapi.h diff -c php31/sapi/sapi.h:2.16 php31/sapi/sapi.h:2.17 *** php31/sapi/sapi.h:2.16 Thu Sep 3 03:11:23 1998 --- php31/sapi/sapi.h Tue Sep 22 15:19:53 1998 *************** *** 56,62 **** int cgi, display_source_mode, preprocess, info_only, quiet_mode, interactive; char *argv0, *ini_path, *script_filename; /* page stat vars */ ! #if (WIN32|WINNT) PSID page_uid; #else long page_uid; --- 56,62 ---- int cgi, display_source_mode, preprocess, info_only, quiet_mode, interactive; char *argv0, *ini_path, *script_filename; /* page stat vars */ ! #if (WIN32|WINNT) && USE_NT_SPECIFIC PSID page_uid; #else long page_uid; Index: php31/sapi/wsapi_sapi.c diff -c php31/sapi/wsapi_sapi.c:2.10 php31/sapi/wsapi_sapi.c:2.11 *** php31/sapi/wsapi_sapi.c:2.10 Thu Sep 3 14:42:08 1998 --- php31/sapi/wsapi_sapi.c Tue Sep 22 15:19:53 1998 *************** *** 352,364 **** sapi_info->current_user = NULL; /*owner of script*/ sapi_info->current_user_length = 0; sapi_info->request_method = tp->method; - // sapi_info->script_name = NULL; sapi_info->script_name = _sapi_getenv(tp, "SCRIPT_NAME"); sapi_info->content_length = tp->content_length; sapi_info->content_type = tp->content_type; sapi_info->cookies = _sapi_getenv(tp, "HTTP_COOKIE"); sapi_info->authorization = tp->auth_line; ! sapi_info->server_name = tp->local_name; sapi_info->getenv = sapi_getenv; sapi_info->writeclient = sapi_writeclient; --- 352,363 ---- sapi_info->current_user = NULL; /*owner of script*/ sapi_info->current_user_length = 0; sapi_info->request_method = tp->method; sapi_info->script_name = _sapi_getenv(tp, "SCRIPT_NAME"); sapi_info->content_length = tp->content_length; sapi_info->content_type = tp->content_type; sapi_info->cookies = _sapi_getenv(tp, "HTTP_COOKIE"); sapi_info->authorization = tp->auth_line; ! sapi_info->server_name = (char *)tp->local_name; sapi_info->getenv = sapi_getenv; sapi_info->writeclient = sapi_writeclient; *************** *** 391,397 **** sapi_info->quiet_mode = 0; /*page stat info */ ! #if (WIN32|WINNT) sapi_info->page_uid = NULL; /* contains SID on windows nt */ #else sapi_info->page_uid = -1; --- 390,396 ---- sapi_info->quiet_mode = 0; /*page stat info */ ! #if (WIN32|WINNT) && USE_NT_SPECIFIC sapi_info->page_uid = NULL; /* contains SID on windows nt */ #else sapi_info->page_uid = -1; *************** *** 413,419 **** wsapi_free(sapi_info->script_name); if (sapi_info->cookies) wsapi_free(sapi_info->cookies); ! #if (WIN32|WINNT) if(sapi_info->page_uid)LocalFree(sapi_info->page_uid); #endif if (sapi_info) --- 412,418 ---- wsapi_free(sapi_info->script_name); if (sapi_info->cookies) wsapi_free(sapi_info->cookies); ! #if (WIN32|WINNT) && USE_NT_SPECIFIC if(sapi_info->page_uid)LocalFree(sapi_info->page_uid); #endif if (sapi_info) -- PHP Development Mailing List http://www.php.net/ To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net For help: php-dev-help@lists.php.net