* typo

[m6w6/ext-http] / http_functions.c

diff --git a/http_functions.c b/http_functions.c
index 2935626ecfb4eff1483540cd63d4fbc5dbc310e5..0b39b72cf36ef5e30715d0ea604edc474f0498a3 100644 (file)
--- a/http_functions.c
+++ b/http_functions.c
@@ -15,29 +15,34 @@
 
 /* $Id$ */
 
-#define _WINSOCKAPI_
-#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
-
 #ifdef HAVE_CONFIG_H
 #      include "config.h"
 #endif
 
 #include "php.h"
 #include "php_ini.h"
-#include "snprintf.h"
 #include "ext/standard/info.h"
 #include "ext/session/php_session.h"
 #include "ext/standard/php_string.h"
-#include "ext/standard/php_smart_str.h"
 
 #include "SAPI.h"
 
+#include "phpstr/phpstr.h"
+
 #include "php_http.h"
+#include "php_http_std_defs.h"
 #include "php_http_api.h"
+#include "php_http_auth_api.h"
 #include "php_http_curl_api.h"
-#include "php_http_std_defs.h"
+#include "php_http_cache_api.h"
+#include "php_http_curl_api.h"
+#include "php_http_date_api.h"
+#include "php_http_headers_api.h"
+#include "php_http_message_api.h"
+#include "php_http_send_api.h"
+#include "php_http_url_api.h"
 
-ZEND_DECLARE_MODULE_GLOBALS(http)
+ZEND_EXTERN_MODULE_GLOBALS(http)
 
 /* {{{ proto string http_date([int timestamp])
  *
@@ -376,7 +381,7 @@ PHP_FUNCTION(http_cache_last_modified)
  */
 PHP_FUNCTION(http_cache_etag)
 {
-       char *etag;
+       char *etag = NULL;
        int etag_len = 0;
 
        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &etag, &etag_len) != SUCCESS) {
@@ -582,7 +587,6 @@ PHP_FUNCTION(http_chunked_decode)
  *     0 => array(
  *         'Status' => '200 Ok',
  *         'Content-Type' => 'text/plain',
-
  *         'Content-Language' => 'en-US'
  *     ),
  *     1 => "Hello World!"
@@ -608,7 +612,7 @@ PHP_FUNCTION(http_split_response)
                php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not parse HTTP response");
                RETURN_FALSE;
        }
-       
+
        array_init(return_value);
        add_index_zval(return_value, 0, zheaders);
        add_index_zval(return_value, 1, zbody);
@@ -740,7 +744,7 @@ PHP_FUNCTION(http_get)
                array_init(info);
        }
 
-       if (SUCCESS == http_get(URL, HASH_ORNULL(options), HASH_ORNULL(info), &data, &data_len)) {
+       if (SUCCESS == http_get(URL, Z_ARRVAL_P(options), Z_ARRVAL_P(info), &data, &data_len)) {
                RETURN_STRINGL(data, data_len, 0);
        } else {
                RETURN_FALSE;
@@ -770,7 +774,7 @@ PHP_FUNCTION(http_head)
                array_init(info);
        }
 
-       if (SUCCESS == http_head(URL, HASH_ORNULL(options), HASH_ORNULL(info), &data, &data_len)) {
+       if (SUCCESS == http_head(URL, Z_ARRVAL_P(options), Z_ARRVAL_P(info), &data, &data_len)) {
                RETURN_STRINGL(data, data_len, 0);
        } else {
                RETURN_FALSE;
@@ -800,7 +804,7 @@ PHP_FUNCTION(http_post_data)
                array_init(info);
        }
 
-       if (SUCCESS == http_post_data(URL, postdata, (size_t) postdata_len, HASH_ORNULL(options), HASH_ORNULL(info), &data, &data_len)) {
+       if (SUCCESS == http_post_data(URL, postdata, (size_t) postdata_len, Z_ARRVAL_P(options), Z_ARRVAL_P(info), &data, &data_len)) {
                RETURN_STRINGL(data, data_len, 0);
        } else {
                RETURN_FALSE;
@@ -830,7 +834,7 @@ PHP_FUNCTION(http_post_array)
                array_init(info);
        }
 
-       if (SUCCESS == http_post_array(URL, Z_ARRVAL_P(postdata), HASH_ORNULL(options), HASH_ORNULL(info), &data, &data_len)) {
+       if (SUCCESS == http_post_array(URL, Z_ARRVAL_P(postdata), Z_ARRVAL_P(options), Z_ARRVAL_P(info), &data, &data_len)) {
                RETURN_STRINGL(data, data_len, 0);
        } else {
                RETURN_FALSE;
@@ -954,16 +958,16 @@ PHP_FUNCTION(http_auth_basic_cb)
 /* {{{ Sara Golemons http_build_query() */
 #ifndef ZEND_ENGINE_2
 
-/* {{{ proto string http_build_query(mixed formdata [, string prefix])
+/* {{{ proto string http_build_query(mixed formdata [, string prefix[, string arg_separator]])
    Generates a form-encoded query string from an associative array or object. */
 PHP_FUNCTION(http_build_query)
 {
        zval *formdata;
-       char *prefix = NULL;
-       int prefix_len = 0;
-       smart_str formstr = {0};
+       char *prefix = NULL, *arg_sep = INI_STR("arg_separator.output");
+       int prefix_len = 0, arg_sep_len = strlen(arg_sep);
+       phpstr *formstr;
 
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z|s", &formdata, &prefix, &prefix_len) != SUCCESS) {
+       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z|ss", &formdata, &prefix, &prefix_len, &arg_sep, &arg_sep_len) != SUCCESS) {
                RETURN_FALSE;
        }
 
@@ -972,25 +976,31 @@ PHP_FUNCTION(http_build_query)
                RETURN_FALSE;
        }
 
-       if (php_url_encode_hash_ex(HASH_OF(formdata), &formstr, prefix, prefix_len, NULL, 0, NULL, 0, (Z_TYPE_P(formdata) == IS_OBJECT ? formdata : NULL) TSRMLS_CC) == FAILURE) {
-               if (formstr.c) {
-                       efree(formstr.c);
-               }
+       if (!arg_sep_len) {
+               arg_sep = HTTP_URL_ARGSEP;
+       }
+
+       formstr = phpstr_new();
+       if (SUCCESS != http_urlencode_hash_implementation_ex(HASH_OF(formdata), formstr, arg_sep, prefix, prefix_len, NULL, 0, NULL, 0, (Z_TYPE_P(formdata) == IS_OBJECT ? formdata : NULL))) {
+               phpstr_free(formstr);
                RETURN_FALSE;
        }
 
-       if (!formstr.c) {
+       if (!formstr->used) {
+               phpstr_free(formstr);
                RETURN_NULL();
        }
 
-       smart_str_0(&formstr);
-
-       RETURN_STRINGL(formstr.c, formstr.len, 0);
+       RETURN_PHPSTR_PTR(formstr);
 }
 /* }}} */
 #endif /* !ZEND_ENGINE_2 */
 /* }}} */
 
+PHP_FUNCTION(http_test)
+{
+}
+
 /*
  * Local variables:
  * tab-width: 4