etag test & fixes; set default etag mode for temp streams to crc32(b)

[m6w6/ext-http] / php_http_params.c

diff --git a/php_http_params.c b/php_http_params.c
index f7c7b7bb09966895f54bda98e87faa05ced60095..54ef493d0ab2c1d0fc0fe92d1b5d3668a1b9b38f 100644 (file)
--- a/php_http_params.c
+++ b/php_http_params.c
@@ -10,10 +10,7 @@
     +--------------------------------------------------------------------+
 */
 
-#include "php_http.h"
-
-#include <ext/standard/php_string.h>
-#include <Zend/zend_interfaces.h>
+#include "php_http_api.h"
 
 static php_http_params_token_t def_param_sep = {",", 1}, *def_param_sep_ptr[] = {&def_param_sep, NULL};
 static php_http_params_token_t def_arg_sep = {";", 1}, *def_arg_sep_ptr[] = {&def_arg_sep, NULL};
@@ -179,7 +176,9 @@ PHP_HTTP_API HashTable *php_http_params_parse(HashTable *params, const php_http_
 
 PHP_HTTP_BEGIN_ARGS(__construct, 0)
        PHP_HTTP_ARG_VAL(params, 0)
-       PHP_HTTP_ARG_VAL(flags, 0)
+       PHP_HTTP_ARG_VAL(param_sep, 0)
+       PHP_HTTP_ARG_VAL(arg_sep, 0)
+       PHP_HTTP_ARG_VAL(val_sep, 0)
 PHP_HTTP_END_ARGS;
 
 PHP_HTTP_EMPTY_ARGS(toArray);
@@ -288,10 +287,13 @@ PHP_METHOD(HttpParams, __construct)
                        switch (ZEND_NUM_ARGS()) {
                                case 4:
                                        zend_update_property(php_http_params_class_entry, getThis(), ZEND_STRL("param_sep"), param_sep TSRMLS_CC);
+                                       /* no break */
                                case 3:
                                        zend_update_property(php_http_params_class_entry, getThis(), ZEND_STRL("arg_sep"), arg_sep TSRMLS_CC);
+                                       /* no break */
                                case 2:
                                        zend_update_property(php_http_params_class_entry, getThis(), ZEND_STRL("val_sep"), val_sep TSRMLS_CC);
+                                       /* no break */
                        }
 
                        if (zparams) {