iliaa Tue Dec 10 15:16:31 2002 EDT
Modified files:
/php4/main php_main.h
/php4/sapi/apache_hooks mod_php4.c php_apache.c sapi_apache.c
Log:
Fixed a few compile warnings and one compile error.
Index: php4/main/php_main.h
diff -u php4/main/php_main.h:1.24 php4/main/php_main.h:1.25
--- php4/main/php_main.h:1.24 Sun Nov 17 19:59:23 2002
+++ php4/main/php_main.h Tue Dec 10 15:16:30 2002
@@ -18,7 +18,7 @@
*/
-/* $Id: php_main.h,v 1.24 2002/11/18 00:59:23 gschlossnagle Exp $ */
+/* $Id: php_main.h,v 1.25 2002/12/10 20:16:30 iliaa Exp $ */
#ifndef PHP_MAIN_H
@@ -35,6 +35,7 @@
PHPAPI void php_module_shutdown(TSRMLS_D);
PHPAPI void php_module_shutdown_for_exec(void);
PHPAPI int php_module_shutdown_wrapper(sapi_module_struct *sapi_globals);
+PHPAPI int php_request_startup_for_hook(TSRMLS_D);
PHPAPI int php_startup_extensions(zend_module_entry **ptr, int count);
Index: php4/sapi/apache_hooks/mod_php4.c
diff -u php4/sapi/apache_hooks/mod_php4.c:1.4 php4/sapi/apache_hooks/mod_php4.c:1.5
--- php4/sapi/apache_hooks/mod_php4.c:1.4 Tue Nov 26 00:57:02 2002
+++ php4/sapi/apache_hooks/mod_php4.c Tue Dec 10 15:16:30 2002
@@ -17,7 +17,7 @@
| PHP 4.0 patches by Zeev Suraski <[EMAIL PROTECTED]>
|
+----------------------------------------------------------------------+
*/
-/* $Id: mod_php4.c,v 1.4 2002/11/26 05:57:02 sniper Exp $ */
+/* $Id: mod_php4.c,v 1.5 2002/12/10 20:16:30 iliaa Exp $ */
#include "php_apache_http.h"
@@ -1087,7 +1087,6 @@
static CONST_PREFIX char *php_set_require(cmd_parms *cmd, void *dummy, char *arg1)
{
- php_per_server_config *conf;
return php_set_server_handler(cmd->server, arg1, 0, AP_HANDLER_TYPE_FILE);
}
/* }}} */
Index: php4/sapi/apache_hooks/php_apache.c
diff -u php4/sapi/apache_hooks/php_apache.c:1.4 php4/sapi/apache_hooks/php_apache.c:1.5
--- php4/sapi/apache_hooks/php_apache.c:1.4 Mon Nov 18 07:52:57 2002
+++ php4/sapi/apache_hooks/php_apache.c Tue Dec 10 15:16:30 2002
@@ -17,7 +17,7 @@
| David Sklar <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_apache.c,v 1.4 2002/11/18 12:52:57 edink Exp $ */
+/* $Id: php_apache.c,v 1.5 2002/12/10 20:16:30 iliaa Exp $ */
#include "php_apache_http.h"
@@ -132,10 +132,12 @@
/* {{{ php_apache_request_new(request_rec *r)
* create a new zval-instance for ApacheRequest that wraps request_rec
*/
-zval *php_apache_request_new(request_rec *r TSRMLS_DC)
+zval *php_apache_request_new(request_rec *r)
{
zval *req;
zval *addr;
+
+ TSRMLS_FETCH();
MAKE_STD_ZVAL(addr);
Z_TYPE_P(addr) = IS_LONG;
Index: php4/sapi/apache_hooks/sapi_apache.c
diff -u php4/sapi/apache_hooks/sapi_apache.c:1.2
php4/sapi/apache_hooks/sapi_apache.c:1.3
--- php4/sapi/apache_hooks/sapi_apache.c:1.2 Mon Nov 18 14:07:37 2002
+++ php4/sapi/apache_hooks/sapi_apache.c Tue Dec 10 15:16:30 2002
@@ -19,7 +19,7 @@
| Stig Bakken <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: sapi_apache.c,v 1.2 2002/11/18 19:07:37 gschlossnagle Exp $ */
+/* $Id: sapi_apache.c,v 1.3 2002/12/10 20:16:30 iliaa Exp $ */
#include "php_apache_http.h"
@@ -105,8 +105,8 @@
ZVAL_STRING(method, tmp +2, 1);
*tmp = ':';
call_user_function_ex(EG(function_table), &class, method, ret, 0,
NULL, 0, NULL TSRMLS_CC);
- zval_dtor(&class);
- zval_dtor(&method);
+ zval_dtor(class);
+ zval_dtor(method);
}
else {
php_error(E_ERROR, "Unable to call %s - not a Class::Method\n",
handler->name);
@@ -118,7 +118,7 @@
assert(0);
break;
}
- zval_dtor(&req);
+ zval_dtor(req);
AP(in_request) = 0;
return OK;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
