From f0240a0382c7ac38144543965f7c45e57af54665 Mon Sep 17 00:00:00 2001 From: Ilia Alshanetsky Date: Mon, 5 Jan 2009 16:24:26 +0000 Subject: MFB: Improved parameter handling --- sapi/apache2handler/php_functions.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'sapi/apache2handler/php_functions.c') diff --git a/sapi/apache2handler/php_functions.c b/sapi/apache2handler/php_functions.c index 598b2ce567..45f7ac348d 100644 --- a/sapi/apache2handler/php_functions.c +++ b/sapi/apache2handler/php_functions.c @@ -221,12 +221,11 @@ PHP_FUNCTION(apache_response_headers) PHP_FUNCTION(apache_note) { php_struct *ctx; - char *note_name, *note_val; + char *note_name, *note_val = NULL; int note_name_len, note_val_len; char *old_note_val=NULL; - int arg_count = ZEND_NUM_ARGS(); - if (zend_parse_parameters(arg_count TSRMLS_CC, "s|s", ¬e_name, ¬e_name_len, ¬e_val, ¬e_val_len) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|s", ¬e_name, ¬e_name_len, ¬e_val, ¬e_val_len) == FAILURE) { return; } @@ -234,7 +233,7 @@ PHP_FUNCTION(apache_note) old_note_val = (char *) apr_table_get(ctx->r->notes, note_name); - if (arg_count == 2) { + if (note_val) { apr_table_set(ctx->r->notes, note_name, note_val); } -- cgit v1.2.1