iliaa Tue Jan 27 21:59:31 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/sapi/apache_hooks php_apache.c Log: Improved parameter parsing http://cvs.php.net/viewvc.cgi/php-src/sapi/apache_hooks/php_apache.c?r1=1.19.2.3.2.5.2.10&r2=1.19.2.3.2.5.2.11&diff_format=u Index: php-src/sapi/apache_hooks/php_apache.c diff -u php-src/sapi/apache_hooks/php_apache.c:1.19.2.3.2.5.2.10 php-src/sapi/apache_hooks/php_apache.c:1.19.2.3.2.5.2.11 --- php-src/sapi/apache_hooks/php_apache.c:1.19.2.3.2.5.2.10 Mon Jan 5 16:24:26 2009 +++ php-src/sapi/apache_hooks/php_apache.c Tue Jan 27 21:59:30 2009 @@ -17,7 +17,7 @@ | David Sklar <sk...@student.net> | +----------------------------------------------------------------------+ */ -/* $Id: php_apache.c,v 1.19.2.3.2.5.2.10 2009/01/05 16:24:26 iliaa Exp $ */ +/* $Id: php_apache.c,v 1.19.2.3.2.5.2.11 2009/01/27 21:59:30 iliaa Exp $ */ #include "php_apache_http.h" @@ -222,7 +222,7 @@ { zval *id; request_rec *r; - char *old_value, *new_value; + char *old_value, *new_value = NULL; int new_value_len; char **target; @@ -235,19 +235,13 @@ target = (char **)((char*)r + offset); old_value = *target; - switch (ZEND_NUM_ARGS()) { - case 0: - break; - case 1: - *target = ap_pstrdup(r->pool, new_value); - break; - default: - WRONG_PARAM_COUNT; - break; + if (new_value) { + *target = ap_pstrdup(r->pool, new_value); } - if (old_value) + if (old_value) { RETURN_STRING(old_value, 1); + } RETURN_EMPTY_STRING(); }
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php