- Sascha's patch should make PHP in VIRTUAL_DIR mode also change to the

- right directory so this shouldn't be needed anymore.

diff --git a/main/main.c b/main/main.c
index 936c66bd5aa3a1cea4be82b5ee1564415141f333..c239fa1f72a947982ba1e0aa1a7cdd5d66657212 100644 (file)
--- 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 cf4a99bccc57214fdc7a94e5c4885761e70fd134..84f90c1538f545ff652027101f642ff09e574797 100644 (file)
--- 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 1de12a28ba900cbd1f7e4fd6214dc22eb3148626..9e7ea9ba66a8c2df3cedaecfa31419e4490023ee 100644 (file)
--- 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);