bfrance Tue Jun 28 12:38:03 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src NEWS
/php-src/sapi/apache mod_php5.c
Log:
MFH:
Added a SG(server_context) NULL check to php_apache_getenv.
This can get called when "<key> = ${<key>}:/foo" is used in a .ini file, but
<key> has not be set yet.
You will end up with a value of ":/foo", but at least it will not crash.
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.444&r2=1.1760.2.445&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.444 php-src/NEWS:1.1760.2.445
--- php-src/NEWS:1.1760.2.444 Mon Jun 27 14:21:57 2005
+++ php-src/NEWS Tue Jun 28 12:38:03 2005
@@ -3,6 +3,7 @@
?? ??? 2005, PHP 5.0.5
- Upgraded PCRE library to version 5.0. (Andrei)
- Removed php_check_syntax() function which never worked properly. (Ilia)
+- Added a SG(server_context) NULL check to php_apache_getenv. (Brian)
- Added new function mysqli_set_charset(). (Georg)
- Added man pages for "phpize" and "php-config" scripts. (Jakub Vrana)
- Added support for .cc files in extensions. (Brian)
http://cvs.php.net/diff.php/php-src/sapi/apache/mod_php5.c?r1=1.10.2.2&r2=1.10.2.3&ty=u
Index: php-src/sapi/apache/mod_php5.c
diff -u php-src/sapi/apache/mod_php5.c:1.10.2.2
php-src/sapi/apache/mod_php5.c:1.10.2.3
--- php-src/sapi/apache/mod_php5.c:1.10.2.2 Mon Jun 20 08:46:52 2005
+++ php-src/sapi/apache/mod_php5.c Tue Jun 28 12:38:03 2005
@@ -17,7 +17,7 @@
| PHP 4.0 patches by Zeev Suraski <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: mod_php5.c,v 1.10.2.2 2005/06/20 12:46:52 tony2001 Exp $ */
+/* $Id: mod_php5.c,v 1.10.2.3 2005/06/28 16:38:03 bfrance Exp $ */
#include "php_apache_http.h"
#include "http_conf_globals.h"
@@ -352,6 +352,10 @@
*/
static char *php_apache_getenv(char *name, size_t name_len TSRMLS_DC)
{
+ if (SG(server_context) == NULL) {
+ return NULL;
+ }
+
return (char *) table_get(((request_rec *)
SG(server_context))->subprocess_env, name);
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
