cvs: php4 /main config.w32.h /sapi/cgi cgi_main.c

andi Thu Jun 29 06:31:52 2000 EDT Modified files: /php4/main config.w32.h /php4/sapi/cgi cgi_main.c Log: - Fix problem with DICARD_PATH being defined in windows Index: php4/main/config.w32.h diff -u php4/main/config.w32.h:1.29 php4/main/config.w32.h:1.30 --- php4/main/config.w32.h:1.29 Mon Jun 26 10:11:28 2000 +++ php4/main/config.w32.h Thu Jun 29 06:31:51 2000 @@ -113,7 +113,7 @@ DONT TOUCH!!!!! Unless you realy know what your messing with! ---------------------------------------------------------------*/ -#define DISCARD_PATH 1 +#define DISCARD_PATH 0 #undef HAVE_SETITIMER #undef HAVE_IODBC #define HAVE_UODBC 1 Index: php4/sapi/cgi/cgi_main.c diff -u php4/sapi/cgi/cgi_main.c:1.59 php4/sapi/cgi/cgi_main.c:1.60 --- php4/sapi/cgi/cgi_main.c:1.59 Mon Jun 26 11:05:51 2000 +++ php4/sapi/cgi/cgi_main.c Thu Jun 29 06:31:52 2000 @@ -489,7 +489,10 @@ zend_llist_init(&global_vars, sizeof(char *), NULL, 0); if (!cgi) { /* never execute the arguments if you are a CGI */ - SG(request_info).argv0 = NULL; + if (!SG(request_info).argv0) { + free(SG(request_info).argv0); + SG(request_info).argv0 = NULL; + } while ((c = ap_php_getopt(argc, argv, "c:d:z:g:qvisnaeh?vf:")) != -1) { switch (c) { case 'f': @@ -630,6 +633,7 @@ SG(request_info).path_translated = estrdup(getenv("SCRIPT_FILENAME")); #else SG(request_info).path_translated = estrdup(getenv("PATH_TRANSLATED")); + #endif } if (cgi || SG(request_info).path_translated) {