 |
 |
 |
 |
|
|
Date: 05/31/98
- Next message: shane: "[PHP-DEV] CVS update: php31/ext/standard"
- Previous message: shane: "[PHP-DEV] CVS update: php31/sapi"
- Next in thread: shane: "[PHP-DEV] CVS update: php31/main"
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Date: Sunday May 31, 1998 @ 16:44
Author: shane
Update of /repository/php31/main
In directory asf:/tmp/cvs-serv28712
Modified Files:
internal_functions.c list.c phpsapi_core.dsp safe_mode.c
Removed Files:
internal_functions_registry.h request_info.c request_info.h
Log Message:
Removing unused files. More server specific code moves.
Index: php31/main/internal_functions.c
diff -c php31/main/internal_functions.c:1.3 php31/main/internal_functions.c:1.4
*** php31/main/internal_functions.c:1.3 Fri May 29 10:51:44 1998
--- php31/main/internal_functions.c Sun May 31 16:44:25 1998
***************
*** 29,35 ****
*/
! /* $Id: internal_functions.c,v 1.3 1998/05/29 14:51:44 shane Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
--- 29,35 ----
*/
! /* $Id: internal_functions.c,v 1.4 1998/05/31 20:44:25 shane Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
***************
*** 51,56 ****
--- 51,57 ----
#include "ext/standard/php3_bcmath.h"
#include "ext/msql/php3_msql.h"
#include "ext/standard/basic_functions.h"
+ #include "ext/standard/php3_apache.h"
#include "ext/standard/phpmath.h"
#include "ext/standard/php3_string.h"
#include "ext/oracle/oracle.h"
***************
*** 86,93 ****
#include "ext/snmp/php3_snmp.h"
#include "ext/zlib/php3_zlib.h"
!
extern php3_ini_structure php3_ini;
extern php3_ini_structure php3_ini_master;
#ifndef THREAD_SAFE
--- 87,95 ----
#include "ext/snmp/php3_snmp.h"
#include "ext/zlib/php3_zlib.h"
! #ifndef THREAD_SAFE
extern php3_ini_structure php3_ini;
+ #endif
extern php3_ini_structure php3_ini_master;
#ifndef THREAD_SAFE
***************
*** 95,100 ****
--- 97,107 ----
static int module_count;
int current_module_being_cleaned;
#endif
+
+ /* defines imported from internal_functions_registry.h */
+ extern int php3_init_mime(INIT_FUNC_ARGS);
+ /* environment functions */
+ extern int php3_init_environment(void);
unsigned char first_arg_force_ref[] = { 1, BYREF_FORCE };
unsigned char first_arg_allow_ref[] = { 1, BYREF_ALLOW };
Index: php31/main/list.c
diff -c php31/main/list.c:1.2 php31/main/list.c:1.3
*** php31/main/list.c:1.2 Wed May 27 12:08:36 1998
--- php31/main/list.c Sun May 31 16:44:26 1998
***************
*** 29,35 ****
*/
! /* $Id: list.c,v 1.2 1998/05/27 16:08:36 shane Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
--- 29,35 ----
*/
! /* $Id: list.c,v 1.3 1998/05/31 20:44:26 shane Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
***************
*** 44,55 ****
#include <dirent.h>
#endif
! #if MSVC5
! #if !(APACHE)
#define NEEDRDH 1
- #endif
#include "os/nt/readdir.h"
#endif
HashTable list,plist;
PHPAPI int le_index_ptr;
--- 44,54 ----
#include <dirent.h>
#endif
! #if WIN32|WINNT
#define NEEDRDH 1
#include "os/nt/readdir.h"
#endif
+
HashTable list,plist;
PHPAPI int le_index_ptr;
Index: php31/main/phpsapi_core.dsp
diff -c php31/main/phpsapi_core.dsp:1.5 php31/main/phpsapi_core.dsp:1.6
*** php31/main/phpsapi_core.dsp:1.5 Sat May 30 16:50:03 1998
--- php31/main/phpsapi_core.dsp Sun May 31 16:44:26 1998
***************
*** 70,76 ****
# 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 "../../main" /I "./" /D "DEBUG" /D "_DEBUG" /D "THREAD_SAFE" /D "USE_SAPI" /D "MSVC5" /D "WIN32" /D "_WINDOWS" /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"
--- 70,76 ----
# 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 "../../main" /I "./" /D "CRASH_DETECTION" /D "DEBUG" /D "_DEBUG" /D "THREAD_SAFE" /D "USE_SAPI" /D "MSVC5" /D "WIN32" /D "_WINDOWS" /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"
***************
*** 177,186 ****
# End Source File
# Begin Source File
- SOURCE=.\internal_functions_registry.h
- # End Source File
- # Begin Source File
-
SOURCE=".\language-parser.tab.c"
# End Source File
# Begin Source File
--- 177,182 ----
***************
*** 644,648 ****
--- 640,648 ----
SOURCE=..\ext\standard\url.h
# End Source File
# End Group
+ # Begin Source File
+
+ SOURCE=..\sapi\isapi_sapi.c
+ # End Source File
# End Target
# End Project
Index: php31/main/safe_mode.c
diff -c php31/main/safe_mode.c:1.3 php31/main/safe_mode.c:1.4
*** php31/main/safe_mode.c:1.3 Wed May 27 23:25:48 1998
--- php31/main/safe_mode.c Sun May 31 16:44:27 1998
***************
*** 26,32 ****
| Authors: Rasmus Lerdorf <rasmus <email protected>> |
+----------------------------------------------------------------------+
*/
! /* $Id: safe_mode.c,v 1.3 1998/05/28 03:25:48 shane Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
#endif
--- 26,32 ----
| Authors: Rasmus Lerdorf <rasmus <email protected>> |
+----------------------------------------------------------------------+
*/
! /* $Id: safe_mode.c,v 1.4 1998/05/31 20:44:27 shane Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
#endif
***************
*** 107,115 ****
PHPAPI char *_php3_get_current_user()
{
- #if CGI_BINARY || USE_SAPI || FHTTPD
struct stat statbuf;
- #endif
struct passwd *pwd;
int uid;
TLS_VARS;
--- 107,113 ----
***************
*** 118,135 ****
return GLOBAL(sapi_rqst)->current_user;
}
! /* FIXME: I need to have this somehow handled if
! USE_SAPI is defined, because cgi will also be
! interfaced in USE_SAPI */
! #if CGI_BINARY || USE_SAPI || FHTTPD
if (!GLOBAL(sapi_rqst)->filename || (stat(GLOBAL(sapi_rqst)->filename,&statbuf)==-1)) {
return empty_string;
}
uid = statbuf.st_uid;
- #endif
- #if APACHE
- uid = GLOBAL(php3_rqst)->finfo.st_uid;
- #endif
if ((pwd=getpwuid(uid))==NULL) {
return empty_string;
--- 116,126 ----
return GLOBAL(sapi_rqst)->current_user;
}
! /* FIXME: Apache was getting this from php3_rqst->finfo.st_uid */
if (!GLOBAL(sapi_rqst)->filename || (stat(GLOBAL(sapi_rqst)->filename,&statbuf)==-1)) {
return empty_string;
}
uid = statbuf.st_uid;
if ((pwd=getpwuid(uid))==NULL) {
return empty_string;
- Next message: shane: "[PHP-DEV] CVS update: php31/ext/standard"
- Previous message: shane: "[PHP-DEV] CVS update: php31/sapi"
- Next in thread: shane: "[PHP-DEV] CVS update: php31/main"
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]