CVS update: php31/sapi
| From: | shane | Date: | Fri, 21 Aug 1998 17:17:00 +0000 |
| Subject: | CVS update: php31/sapi | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-430@lists.php.net to get a copy of this message | ||
Date: Friday August 21, 1998 @ 13:17
Author: shane
Update of /repository/php31/sapi
In directory asf:/tmp/cvs-serv28380/sapi
Modified Files:
cgi_sapi.c
Log Message:
interactive mode works again
Index: php31/sapi/cgi_sapi.c
diff -c php31/sapi/cgi_sapi.c:2.13 php31/sapi/cgi_sapi.c:2.14
*** php31/sapi/cgi_sapi.c:2.13 Fri Aug 21 09:48:44 1998
--- php31/sapi/cgi_sapi.c Fri Aug 21 13:16:59 1998
***************
*** 262,267 ****
--- 262,268 ----
sapi_info->info = sapi_print_info;
sapi_info->aborted = sapi_aborted;
sapi_info->abort = 0;
+ sapi_info->interactive=0;
/*page stat info */
sapi_info->page_uid = 0;
***************
*** 275,310 ****
sapi_info->debug_log = sapi_debug_log;
#endif
- #if !(WIN32|WINNT)
- /* APACHE PROBLEM. SCRIPT_FILENAME is not correctly set on apache NT*/
- /* Hack for annoying servers that do not set SCRIPT_FILENAME for us
- (like anything other than apache? :) */
if (!sapi_info->script_filename) {
- sapi_info->script_filename = getenv("SCRIPT_FILENAME");
- }
- #endif
- #if MSVC5
- OutputDebugString("SCRIPT_FILENAME: ");
- OutputDebugString(sapi_info->script_filename);
- OutputDebugString("\n");
- #endif
- if (!sapi_info->script_filename) {
if (sapi_info->argv0) {
sapi_info->script_filename = sapi_info->argv0;
- #if MSVC5
- OutputDebugString("argv0: ");
- OutputDebugString(sapi_info->argv0);
- OutputDebugString("\n");
- #endif
} else if (sapi_info->path_translated) {
/*for broken servers that don't set argv correctly,
not the best thing, but works */
sapi_info->script_filename = strdup(sapi_info->path_translated);
- #if MSVC5
- OutputDebugString("path_translated: ");
- OutputDebugString(sapi_info->path_translated);
- OutputDebugString("\n");
- #endif
} else {
/*hmm, no file specified, we could just exit with error now */
sapi_info->script_filename = NULL;
--- 276,288 ----
***************
*** 314,319 ****
--- 292,298 ----
sapi_info->rqst_filename = strdup(sapi_info->script_filename);
} else {
sapi_info->rqst_filename = NULL;
+ if(!sapi_info->cgi)sapi_info->interactive=1;
}
#if MSVC5
OutputDebugString("Filename: ");
***************
*** 460,465 ****
--- 439,447 ----
sapi_info->display_source_mode = 1;
break;
case 'c':
+ /*FIXME I'll have to think about how to handle
+ this in a threaded situation. Do we realy need
+ this? */
/*sapi_info->ini_path = strdup(optarg);*/
break;
case 'h':
***************
*** 490,496 ****
}
sapi_info->query_string = s;
}
! if (sapi_info->script_filename == NULL && !sapi_info->cgi && argc > arg)
{
sapi_info->argv0 = strdup(argv[arg]);
}
sapi_init();
--- 472,478 ----
}
sapi_info->query_string = s;
}
! if (!sapi_info->script_filename && !sapi_info->cgi && argc > arg) {
sapi_info->argv0 = strdup(argv[arg]);
}
sapi_init();
--
PHP Development Mailing List http://www.php.net/
To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net
For help: php-dev-help@lists.php.net