mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-25 02:44:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

@Added -C command-line option to avoid chdir to the script's directory (Stig)

Browse Source
This commit is contained in:
Stig Bakken 2001-04-16 23:20:47 +00:00
parent f35cef5928
commit 0b2641efa6
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
main/SAPI.h
View File

@ -25,6 +25,8 @@
#include "zend_operators.h"
#include <sys/stat.h>
#define SAPI_OPTION_NO_CHDIR 1
#define SAPI_POST_BLOCK_SIZE 4000
#ifdef PHP_WIN32
@ -109,6 +111,7 @@ typedef struct {
char *default_charset;
HashTable *rfc1867_uploaded_files;
long post_max_size;
int options;
} sapi_globals_struct;

4
main/fopen_wrappers.c
View File

@ -348,7 +348,9 @@ PHPAPI FILE *php_fopen_primary_script(void)
STR_FREE(SG(request_info).path_translated); /* for same reason as above */
return NULL;
}
V_CHDIR_FILE(filename);
if (!(SG(options) & SAPI_OPTION_NO_CHDIR)) {
V_CHDIR_FILE(filename);
}
SG(request_info).path_translated = filename;
return fp;

8
sapi/cgi/cgi_main.c
View File

@ -80,7 +80,7 @@
extern char *ap_php_optarg;
extern int ap_php_optind;
#define OPTSTRING "ac:d:ef:g:hilmnqs?vz:"
#define OPTSTRING "aCc:d:ef:g:hilmnqs?vz:"
static int _print_module_info ( zend_module_entry *module, void *arg ) {
php_printf("%s\n", module->name);
@ -246,6 +246,7 @@ static void php_cgi_usage(char *argv0)
" -s Display colour syntax highlighted source.\n"
" -f <file> Parse <file>. Implies `-q'\n"
" -v Version number\n"
" -C Do not chdir to the script's directory\n"
" -c <path> Look for php.ini file in this directory\n"
#if SUPPORT_INTERACTIVE
" -a Run interactively\n"
@ -525,7 +526,10 @@ any .htaccess restrictions anywhere on your site you can leave doc_root undefine
#endif
break;
case 'd': /* define ini entries on command line */
case 'C': /* don't chdir to the script directory */
SG(options) |= SAPI_OPTION_NO_CHDIR;
break;
case 'd': /* define ini entries on command line */
define_command_line_ini_entry(ap_php_optarg);
break;