Hmmm...must have misplaced the getcwd/chdir logic...

diff --git a/sapi/servlet/servlet.c b/sapi/servlet/servlet.c
index 9eddc35cf41446bafb95bc97bddde7b7b51b26aa..aada017b2bef03021165bcc7cf0c14c933b34aea 100644 (file)
--- a/sapi/servlet/servlet.c
+++ b/sapi/servlet/servlet.c
@@ -300,6 +300,7 @@ JNIEXPORT void JNICALL Java_net_php_servlet_send
 {
 
        zend_file_handle file_handle;
+       char cwd[MAXPATHLEN+1];
        jlong addr = 0;
        SLS_FETCH();
        PLS_FETCH();
@@ -339,7 +340,9 @@ JNIEXPORT void JNICALL Java_net_php_servlet_send
         * Parse the file
         */
        SETSTRING( SG(request_info).path_translated, pathTranslated );
+       getcwd(cwd,MAXPATHLEN);
        file_handle.handle.fp = php3_fopen_for_parser();
+       chdir(cwd);
        file_handle.filename = SG(request_info).path_translated;
        file_handle.free_filename = 0;
        file_handle.type = ZEND_HANDLE_FP;