cvs: /php4/sapi/apache mod_php4.c

zeev Fri Jan 28 09:38:38 2000 EDT Modified files: /php4/sapi/apache mod_php4.c Log: Apache module compile fixes Index: php4/sapi/apache/mod_php4.c diff -u php4/sapi/apache/mod_php4.c:1.14 php4/sapi/apache/mod_php4.c:1.15 --- php4/sapi/apache/mod_php4.c:1.14 Fri Jan 28 09:24:50 2000 +++ php4/sapi/apache/mod_php4.c Fri Jan 28 09:38:08 2000 @@ -17,10 +17,11 @@ | PHP 4.0 patches by Zeev Suraski <zeev@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: mod_php4.c,v 1.14 2000/01/28 17:24:50 zeev Exp $ */ +/* $Id: mod_php4.c,v 1.15 2000/01/28 17:38:08 zeev Exp $ */ #include "zend.h" #include "php.h" +#include "php_variables.h" #include "httpd.h" #include "http_config.h" @@ -137,7 +138,9 @@ } if(ret != str_length) { PG(connection_status) = PHP_CONNECTION_ABORTED; - if(!PG(ignore_user_abort)) zend_bailout(); + if (!PG(ignore_user_abort)) { + zend_bailout(); + } } return ret; } @@ -224,11 +227,9 @@ static void sapi_apache_register_server_variables(zval *track_vars_array ELS_DC SLS_DC PLS_DC) { - pval **tmp_ptr; register int i; array_header *arr = table_elts(((request_rec *) SG(server_context))->subprocess_env); table_entry *elts = (table_entry *) arr->elts; - int len; char *script_filename=NULL; ELS_FETCH(); PLS_FETCH(); @@ -251,9 +252,9 @@ if (script_filename) { php_register_variable(script_filename, "PATH_TRANSLATED", NULL ELS_CC PLS_CC); } - php_register_variable(SG(server_context)->uri, "PHP_SELF", NULL ELS_CC PLS_CC); + php_register_variable(((request_rec *) SG(server_context))->uri, "PHP_SELF", NULL ELS_CC PLS_CC); } -* + static sapi_module_struct sapi_module = { "Apache", /* name */