dmitry Mon Aug 1 03:46:55 2005 EDT
Modified files:
/php-src NEWS
/php-src/sapi/apache mod_php5.c
Log:
Fixed bug #33723 (php_value overrides php_admin_value)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2014&r2=1.2015&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2014 php-src/NEWS:1.2015
--- php-src/NEWS:1.2014 Fri Jul 29 11:43:36 2005
+++ php-src/NEWS Mon Aug 1 03:46:53 2005
@@ -11,6 +11,7 @@
- Fixed bug #33841 (pdo sqlite driver forgets to update affected column count
on execution of prepared statments). (Ilia)
- Fixed bug #33802 (throw Exception in error handler causes crash). (Dmitry)
+- Fixed bug #33723 (php_value overrides php_admin_value). (Dmitry)
- Fixed bug #33710 (ArrayAccess objects doen't initialize $this). (Dmitry)
- Fixed bug #33690 (Crash setting some ini directives in httpd.conf). (Rasmus)
- Fixed bug #33578 (strtotime() problem with "Oct17" format). (Derick)
http://cvs.php.net/diff.php/php-src/sapi/apache/mod_php5.c?r1=1.17&r2=1.18&ty=u
Index: php-src/sapi/apache/mod_php5.c
diff -u php-src/sapi/apache/mod_php5.c:1.17 php-src/sapi/apache/mod_php5.c:1.18
--- php-src/sapi/apache/mod_php5.c:1.17 Tue Jun 28 12:34:18 2005
+++ php-src/sapi/apache/mod_php5.c Mon Aug 1 03:46:54 2005
@@ -17,7 +17,7 @@
| PHP 4.0 patches by Zeev Suraski <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: mod_php5.c,v 1.17 2005/06/28 16:34:18 bfrance Exp $ */
+/* $Id: mod_php5.c,v 1.18 2005/08/01 07:46:54 dmitry Exp $ */
#include "php_apache_http.h"
#include "http_conf_globals.h"
@@ -707,11 +707,11 @@
/* {{{ should_overwrite_per_dir_entry
*/
-static zend_bool should_overwrite_per_dir_entry(HashTable *target_ht,
php_per_dir_entry *orig_per_dir_entry, zend_hash_key *hash_key, void *pData)
+static zend_bool should_overwrite_per_dir_entry(HashTable *target_ht,
php_per_dir_entry *new_per_dir_entry, zend_hash_key *hash_key, void *pData)
{
- php_per_dir_entry *new_per_dir_entry;
+ php_per_dir_entry *orig_per_dir_entry;
- if (zend_hash_find(target_ht, hash_key->arKey, hash_key->nKeyLength,
(void **) &new_per_dir_entry)==FAILURE) {
+ if (zend_hash_find(target_ht, hash_key->arKey, hash_key->nKeyLength,
(void **) &orig_per_dir_entry)==FAILURE) {
return 1; /* does not exist in dest, copy from source */
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
