CVS update: php4

Date: Saturday June 19, 1999 @ 9:04 Author: zeev Update of /repository/php4 In directory php:/tmp/cvs-serv26895 Modified Files: fopen-wrappers.c fopen-wrappers.h php_globals.h Log Message: Win32/ZTS compiles again Index: php4/fopen-wrappers.c diff -u php4/fopen-wrappers.c:1.19 php4/fopen-wrappers.c:1.20 --- php4/fopen-wrappers.c:1.19 Fri Jun 18 10:45:48 1999 +++ php4/fopen-wrappers.c Sat Jun 19 09:04:53 1999 @@ -27,7 +27,7 @@ | Jim Winstead <jimw@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: fopen-wrappers.c,v 1.19 1999/06/18 14:45:48 ssb Exp $ */ +/* $Id: fopen-wrappers.c,v 1.20 1999/06/19 13:04:53 zeev Exp $ */ /* Synced with php3 revision 1.66 1999-06-18 [ssb] */ @@ -100,13 +100,13 @@ When open_basedir is NULL, always return 0 */ -PHPAPI int _php3_check_specific_open_basedir(char *basedir, char *path) +PHPAPI int _php3_check_specific_open_basedir(char *basedir, char *path PLS_DC) { char resolved_name[MAXPATHLEN]; char resolved_basedir[MAXPATHLEN]; char local_open_basedir[MAXPATHLEN]; int local_open_basedir_pos; - PLS_FETCH(); + SLS_FETCH(); /* Special case basedir==".": Use script-directory */ if ((strcmp(PG(open_basedir), ".") == 0) && @@ -153,6 +153,8 @@ PHPAPI int _php3_check_open_basedir(char *path) { + PLS_FETCH(); + /* Only check when open_basedir is available */ if (PG(open_basedir) && *PG(open_basedir)) { char *pathbuf; @@ -174,7 +176,7 @@ end++; } - if (_php3_check_specific_open_basedir(ptr, path) == 0) { + if (_php3_check_specific_open_basedir(ptr, path PLS_CC) == 0) { efree(pathbuf); return 0; } Index: php4/fopen-wrappers.h diff -u php4/fopen-wrappers.h:1.5 php4/fopen-wrappers.h:1.6 --- php4/fopen-wrappers.h:1.5 Wed Jun 16 13:06:51 1999 +++ php4/fopen-wrappers.h Sat Jun 19 09:04:54 1999 @@ -26,13 +26,15 @@ | Authors: Jim Winstead <jimw@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: fopen-wrappers.h,v 1.5 1999/06/16 17:06:51 ssb Exp $ */ +/* $Id: fopen-wrappers.h,v 1.6 1999/06/19 13:04:54 zeev Exp $ */ /* Synced with php3 revision 1.25 1999-06-16 [ssb] */ #ifndef _FOPEN_WRAPPERS_H #define _FOPEN_WRAPPERS_H +#include "php_globals.h" + #define IGNORE_PATH 0 #define USE_PATH 1 #define IGNORE_URL 2 @@ -84,7 +86,7 @@ PHPAPI FILE *php3_fopen_for_parser(void); extern PHPAPI int _php3_check_open_basedir(char *path); -extern PHPAPI int _php3_check_specific_open_basedir(char *basedir, char *path); +extern PHPAPI int _php3_check_specific_open_basedir(char *basedir, char *path PLS_DC); extern PHPAPI FILE *php3_fopen_with_path(char *filename, char *mode, char *path, char **opened_path); Index: php4/php_globals.h diff -u php4/php_globals.h:1.16 php4/php_globals.h:1.17 --- php4/php_globals.h:1.16 Tue Jun 15 15:05:01 1999 +++ php4/php_globals.h Sat Jun 19 09:04:54 1999 @@ -64,6 +64,10 @@ long y2k_compliance; unsigned char header_is_being_sent; + + /* for fsock */ + HashTable ht_fsock_keys; + HashTable ht_fsock_socks; };