#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])
*
RETURN_FALSE;
}
if (status < 100 || status > 510) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid HTTP status code (100-510): %d", status);
+ http_error_ex(E_WARNING, HTTP_E_HEADER, "Invalid HTTP status code (100-510): %d", status);
RETURN_FALSE;
}
}
if (!ct_len) {
- RETURN_SUCCESS(http_send_content_type("application/x-octetstream", sizeof("application/x-octetstream") - 1));
+ RETURN_SUCCESS(http_send_content_type("application/x-octetstream", lenof("application/x-octetstream")));
}
RETURN_SUCCESS(http_send_content_type(ct, ct_len));
}
}
if (for_range) {
- RETURN_BOOL(http_modified_match("HTTP_IF_UNMODIFIED_SINCE", t));
+ RETURN_BOOL(http_match_last_modified("HTTP_IF_UNMODIFIED_SINCE", t));
}
- RETURN_BOOL(http_modified_match("HTTP_IF_MODIFIED_SINCE", t));
+ RETURN_BOOL(http_match_last_modified("HTTP_IF_MODIFIED_SINCE", t));
}
/* }}} */
}
if (for_range) {
- RETURN_BOOL(http_etag_match("HTTP_IF_MATCH", etag));
+ RETURN_BOOL(http_match_etag("HTTP_IF_MATCH", etag));
}
- RETURN_BOOL(http_etag_match("HTTP_IF_NONE_MATCH", etag));
+ RETURN_BOOL(http_match_etag("HTTP_IF_NONE_MATCH", etag));
}
/* }}} */
/* {{{ proto bool http_cache_last_modified([int timestamp_or_expires]])
*
- * If timestamp_or_exires is greater than 0, it is handled as timestamp
+ * If timestamp_or_expires is greater than 0, it is handled as timestamp
* and will be sent as date of last modification. If it is 0 or omitted,
* the current time will be sent as Last-Modified date. If it's negative,
* it is handled as expiration time in seconds, which means that if the
send_modified = last_modified;
}
- RETURN_SUCCESS(http_cache_last_modified(last_modified, send_modified, HTTP_DEFAULT_CACHECONTROL, sizeof(HTTP_DEFAULT_CACHECONTROL) - 1));
+ RETURN_SUCCESS(http_cache_last_modified(last_modified, send_modified, HTTP_DEFAULT_CACHECONTROL, lenof(HTTP_DEFAULT_CACHECONTROL)));
}
/* }}} */
RETURN_FALSE;
}
- RETURN_SUCCESS(http_cache_etag(etag, etag_len, HTTP_DEFAULT_CACHECONTROL, sizeof(HTTP_DEFAULT_CACHECONTROL) - 1));
+ RETURN_SUCCESS(http_cache_etag(etag, etag_len, HTTP_DEFAULT_CACHECONTROL, lenof(HTTP_DEFAULT_CACHECONTROL)));
}
/* }}} */
-/* {{{ proto string ob_httpetaghandler(string data, int mode)
+/* {{{ proto string ob_etaghandler(string data, int mode)
*
* For use with ob_start().
- * Note that this has to be started as first output buffer.
- * WARNING: Don't use with http_send_*().
*/
-PHP_FUNCTION(ob_httpetaghandler)
+PHP_FUNCTION(ob_etaghandler)
{
char *data;
int data_len;
RETURN_FALSE;
}
- if (mode & PHP_OUTPUT_HANDLER_START) {
- if (HTTP_G(etag_started)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "ob_httpetaghandler can only be used once");
- RETURN_STRINGL(data, data_len, 1);
- }
- http_send_header("Cache-Control: " HTTP_DEFAULT_CACHECONTROL);
- HTTP_G(etag_started) = 1;
- }
-
- if (OG(ob_nesting_level) > 1) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "ob_httpetaghandler must be started prior to other output buffers");
- RETURN_STRINGL(data, data_len, 1);
- }
-
Z_TYPE_P(return_value) = IS_STRING;
http_ob_etaghandler(data, data_len, &Z_STRVAL_P(return_value), &Z_STRLEN_P(return_value), mode);
}
array_init(params);
}
if (add_assoc_string(params, PS(session_name), PS(id), 1) != SUCCESS) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not append session information");
+ http_error(E_WARNING, HTTP_E_ENCODE, "Could not append session information");
}
}
}
convert_to_string_ex(&zdata);
- http_send_header("Accept-Ranges: bytes");
RETURN_SUCCESS(http_send_data(Z_STRVAL_P(zdata), Z_STRLEN_P(zdata)));
}
/* }}} */
RETURN_FALSE;
}
- http_send_header("Accept-Ranges: bytes");
RETURN_SUCCESS(http_send_file(file));
}
/* }}} */
}
php_stream_from_zval(file, &zstream);
- http_send_header("Accept-Ranges: bytes");
RETURN_SUCCESS(http_send_stream(file));
}
/* }}} */
RETURN_FALSE;
}
- if (SUCCESS == http_chunked_decode(encoded, encoded_len, &decoded, &decoded_len)) {
+ if (NULL != http_chunked_decode(encoded, encoded_len, &decoded, &decoded_len)) {
RETURN_STRINGL(decoded, decoded_len, 0);
} else {
RETURN_FALSE;
* <?php
* array(
* 0 => array(
- * 'Status' => '200 Ok',
+ * 'Response Status' => '200 Ok',
* 'Content-Type' => 'text/plain',
-
* 'Content-Language' => 'en-US'
* ),
* 1 => "Hello World!"
array_init(zheaders);
if (SUCCESS != http_split_response(zresponse, zheaders, zbody)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not parse HTTP response");
+ http_error(E_WARNING, HTTP_E_PARSE, "Could not parse HTTP response");
RETURN_FALSE;
}
*/
PHP_FUNCTION(http_parse_headers)
{
- char *header, *rnrn;
+ char *header;
int header_len;
if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &header, &header_len)) {
}
array_init(return_value);
-
- if (rnrn = strstr(header, HTTP_CRLF HTTP_CRLF)) {
- header_len = rnrn - header + 2;
- }
- if (SUCCESS != http_parse_headers(header, header_len, return_value)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not parse HTTP headers");
+ if (SUCCESS != http_parse_headers(header, return_value)) {
+ http_error(E_WARNING, HTTP_E_PARSE, "Could not parse HTTP headers");
zval_dtor(return_value);
RETURN_FALSE;
}
* - lastmodified: int, timestamp for If-(Un)Modified-Since header
* - timeout: int, seconds the request may take
* - connecttimeout: int, seconds the connect may take
+ * - onprogress: mixed, progress callback
* </pre>
*
* The optional third parameter will be filled with some additional information
*/
PHP_FUNCTION(http_get)
{
- char *URL, *data = NULL;
- size_t data_len = 0;
- int URL_len;
zval *options = NULL, *info = NULL;
+ char *URL;
+ int URL_len;
+ phpstr response;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|a/!z", &URL, &URL_len, &options, &info) != SUCCESS) {
RETURN_FALSE;
array_init(info);
}
- if (SUCCESS == http_get(URL, HASH_ORNULL(options), HASH_ORNULL(info), &data, &data_len)) {
- RETURN_STRINGL(data, data_len, 0);
+ phpstr_init_ex(&response, HTTP_CURLBUF_SIZE, 0);
+ if (SUCCESS == http_get(URL, options ? Z_ARRVAL_P(options) : NULL, info ? Z_ARRVAL_P(info) : NULL, &response)) {
+ RETURN_PHPSTR_VAL(response);
} else {
RETURN_FALSE;
}
*/
PHP_FUNCTION(http_head)
{
- char *URL, *data = NULL;
- size_t data_len = 0;
- int URL_len;
zval *options = NULL, *info = NULL;
+ char *URL;
+ int URL_len;
+ phpstr response;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|a/!z", &URL, &URL_len, &options, &info) != SUCCESS) {
RETURN_FALSE;
array_init(info);
}
- if (SUCCESS == http_head(URL, HASH_ORNULL(options), HASH_ORNULL(info), &data, &data_len)) {
- RETURN_STRINGL(data, data_len, 0);
+ phpstr_init_ex(&response, HTTP_CURLBUF_SIZE, 0);
+ if (SUCCESS == http_head(URL, options ? Z_ARRVAL_P(options) : NULL, info ? Z_ARRVAL_P(info) : NULL, &response)) {
+ RETURN_PHPSTR_VAL(response);
} else {
RETURN_FALSE;
}
*/
PHP_FUNCTION(http_post_data)
{
- char *URL, *postdata, *data = NULL;
- size_t data_len = 0;
- int postdata_len, URL_len;
zval *options = NULL, *info = NULL;
+ char *URL, *postdata;
+ int postdata_len, URL_len;
+ phpstr response;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|a/!z", &URL, &URL_len, &postdata, &postdata_len, &options, &info) != SUCCESS) {
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)) {
- RETURN_STRINGL(data, data_len, 0);
+ phpstr_init_ex(&response, HTTP_CURLBUF_SIZE, 0);
+ if (SUCCESS == http_post_data(URL, postdata, (size_t) postdata_len, options ? Z_ARRVAL_P(options) : NULL, info ? Z_ARRVAL_P(info) : NULL, &response)) {
+ RETURN_PHPSTR_VAL(response);
} else {
RETURN_FALSE;
}
*/
PHP_FUNCTION(http_post_array)
{
- char *URL, *data = NULL;
- size_t data_len = 0;
- int URL_len;
zval *options = NULL, *info = NULL, *postdata;
+ char *URL;
+ int URL_len;
+ phpstr response;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sa|a/!z", &URL, &URL_len, &postdata, &options, &info) != SUCCESS) {
RETURN_FALSE;
array_init(info);
}
- if (SUCCESS == http_post_array(URL, Z_ARRVAL_P(postdata), HASH_ORNULL(options), HASH_ORNULL(info), &data, &data_len)) {
- RETURN_STRINGL(data, data_len, 0);
+ phpstr_init_ex(&response, HTTP_CURLBUF_SIZE, 0);
+ if (SUCCESS == http_post_array(URL, Z_ARRVAL_P(postdata), options ? Z_ARRVAL_P(options) : NULL, info ? Z_ARRVAL_P(info) : NULL, &response)) {
+ RETURN_PHPSTR_VAL(response);
} 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;
}
if (Z_TYPE_P(formdata) != IS_ARRAY && Z_TYPE_P(formdata) != IS_OBJECT) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Parameter 1 expected to be Array or Object. Incorrect value given.");
+ http_error(E_WARNING, HTTP_E_PARAM, "Parameter 1 expected to be Array or Object. Incorrect value given.");
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)
+{
+ RETURN_NULL();
+}
+
/*
* Local variables:
* tab-width: 4
projects / m6w6 / ext-http / blobdiff