/* $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])
*
}
/* }}} */
-/* {{{ proto string http_absolute_uri(string url[, string proto])
+/* {{{ proto string http_absolute_uri(string url[, string proto[, string host[, int port]]])
*
* This function returns an absolute URI constructed from url.
* If the url is already abolute but a different proto was supplied,
*/
PHP_FUNCTION(http_absolute_uri)
{
- char *url = NULL, *proto = NULL;
- int url_len = 0, proto_len = 0;
+ char *url = NULL, *proto = NULL, *host = NULL;
+ int url_len = 0, proto_len = 0, host_len = 0;
+ long port = 0;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|s", &url, &url_len, &proto, &proto_len) != SUCCESS) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|ssl", &url, &url_len, &proto, &proto_len, &host, &host_len, &port) != SUCCESS) {
RETURN_FALSE;
}
- RETURN_STRING(http_absolute_uri(url, proto), 0);
+ RETURN_STRING(http_absolute_uri_ex(url, url_len, proto, proto_len, host, host_len, port), 0);
}
/* }}} */
*/
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) {
}
}
- URI = http_absolute_uri(url, NULL);
+ URI = http_absolute_uri(url);
+
if (query_len) {
snprintf(LOC, HTTP_URI_MAXLEN + sizeof("Location: "), "Location: %s?%s", URI, query);
sprintf(RED, "Redirecting to <a href=\"%s?%s\">%s?%s</a>.\n", URI, query, URI, query);
* 0 => array(
* 'Status' => '200 Ok',
* 'Content-Type' => 'text/plain',
-
* 'Content-Language' => 'en-US'
* ),
* 1 => "Hello World!"
RETURN_FALSE;
}
- convert_to_string_ex(&zresponse);
+ convert_to_string(zresponse);
MAKE_STD_ZVAL(zbody);
MAKE_STD_ZVAL(zheaders);
if (rnrn = strstr(header, HTTP_CRLF HTTP_CRLF)) {
header_len = rnrn - header + 2;
}
- if (SUCCESS != http_parse_headers(header, header_len, Z_ARRVAL_P(return_value))) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not parse HTTP header");
+ if (SUCCESS != http_parse_headers(header, header_len, return_value)) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not parse HTTP headers");
zval_dtor(return_value);
RETURN_FALSE;
}
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;
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;
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;
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;
/* {{{ 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;
}
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
projects / m6w6 / ext-http / blobdiff