From 0a36161e13484a99ccf69bb38f206462d27cc6d6 Mon Sep 17 00:00:00 2001 From: "Mark A. Hershberger" Date: Wed, 25 Mar 2009 00:35:13 -0400 Subject: Imported Upstream version 5.1.2 --- sapi/apache/php_apache.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'sapi/apache/php_apache.c') diff --git a/sapi/apache/php_apache.c b/sapi/apache/php_apache.c index 1b051e0c1..159a4d940 100644 --- a/sapi/apache/php_apache.c +++ b/sapi/apache/php_apache.c @@ -2,12 +2,12 @@ +----------------------------------------------------------------------+ | PHP Version 5 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2005 The PHP Group | + | Copyright (c) 1997-2006 The PHP Group | +----------------------------------------------------------------------+ - | This source file is subject to version 3.0 of the PHP license, | + | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | | available through the world-wide-web at the following url: | - | http://www.php.net/license/3_0.txt. | + | http://www.php.net/license/3_01.txt | | If you did not receive a copy of the PHP license and are unable to | | obtain it through the world-wide-web, please send a note to | | license@php.net so we can mail you a copy immediately. | @@ -17,7 +17,7 @@ | David Sklar | +----------------------------------------------------------------------+ */ -/* $Id: php_apache.c,v 1.89 2005/08/03 14:08:45 sniper Exp $ */ +/* $Id: php_apache.c,v 1.89.2.3 2006/01/01 12:50:18 sniper Exp $ */ #include "php_apache_http.h" @@ -51,7 +51,7 @@ PHP_FUNCTION(apache_reset_timeout); PHP_MINFO_FUNCTION(apache); -function_entry apache_functions[] = { +zend_function_entry apache_functions[] = { PHP_FE(virtual, NULL) PHP_FE(apache_request_headers, NULL) PHP_FE(apache_note, NULL) @@ -135,7 +135,7 @@ PHP_FUNCTION(apache_child_terminate) Get and set Apache request notes */ PHP_FUNCTION(apache_note) { - pval **arg_name, **arg_val; + zval **arg_name, **arg_val; char *note_val; int arg_count = ZEND_NUM_ARGS(); @@ -304,7 +304,7 @@ PHP_MINFO_FUNCTION(apache) */ PHP_FUNCTION(virtual) { - pval **filename; + zval **filename; request_rec *rr = NULL; if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &filename) == FAILURE) { @@ -411,7 +411,7 @@ PHP_FUNCTION(apache_setenv) Perform a partial request of the given URI to obtain information about it */ PHP_FUNCTION(apache_lookup_uri) { - pval **filename; + zval **filename; request_rec *rr=NULL; if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &filename) == FAILURE) { @@ -485,7 +485,7 @@ This function is most likely a bad idea. Just playing with it for now. PHP_FUNCTION(apache_exec_uri) { - pval **filename; + zval **filename; request_rec *rr=NULL; TSRMLS_FETCH(); -- cgit v1.2.3