batch renaming: client*curl curl*client

[m6w6/ext-http] / php_http_params.c

diff --git a/php_http_params.c b/php_http_params.c
index a07e50ba402962cd3bff5843a548c10d28a87cf0..4b9844820542bbe9c53f0c92f354d2ece9edca7d 100644 (file)
--- a/php_http_params.c
+++ b/php_http_params.c
@@ -206,7 +206,13 @@ PHP_HTTP_API php_http_buffer_t *php_http_params_to_string(php_http_buffer_t *buf
                        php_http_buffer_appendf(buf, "%lu", key1.num);
                }
 
-               if (Z_TYPE_PP(zparam) == IS_ARRAY) {
+               if (Z_TYPE_PP(zparam) != IS_ARRAY) {
+                       zval *tmp = php_http_ztyp(IS_STRING, *zparam);
+
+                       php_http_buffer_append(buf, vss, vsl);
+                       php_http_buffer_append(buf, Z_STRVAL_P(tmp), Z_STRLEN_P(tmp));
+                       zval_ptr_dtor(&tmp);
+               } else {
                        zval **zvalue, **zargs, **zarg;
 
                        /* got a value? */
@@ -223,39 +229,46 @@ PHP_HTTP_API php_http_buffer_t *php_http_params_to_string(php_http_buffer_t *buf
                                }
                        }
                        /* add arguments */
-                       if (SUCCESS == zend_hash_find(Z_ARRVAL_PP(zparam), ZEND_STRS("arguments"), (void *) &zargs)) {
-                               if (Z_TYPE_PP(zargs) == IS_ARRAY) {
-                                       FOREACH_KEYVAL(pos2, *zargs, key2, zarg) {
-                                               /* new arg? */
-                                               if (PHP_HTTP_BUFFER_LEN(buf)) {
-                                                       php_http_buffer_append(buf, ass, asl);
-                                               }
+                       if (SUCCESS != zend_hash_find(Z_ARRVAL_PP(zparam), ZEND_STRS("arguments"), (void *) &zargs)) {
+                               zargs = zparam;
+                       }
 
-                                               /* add name */
-                                               if (key2.type == HASH_KEY_IS_STRING) {
-                                                       php_http_buffer_append(buf, key2.str, key2.len - 1);
+                       if (Z_TYPE_PP(zargs) == IS_ARRAY) {
+                               FOREACH_KEYVAL(pos2, *zargs, key2, zarg) {
+                                       /* skip "value" if zargs == zparam */
+                                       if (zargs == zparam && key2.type == HASH_KEY_IS_STRING && !strcmp(key2.str, "value")) {
+                                               continue;
+                                       }
+
+                                       /* new arg? */
+                                       if (PHP_HTTP_BUFFER_LEN(buf)) {
+                                               php_http_buffer_append(buf, ass, asl);
+                                       }
+
+                                       /* add name */
+                                       if (key2.type == HASH_KEY_IS_STRING) {
+                                               php_http_buffer_append(buf, key2.str, key2.len - 1);
+                                       } else {
+                                               php_http_buffer_appendf(buf, "%lu", key2.num);
+                                       }
+                                       /* add value */
+                                       if (Z_TYPE_PP(zarg) != IS_BOOL) {
+                                               zval *tmp = php_http_ztyp(IS_STRING, *zarg);
+                                               int escaped_len;
+
+                                               Z_STRVAL_P(tmp) = php_addslashes(Z_STRVAL_P(tmp), Z_STRLEN_P(tmp), &escaped_len, 1 TSRMLS_CC);
+                                               php_http_buffer_append(buf, vss, vsl);
+                                               if (escaped_len != Z_STRLEN_P(tmp)) {
+                                                       php_http_buffer_appends(buf, "\"");
+                                                       php_http_buffer_append(buf, Z_STRVAL_P(tmp), Z_STRLEN_P(tmp) = escaped_len);
+                                                       php_http_buffer_appends(buf, "\"");
                                                } else {
-                                                       php_http_buffer_appendf(buf, "%lu", key2.num);
-                                               }
-                                               /* add value */
-                                               if (Z_TYPE_PP(zarg) != IS_BOOL) {
-                                                       zval *tmp = php_http_ztyp(IS_STRING, *zarg);
-                                                       int escaped_len;
-
-                                                       Z_STRVAL_P(tmp) = php_addslashes(Z_STRVAL_P(tmp), Z_STRLEN_P(tmp), &escaped_len, 1 TSRMLS_CC);
-                                                       php_http_buffer_append(buf, vss, vsl);
-                                                       if (escaped_len != Z_STRLEN_P(tmp)) {
-                                                               php_http_buffer_appends(buf, "\"");
-                                                               php_http_buffer_append(buf, Z_STRVAL_P(tmp), Z_STRLEN_P(tmp) = escaped_len);
-                                                               php_http_buffer_appends(buf, "\"");
-                                                       } else {
-                                                               php_http_buffer_append(buf, Z_STRVAL_P(tmp), Z_STRLEN_P(tmp));
-                                                       }
-                                                       zval_ptr_dtor(&tmp);
-                                               } else if (!Z_BVAL_PP(zarg)) {
-                                                       php_http_buffer_append(buf, vss, vsl);
-                                                       php_http_buffer_appends(buf, "0");
+                                                       php_http_buffer_append(buf, Z_STRVAL_P(tmp), Z_STRLEN_P(tmp));
                                                }
+                                               zval_ptr_dtor(&tmp);
+                                       } else if (!Z_BVAL_PP(zarg)) {
+                                               php_http_buffer_append(buf, vss, vsl);
+                                               php_http_buffer_appends(buf, "0");
                                        }
                                }
                        }