iliaa Tue Feb 4 15:54:18 2003 EDT
Modified files:
/php4/sapi/apache mod_php4.c
/php4/sapi/apache_hooks mod_php4.c
Log:
Fixed compilation of Apache & Apache Hooks SAPIs.
Index: php4/sapi/apache/mod_php4.c
diff -u php4/sapi/apache/mod_php4.c:1.152 php4/sapi/apache/mod_php4.c:1.153
--- php4/sapi/apache/mod_php4.c:1.152 Tue Feb 4 08:12:48 2003
+++ php4/sapi/apache/mod_php4.c Tue Feb 4 15:54:17 2003
@@ -17,7 +17,7 @@
| PHP 4.0 patches by Zeev Suraski <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: mod_php4.c,v 1.152 2003/02/04 13:12:48 zeev Exp $ */
+/* $Id: mod_php4.c,v 1.153 2003/02/04 20:54:17 iliaa Exp $ */
#include "php_apache_http.h"
#include "http_conf_globals.h"
@@ -674,7 +674,6 @@
*/
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)
{
- php_per_dir_entry *orig_per_dir_entry;
php_per_dir_entry *new_per_dir_entry;
if (zend_hash_find(target_ht, hash_key->arKey, hash_key->nKeyLength, (void **)
&new_per_dir_entry)==FAILURE) {
@@ -718,7 +717,7 @@
static void *php_merge_dir(pool *p, void *basev, void *addv)
{
/* This function *must* return addv, and not modify basev */
- zend_hash_merge_ex((HashTable *) addv, (HashTable *) basev, (copy_ctor_func_t)
copy_per_dir_entry, sizeof(php_per_dir_entry), (merge_checker_func_t)
should_overwrite_per_dir_entry, NULL);
+ zend_hash_merge_ex((HashTable *) addv, (HashTable *) basev, (copy_ctor_func_t)
+copy_per_dir_entry, sizeof(php_per_dir_entry), (zend_bool (*)(void *, void *))
+should_overwrite_per_dir_entry);
return addv;
}
/* }}} */
Index: php4/sapi/apache_hooks/mod_php4.c
diff -u php4/sapi/apache_hooks/mod_php4.c:1.7 php4/sapi/apache_hooks/mod_php4.c:1.8
--- php4/sapi/apache_hooks/mod_php4.c:1.7 Tue Feb 4 08:12:48 2003
+++ php4/sapi/apache_hooks/mod_php4.c Tue Feb 4 15:54:17 2003
@@ -17,7 +17,7 @@
| PHP 4.0 patches by Zeev Suraski <[EMAIL PROTECTED]>
|
+----------------------------------------------------------------------+
*/
-/* $Id: mod_php4.c,v 1.7 2003/02/04 13:12:48 zeev Exp $ */
+/* $Id: mod_php4.c,v 1.8 2003/02/04 20:54:17 iliaa Exp $ */
#include "php_apache_http.h"
@@ -783,12 +783,11 @@
}
/* }}} */
-/* {{{ should_overwrite_per_dir_entry
+/* {{{ 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)
{
- php_per_dir_entry *orig_per_dir_entry;
php_per_dir_entry *new_per_dir_entry;
if (zend_hash_find(target_ht, hash_key->arKey, hash_key->nKeyLength, (void **)
&new_per_dir_entry)==FAILURE) {
@@ -875,7 +874,7 @@
php_per_dir_config *a = (php_per_dir_config *) addv;
php_per_dir_config *b = (php_per_dir_config *) basev;
/* This function *must* return addv, and not modify basev */
- zend_hash_merge_ex((HashTable *) a->ini_settings, (HashTable *)
b->ini_settings, (copy_ctor_func_t) copy_per_dir_entry, sizeof(php_per_dir_entry),
(replace_checker_func_t) should_overwrite_per_dir_entry, NULL);
+ zend_hash_merge_ex((HashTable *) a->ini_settings, (HashTable *)
+b->ini_settings, (copy_ctor_func_t) copy_per_dir_entry, sizeof(php_per_dir_entry),
+(zend_bool (*)(void *, void *)) should_overwrite_per_dir_entry);
a->headers_handlers =
(a->headers_handlers.top)?a->headers_handlers:b->headers_handlers;
a->auth_handlers = (a->auth_handlers.top)?a->auth_handlers:b->auth_handlers;
a->access_handlers =
(a->access_handlers.top)?a->access_handlers:b->access_handlers;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
