From 80d878279b2cfe898e4738cef5049910aee9fb72 Mon Sep 17 00:00:00 2001 From: Andi Gutmans Date: Sun, 20 Aug 2000 18:12:16 +0000 Subject: [PATCH] - Sascha's patch should make PHP in VIRTUAL_DIR mode also change to the - right directory so this shouldn't be needed anymore. --- main/main.c | 4 ---- main/php_virtual_cwd.c | 10 ---------- main/php_virtual_cwd.h | 1 - 3 files changed, 15 deletions(-) diff --git a/main/main.c b/main/main.c index 936c66bd5a..c239fa1f72 100644 --- a/main/main.c +++ b/main/main.c @@ -617,10 +617,6 @@ int php_request_startup(CLS_D ELS_DC PLS_DC SLS_DC) 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)) { diff --git a/main/php_virtual_cwd.c b/main/php_virtual_cwd.c index cf4a99bccc..84f90c1538 100644 --- a/main/php_virtual_cwd.c +++ b/main/php_virtual_cwd.c @@ -182,16 +182,6 @@ CWD_API void virtual_cwd_startup(void) #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) { #ifndef ZTS diff --git a/main/php_virtual_cwd.h b/main/php_virtual_cwd.h index 1de12a28ba..9e7ea9ba66 100644 --- a/main/php_virtual_cwd.h +++ b/main/php_virtual_cwd.h @@ -73,7 +73,6 @@ typedef int (*verify_path_func)(const cwd_state *); 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); -- 2.40.0