apache_hooks php_apache.c

Ilia Alshanetsky Mon, 05 Jan 2009 08:24:39 -0800

iliaa           Mon Jan  5 16:24:26 2009 UTC

  Modified files:              (Branch: PHP_5_3)
    /php-src/sapi/apache2handler        php_functions.c 
    /php-src/sapi/apache        php_apache.c 
    /php-src/sapi/apache2filter php_functions.c 
    /php-src/sapi/apache_hooks  php_apache.c 
  Log:
  
  MFB: Improved parameter handling
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2handler/php_functions.c?r1=1.18.2.6.2.5.2.9&r2=1.18.2.6.2.5.2.10&diff_format=u
Index: php-src/sapi/apache2handler/php_functions.c
diff -u php-src/sapi/apache2handler/php_functions.c:1.18.2.6.2.5.2.9 
php-src/sapi/apache2handler/php_functions.c:1.18.2.6.2.5.2.10
--- php-src/sapi/apache2handler/php_functions.c:1.18.2.6.2.5.2.9        Wed Dec 
31 11:15:48 2008
+++ php-src/sapi/apache2handler/php_functions.c Mon Jan  5 16:24:25 2009
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: php_functions.c,v 1.18.2.6.2.5.2.9 2008/12/31 11:15:48 sebastian Exp $ 
*/
+/* $Id: php_functions.c,v 1.18.2.6.2.5.2.10 2009/01/05 16:24:25 iliaa Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -221,12 +221,11 @@
 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", &note_name, 
&note_name_len, &note_val, &note_val_len) == FAILURE) {
+       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|s", &note_name, 
&note_name_len, &note_val, &note_val_len) == FAILURE) {
                return;
        }
 
@@ -234,7 +233,7 @@
 
        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);
        }
 
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache/php_apache.c?r1=1.89.2.4.2.6.2.9&r2=1.89.2.4.2.6.2.10&diff_format=u
Index: php-src/sapi/apache/php_apache.c
diff -u php-src/sapi/apache/php_apache.c:1.89.2.4.2.6.2.9 
php-src/sapi/apache/php_apache.c:1.89.2.4.2.6.2.10
--- php-src/sapi/apache/php_apache.c:1.89.2.4.2.6.2.9   Wed Dec 31 11:15:48 2008
+++ php-src/sapi/apache/php_apache.c    Mon Jan  5 16:24:26 2009
@@ -17,7 +17,7 @@
    |          David Sklar <sk...@student.net>                             |
    +----------------------------------------------------------------------+
  */
-/* $Id: php_apache.c,v 1.89.2.4.2.6.2.9 2008/12/31 11:15:48 sebastian Exp $ */
+/* $Id: php_apache.c,v 1.89.2.4.2.6.2.10 2009/01/05 16:24:26 iliaa Exp $ */
 
 #include "php_apache_http.h"
 
@@ -312,18 +312,17 @@
    Get and set Apache request notes */
 PHP_FUNCTION(apache_note)
 {
-       char *note_name, *note_val;
+       char *note_name, *note_val = NULL;
        int note_name_len, note_val_len;
        char *old_val;
-       int arg_count = ZEND_NUM_ARGS();
 
-       if (zend_parse_parameters(arg_count TSRMLS_CC, "s|s", &note_name, 
&note_name_len, &note_val, &note_val_len) == FAILURE) {
+       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|s", &note_name, 
&note_name_len, &note_val, &note_val_len) == FAILURE) {
                return;
        }
 
        old_val = (char *) table_get(((request_rec 
*)SG(server_context))->notes, note_name);
 
-       if (arg_count == 2) {
+       if (note_val) {
                table_set(((request_rec *)SG(server_context))->notes, 
note_name, note_val);
        }
 
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2filter/php_functions.c?r1=1.44.2.2.2.2.2.8&r2=1.44.2.2.2.2.2.9&diff_format=u
Index: php-src/sapi/apache2filter/php_functions.c
diff -u php-src/sapi/apache2filter/php_functions.c:1.44.2.2.2.2.2.8 
php-src/sapi/apache2filter/php_functions.c:1.44.2.2.2.2.2.9
--- php-src/sapi/apache2filter/php_functions.c:1.44.2.2.2.2.2.8 Wed Dec 31 
11:15:48 2008
+++ php-src/sapi/apache2filter/php_functions.c  Mon Jan  5 16:24:26 2009
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: php_functions.c,v 1.44.2.2.2.2.2.8 2008/12/31 11:15:48 sebastian Exp $ 
*/
+/* $Id: php_functions.c,v 1.44.2.2.2.2.2.9 2009/01/05 16:24:26 iliaa Exp $ */
 
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -193,12 +193,11 @@
 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", &note_name, 
&note_name_len, &note_val, &note_val_len) == FAILURE) {
+       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|s", &note_name, 
&note_name_len, &note_val, &note_val_len) == FAILURE) {
                return;
        }
 
@@ -206,7 +205,7 @@
 
        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);
        }
 
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache_hooks/php_apache.c?r1=1.19.2.3.2.5.2.9&r2=1.19.2.3.2.5.2.10&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.9 
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.9     Wed Dec 31 
11:15:48 2008
+++ php-src/sapi/apache_hooks/php_apache.c      Mon Jan  5 16:24:26 2009
@@ -17,7 +17,7 @@
    |          David Sklar <sk...@student.net>                             |
    +----------------------------------------------------------------------+
  */
-/* $Id: php_apache.c,v 1.19.2.3.2.5.2.9 2008/12/31 11:15:48 sebastian Exp $ */
+/* $Id: php_apache.c,v 1.19.2.3.2.5.2.10 2009/01/05 16:24:26 iliaa Exp $ */
 
 #include "php_apache_http.h"
 
@@ -1551,18 +1551,17 @@
    Get and set Apache request notes */
 PHP_FUNCTION(apache_note)
 {
-       char *arg_name, *arg_val;
+       char *arg_name, *arg_val = NULL;
        int arg_name_len, arg_val_len;
        char *note_val;
-       int arg_count = ZEND_NUM_ARGS();
 
        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|s", &arg_name, 
&arg_name_len, &arg_val, &arg_val_len) == FAILURE) {
                return;
        }
 
        note_val = (char *) table_get(((request_rec 
*)SG(server_context))->notes, arg_name);
-       
-       if (arg_count == 2) {
+
+       if (arg_val) {
                table_set(((request_rec *)SG(server_context))->notes, arg_name, 
arg_val);
        }




-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_3) /sapi/apache php_apache.c /sapi/apache2filter php_functions.c /sapi/apache2handler php_functions.c /sapi/apache_hooks php_apache.c

Reply via email to