CVS update: php31/sapi
| From: | zeev | Date: | Tue, 01 Sep 1998 17:43:35 +0000 |
| Subject: | CVS update: php31/sapi | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-719@lists.php.net to get a copy of this message | ||
Date: Tuesday September 1, 1998 @ 13:43
Author: zeev
Update of /repository/php31/sapi
In directory asf:/u2/tmp/cvs-serv27187/sapi
Modified Files:
cgi_sapi.c
Log Message:
* Apply the fixes for #700 and #703 to 3.1
* Make 3.1 compile under UNIX again.
Index: php31/sapi/cgi_sapi.c
diff -c php31/sapi/cgi_sapi.c:2.19 php31/sapi/cgi_sapi.c:2.20
*** php31/sapi/cgi_sapi.c:2.19 Sun Aug 30 02:45:28 1998
--- php31/sapi/cgi_sapi.c Tue Sep 1 13:43:35 1998
***************
*** 156,162 ****
{
pval tmp;
/* Build the special-case PHP_SELF variable for the CGI version */
- SAPI_FUNC_VARS;
char *pi;
#if FORCE_CGI_REDIRECT
pi = sapi_info->path_info;
--- 156,161 ----
***************
*** 165,171 ****
--- 164,173 ----
#else
char *sn;
int l = 0;
+ #endif
+ SAPI_FUNC_VARS;
+ #if !FORCE_CGI_REDIRECT
sn = sapi_info->script_name;
pi = sapi_info->path_info;
if (sn) {
***************
*** 181,186 ****
--- 183,189 ----
tmp.value.str.val = emalloc(l + 1);
tmp.value.str.len = _php3_sprintf(tmp.value.str.val, "%s%s", (sn ? sn : ""),
(pi ? pi : "")); /* SAFE */
#endif
+
tmp.type = IS_STRING;
#ifdef THREAD_SAFE
_php3_hash_update(&php3_globals->symbol_table, "PHP_SELF",
sizeof("PHP_SELF"), (void *) & tmp, sizeof(pval), NULL);
--
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