bfrance Tue Jun 28 12:34:18 2005 EDT
Modified files:
/php-src NEWS
/php-src/sapi/apache mod_php5.c
Log:
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 now.
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1962&r2=1.1963&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1962 php-src/NEWS:1.1963
--- php-src/NEWS:1.1962 Mon Jun 27 14:38:03 2005
+++ php-src/NEWS Tue Jun 28 12:34:17 2005
@@ -3,6 +3,7 @@
?? ??? 2005, PHP 5.1 Beta 3
- Added PDO_MYSQL_ATTR_USE_BUFFERED_QUERY parameter for pdo_mysql, to toggle
usage of buffered queries.
+- Added a SG(server_context) NULL check to php_apache_getenv. (Brian)
- Fixed bug #33491 (crash after extending MySQLi internal class). (Tony)
- Fixed bug #33475 (cURL handle is not closed on curl_close(). (Ilia)
- Fixed bug #33469 (Compile error undefined reference to ifx_checkAPI). (Jani)
http://cvs.php.net/diff.php/php-src/sapi/apache/mod_php5.c?r1=1.16&r2=1.17&ty=u
Index: php-src/sapi/apache/mod_php5.c
diff -u php-src/sapi/apache/mod_php5.c:1.16 php-src/sapi/apache/mod_php5.c:1.17
--- php-src/sapi/apache/mod_php5.c:1.16 Mon Jun 20 08:46:34 2005
+++ php-src/sapi/apache/mod_php5.c Tue Jun 28 12:34:18 2005
@@ -17,7 +17,7 @@
| PHP 4.0 patches by Zeev Suraski <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: mod_php5.c,v 1.16 2005/06/20 12:46:34 tony2001 Exp $ */
+/* $Id: mod_php5.c,v 1.17 2005/06/28 16:34:18 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
