cvs: php4 /main main.c php_virtual_cwd.c php_virtual_cwd.h

From: Date: Sun, 20 Aug 2000 18:12:16 +0000
Subject: cvs: php4 /main main.c php_virtual_cwd.c php_virtual_cwd.h
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-1269@lists.php.net to get a copy of this message
andi Sun Aug 20 11:12:16 2000 EDT Modified files: /php4/main main.c php_virtual_cwd.c php_virtual_cwd.h Log: - Sascha's patch should make PHP in VIRTUAL_DIR mode also change to the - right directory so this shouldn't be needed anymore. Index: php4/main/main.c diff -u php4/main/main.c:1.294 php4/main/main.c:1.295 --- php4/main/main.c:1.294 Sun Aug 20 07:28:59 2000 +++ php4/main/main.c Sun Aug 20 11:12:16 2000 @@ -19,7 +19,7 @@ */ -/* $Id: main.c,v 1.294 2000/08/20 14:28:59 sas Exp $ */ +/* $Id: main.c,v 1.295 2000/08/20 18:12:16 andi Exp $ */ #include <stdio.h> @@ -617,10 +617,6 @@ zend_activate(CLS_C ELS_CC); sapi_activate(SLS_C); -#ifdef VIRTUAL_DIR - virtual_cwd_activate(SG(request_info).path_translated); -#endif - zend_set_timeout(EG(timeout_seconds)); if (PG(expose_php)) { Index: php4/main/php_virtual_cwd.c diff -u php4/main/php_virtual_cwd.c:1.68 php4/main/php_virtual_cwd.c:1.69 --- php4/main/php_virtual_cwd.c:1.68 Sun Aug 20 07:11:50 2000 +++ php4/main/php_virtual_cwd.c Sun Aug 20 11:12:16 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_virtual_cwd.c,v 1.68 2000/08/20 14:11:50 sas Exp $ */ +/* $Id: php_virtual_cwd.c,v 1.69 2000/08/20 18:12:16 andi Exp $ */ #include <sys/types.h> #include <sys/stat.h> @@ -180,16 +180,6 @@ #if defined(ZEND_WIN32) && defined(ZTS) cwd_mutex = tsrm_mutex_alloc(); #endif -} - -CWD_API void virtual_cwd_activate(const char *filename) -{ -#if VIRTUAL_CWD_DEBUG - fprintf(stderr, "Changing dir to %s\n", filename); -#endif - if (filename) { - virtual_chdir_file(filename); - } } CWD_API void virtual_cwd_shutdown(void) Index: php4/main/php_virtual_cwd.h diff -u php4/main/php_virtual_cwd.h:1.35 php4/main/php_virtual_cwd.h:1.36 --- php4/main/php_virtual_cwd.h:1.35 Sun Aug 20 07:11:50 2000 +++ php4/main/php_virtual_cwd.h Sun Aug 20 11:12:16 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_virtual_cwd.h,v 1.35 2000/08/20 14:11:50 sas Exp $ */ +/* $Id: php_virtual_cwd.h,v 1.36 2000/08/20 18:12:16 andi Exp $ */ #ifndef VIRTUAL_CWD_H #define VIRTUAL_CWD_H @@ -73,7 +73,6 @@ CWD_API void virtual_cwd_startup(void); CWD_API void virtual_cwd_shutdown(void); -CWD_API void virtual_cwd_activate(const char *filename); CWD_API char *virtual_getcwd_ex(int *length); CWD_API char *virtual_getcwd(char *buf, size_t size); CWD_API int virtual_chdir(const char *path);

« previous php.cvs (#1269) next »