| modification, are permitted provided that the conditions mentioned |
| in the accompanying LICENSE file are met. |
+--------------------------------------------------------------------+
- | Copyright (c) 2004-2013, Michael Wallner <mike@php.net> |
+ | Copyright (c) 2004-2014, Michael Wallner <mike@php.net> |
+--------------------------------------------------------------------+
*/
#include "php_http_api.h"
#include "php_variables.h"
-PHP_RINIT_FUNCTION(http_env)
-{
- PHP_HTTP_G->env.request.time = sapi_get_request_time(TSRMLS_C);
-
- /* populate form data on non-POST requests */
- if (SG(request_info).request_method && strcasecmp(SG(request_info).request_method, "POST") && SG(request_info).content_type && *SG(request_info).content_type) {
- uint ct_len = strlen(SG(request_info).content_type);
- char *ct_str = estrndup(SG(request_info).content_type, ct_len);
- php_http_params_opts_t opts;
- HashTable params;
-
- php_http_params_opts_default_get(&opts);
- opts.input.str = ct_str;
- opts.input.len = ct_len;
-
- SG(request_info).content_type_dup = ct_str;
-
- ZEND_INIT_SYMTABLE(¶ms);
- if (php_http_params_parse(¶ms, &opts TSRMLS_CC)) {
- char *key_str;
- uint key_len;
- ulong key_num;
-
- if (HASH_KEY_IS_STRING == zend_hash_get_current_key_ex(¶ms, &key_str, &key_len, &key_num, 0, NULL)) {
- sapi_post_entry *post_entry = NULL;
-
- if (SUCCESS == zend_hash_find(&SG(known_post_content_types), key_str, key_len, (void *) &post_entry)) {
- zval *files = PG(http_globals)[TRACK_VARS_FILES];
-
- if (post_entry) {
- SG(request_info).post_entry = post_entry;
-
- if (post_entry->post_reader) {
- post_entry->post_reader(TSRMLS_C);
- }
- }
-
- if (sapi_module.default_post_reader) {
- sapi_module.default_post_reader(TSRMLS_C);
- }
-
- sapi_handle_post(PG(http_globals)[TRACK_VARS_POST] TSRMLS_CC);
-
- /*
- * the rfc1867 handler is an awkward buddy
- */
- if (files != PG(http_globals)[TRACK_VARS_FILES] && PG(http_globals)[TRACK_VARS_FILES]) {
- Z_ADDREF_P(PG(http_globals)[TRACK_VARS_FILES]);
- zend_hash_update(&EG(symbol_table), "_FILES", sizeof("_FILES"), &PG(http_globals)[TRACK_VARS_FILES], sizeof(zval *), NULL);
- if (files) {
- zval_ptr_dtor(&files);
- }
- }
- }
- }
- zend_hash_destroy(¶ms);
- }
- }
-
- STR_SET(SG(request_info).content_type_dup, NULL);
-
- return SUCCESS;
-}
-
PHP_RSHUTDOWN_FUNCTION(http_env)
{
if (PHP_HTTP_G->env.request.headers) {
return SUCCESS;
}
-PHP_HTTP_API void php_http_env_get_request_headers(HashTable *headers TSRMLS_DC)
+void php_http_env_get_request_headers(HashTable *headers TSRMLS_DC)
{
php_http_array_hashkey_t key = php_http_array_hashkey_init(0);
zval **hsv, **header;
}
}
-PHP_HTTP_API char *php_http_env_get_request_header(const char *name_str, size_t name_len, size_t *len, php_http_message_t *request TSRMLS_DC)
+char *php_http_env_get_request_header(const char *name_str, size_t name_len, size_t *len, php_http_message_t *request TSRMLS_DC)
{
HashTable *request_headers;
zval **zvalue = NULL;
return val;
}
-PHP_HTTP_API int php_http_env_got_request_header(const char *name_str, size_t name_len, php_http_message_t *request TSRMLS_DC)
+int php_http_env_got_request_header(const char *name_str, size_t name_len, php_http_message_t *request TSRMLS_DC)
{
HashTable *request_headers;
char *key = php_http_pretty_key(estrndup(name_str, name_len), name_len, 1, 1);
return got;
}
-PHP_HTTP_API zval *php_http_env_get_superglobal(const char *key, size_t key_len TSRMLS_DC)
+zval *php_http_env_get_superglobal(const char *key, size_t key_len TSRMLS_DC)
{
zval **hsv;
return *hsv;
}
-PHP_HTTP_API zval *php_http_env_get_server_var(const char *key, size_t key_len, zend_bool check TSRMLS_DC)
+zval *php_http_env_get_server_var(const char *key, size_t key_len, zend_bool check TSRMLS_DC)
{
zval *hsv, **var;
char *env;
return *var;
}
-PHP_HTTP_API php_http_message_body_t *php_http_env_get_request_body(TSRMLS_D)
+php_http_message_body_t *php_http_env_get_request_body(TSRMLS_D)
{
if (!PHP_HTTP_G->env.request.body) {
php_stream *s = php_stream_temp_new();
php_stream *input = php_stream_open_wrapper("php://input", "r", 0, NULL);
/* php://input does not support stat */
- php_stream_copy_to_stream(input, s, -1);
+ php_stream_copy_to_stream_ex(input, s, -1, NULL);
php_stream_close(input);
#else
if (SG(request_info).post_data || SG(request_info).raw_post_data) {
return PHP_HTTP_G->env.request.body;
}
-PHP_HTTP_API const char *php_http_env_get_request_method(php_http_message_t *request TSRMLS_DC)
+const char *php_http_env_get_request_method(php_http_message_t *request TSRMLS_DC)
{
const char *m;
return m ? m : "GET";
}
-PHP_HTTP_API php_http_range_status_t php_http_env_get_request_ranges(HashTable *ranges, size_t length, php_http_message_t *request TSRMLS_DC)
+php_http_range_status_t php_http_env_get_request_ranges(HashTable *ranges, size_t length, php_http_message_t *request TSRMLS_DC)
{
zval *zentry;
char *range, *rp, c;
return PHP_HTTP_RANGE_NO;
}
if (strncmp(range, "bytes=", lenof("bytes="))) {
- STR_FREE(range);
+ PTR_FREE(range);
return PHP_HTTP_RANGE_NO;
}
switch (end) {
/* "0-" */
case -1:
- STR_FREE(range);
+ PTR_FREE(range);
return PHP_HTTP_RANGE_NO;
/* "0-0" */
case -1:
/* "-", "-0" */
if (end == -1 || end == -10) {
- STR_FREE(range);
+ PTR_FREE(range);
return PHP_HTTP_RANGE_ERR;
}
begin = length - end;
/* "12345-(NNN)" */
default:
if (length <= (size_t) begin) {
- STR_FREE(range);
+ PTR_FREE(range);
return PHP_HTTP_RANGE_ERR;
}
switch (end) {
/* "12345-0" */
case -10:
- STR_FREE(range);
+ PTR_FREE(range);
return PHP_HTTP_RANGE_ERR;
/* "12345-" */
if (length <= (size_t) end) {
end = length - 1;
} else if (end < begin) {
- STR_FREE(range);
+ PTR_FREE(range);
return PHP_HTTP_RANGE_ERR;
}
break;
break;
default:
- STR_FREE(range);
+ PTR_FREE(range);
return PHP_HTTP_RANGE_NO;
}
} while (c != 0);
- STR_FREE(range);
+ PTR_FREE(range);
return PHP_HTTP_RANGE_OK;
}
php_http_buffer_appends(PHP_HTTP_BUFFER(arg), PHP_HTTP_CRLF);
}
-PHP_HTTP_API STATUS php_http_env_get_response_headers(HashTable *headers_ht TSRMLS_DC)
+ZEND_RESULT_CODE php_http_env_get_response_headers(HashTable *headers_ht TSRMLS_DC)
{
- STATUS status;
+ ZEND_RESULT_CODE status;
php_http_buffer_t headers;
php_http_buffer_init(&headers);
zend_llist_apply_with_argument(&SG(sapi_headers).headers, grab_headers, &headers TSRMLS_CC);
php_http_buffer_fix(&headers);
- status = php_http_headers_parse(headers.data, headers.used, headers_ht, NULL, NULL TSRMLS_CC);
+ status = php_http_header_parse(headers.data, headers.used, headers_ht, NULL, NULL TSRMLS_CC);
php_http_buffer_dtor(&headers);
return status;
}
-PHP_HTTP_API char *php_http_env_get_response_header(const char *name_str, size_t name_len TSRMLS_DC)
+char *php_http_env_get_response_header(const char *name_str, size_t name_len TSRMLS_DC)
{
char *val = NULL;
HashTable headers;
return val;
}
-PHP_HTTP_API long php_http_env_get_response_code(TSRMLS_D)
+long php_http_env_get_response_code(TSRMLS_D)
{
long code = SG(sapi_headers).http_response_code;
return code ? code : 200;
}
-PHP_HTTP_API STATUS php_http_env_set_response_code(long http_code TSRMLS_DC)
+ZEND_RESULT_CODE php_http_env_set_response_code(long http_code TSRMLS_DC)
{
return sapi_header_op(SAPI_HEADER_SET_STATUS, (void *) http_code TSRMLS_CC);
}
-PHP_HTTP_API STATUS php_http_env_set_response_status_line(long code, php_http_version_t *v TSRMLS_DC)
+ZEND_RESULT_CODE php_http_env_set_response_status_line(long code, php_http_version_t *v TSRMLS_DC)
{
sapi_header_line h = {NULL, 0, 0};
- STATUS ret;
+ ZEND_RESULT_CODE ret;
h.line_len = spprintf(&h.line, 0, "HTTP/%u.%u %ld %s", v->major, v->minor, code, php_http_env_get_response_status_for_code(code));
ret = sapi_header_op(SAPI_HEADER_REPLACE, (void *) &h TSRMLS_CC);
return ret;
}
-PHP_HTTP_API STATUS php_http_env_set_response_protocol_version(php_http_version_t *v TSRMLS_DC)
+ZEND_RESULT_CODE php_http_env_set_response_protocol_version(php_http_version_t *v TSRMLS_DC)
{
return php_http_env_set_response_status_line(php_http_env_get_response_code(TSRMLS_C), v TSRMLS_CC);
}
-PHP_HTTP_API STATUS php_http_env_set_response_header(long http_code, const char *header_str, size_t header_len, zend_bool replace TSRMLS_DC)
+ZEND_RESULT_CODE php_http_env_set_response_header(long http_code, const char *header_str, size_t header_len, zend_bool replace TSRMLS_DC)
{
sapi_header_line h = {estrndup(header_str, header_len), header_len, http_code};
- STATUS ret = sapi_header_op(replace ? SAPI_HEADER_REPLACE : SAPI_HEADER_ADD, (void *) &h TSRMLS_CC);
+ ZEND_RESULT_CODE ret = sapi_header_op(replace ? SAPI_HEADER_REPLACE : SAPI_HEADER_ADD, (void *) &h TSRMLS_CC);
efree(h.line);
return ret;
}
-PHP_HTTP_API STATUS php_http_env_set_response_header_va(long http_code, zend_bool replace, const char *fmt, va_list argv TSRMLS_DC)
+ZEND_RESULT_CODE php_http_env_set_response_header_va(long http_code, zend_bool replace, const char *fmt, va_list argv TSRMLS_DC)
{
- STATUS ret = FAILURE;
+ ZEND_RESULT_CODE ret = FAILURE;
sapi_header_line h = {NULL, 0, http_code};
h.line_len = vspprintf(&h.line, 0, fmt, argv);
return ret;
}
-PHP_HTTP_API STATUS php_http_env_set_response_header_format(long http_code, zend_bool replace TSRMLS_DC, const char *fmt, ...)
+ZEND_RESULT_CODE php_http_env_set_response_header_format(long http_code, zend_bool replace TSRMLS_DC, const char *fmt, ...)
{
- STATUS ret;
+ ZEND_RESULT_CODE ret;
va_list args;
va_start(args, fmt);
return ret;
}
-PHP_HTTP_API STATUS php_http_env_set_response_header_value(long http_code, const char *name_str, size_t name_len, zval *value, zend_bool replace TSRMLS_DC)
+ZEND_RESULT_CODE php_http_env_set_response_header_value(long http_code, const char *name_str, size_t name_len, zval *value, zend_bool replace TSRMLS_DC)
{
if (!value) {
sapi_header_line h = {(char *) name_str, name_len, http_code};
return php_http_env_set_response_header_value(http_code, name_str, name_len, NULL, replace TSRMLS_CC);
} else {
sapi_header_line h;
- STATUS ret;
+ ZEND_RESULT_CODE ret;
if (name_len > INT_MAX) {
name_len = INT_MAX;
ret = sapi_header_op(replace ? SAPI_HEADER_REPLACE : SAPI_HEADER_ADD, (void *) &h TSRMLS_CC);
zval_ptr_dtor(&data);
- STR_FREE(h.line);
+ PTR_FREE(h.line);
return ret;
}
}
}
-static PHP_HTTP_STRLIST(php_http_env_response_status) =
- PHP_HTTP_STRLIST_ITEM("Continue")
- PHP_HTTP_STRLIST_ITEM("Switching Protocols")
- PHP_HTTP_STRLIST_ITEM("Processing")
- PHP_HTTP_STRLIST_NEXT
- PHP_HTTP_STRLIST_ITEM("OK")
- PHP_HTTP_STRLIST_ITEM("Created")
- PHP_HTTP_STRLIST_ITEM("Accepted")
- PHP_HTTP_STRLIST_ITEM("Non-Authoritative Information")
- PHP_HTTP_STRLIST_ITEM("No Content")
- PHP_HTTP_STRLIST_ITEM("Reset Content")
- PHP_HTTP_STRLIST_ITEM("Partial Content")
- PHP_HTTP_STRLIST_ITEM("Multi-Status")
- PHP_HTTP_STRLIST_ITEM("Already Reported")
- PHP_HTTP_STRLIST_ITEM("(Unused)")
- PHP_HTTP_STRLIST_ITEM("(Unused)")
- PHP_HTTP_STRLIST_ITEM("(Unused)")
- PHP_HTTP_STRLIST_ITEM("(Unused)")
- PHP_HTTP_STRLIST_ITEM("(Unused)")
- PHP_HTTP_STRLIST_ITEM("(Unused)")
- PHP_HTTP_STRLIST_ITEM("(Unused)")
- PHP_HTTP_STRLIST_ITEM("(Unused)")
- PHP_HTTP_STRLIST_ITEM("(Unused)")
- PHP_HTTP_STRLIST_ITEM("(Unused)")
- PHP_HTTP_STRLIST_ITEM("(Unused)")
- PHP_HTTP_STRLIST_ITEM("(Unused)")
- PHP_HTTP_STRLIST_ITEM("(Unused)")
- PHP_HTTP_STRLIST_ITEM("(Unused)")
- PHP_HTTP_STRLIST_ITEM("(Unused)")
- PHP_HTTP_STRLIST_ITEM("(Unused)")
- PHP_HTTP_STRLIST_ITEM("(Unused)")
- PHP_HTTP_STRLIST_ITEM("IM Used")
- PHP_HTTP_STRLIST_NEXT
- PHP_HTTP_STRLIST_ITEM("Multiple Choices")
- PHP_HTTP_STRLIST_ITEM("Moved Permanently")
- PHP_HTTP_STRLIST_ITEM("Found")
- PHP_HTTP_STRLIST_ITEM("See Other")
- PHP_HTTP_STRLIST_ITEM("Not Modified")
- PHP_HTTP_STRLIST_ITEM("Use Proxy")
- PHP_HTTP_STRLIST_ITEM("(Unused)")
- PHP_HTTP_STRLIST_ITEM("Temporary Redirect")
- PHP_HTTP_STRLIST_ITEM("Permanent Redirect")
- PHP_HTTP_STRLIST_NEXT
- PHP_HTTP_STRLIST_ITEM("Bad Request")
- PHP_HTTP_STRLIST_ITEM("Unauthorized")
- PHP_HTTP_STRLIST_ITEM("Payment Required")
- PHP_HTTP_STRLIST_ITEM("Forbidden")
- PHP_HTTP_STRLIST_ITEM("Not Found")
- PHP_HTTP_STRLIST_ITEM("Method Not Allowed")
- PHP_HTTP_STRLIST_ITEM("Not Acceptable")
- PHP_HTTP_STRLIST_ITEM("Proxy Authentication Required")
- PHP_HTTP_STRLIST_ITEM("Request Timeout")
- PHP_HTTP_STRLIST_ITEM("Conflict")
- PHP_HTTP_STRLIST_ITEM("Gone")
- PHP_HTTP_STRLIST_ITEM("Length Required")
- PHP_HTTP_STRLIST_ITEM("Precondition Failed")
- PHP_HTTP_STRLIST_ITEM("Request Entity Too Large")
- PHP_HTTP_STRLIST_ITEM("Request URI Too Long")
- PHP_HTTP_STRLIST_ITEM("Unsupported Media Type")
- PHP_HTTP_STRLIST_ITEM("Requested Range Not Satisfiable")
- PHP_HTTP_STRLIST_ITEM("Expectation Failed")
- PHP_HTTP_STRLIST_ITEM("(Unused)")
- PHP_HTTP_STRLIST_ITEM("(Unused)")
- PHP_HTTP_STRLIST_ITEM("(Unused)")
- PHP_HTTP_STRLIST_ITEM("(Unused)")
- PHP_HTTP_STRLIST_ITEM("Unprocessible Entity")
- PHP_HTTP_STRLIST_ITEM("Locked")
- PHP_HTTP_STRLIST_ITEM("Failed Dependency")
- PHP_HTTP_STRLIST_ITEM("(Reserved)")
- PHP_HTTP_STRLIST_ITEM("Upgrade Required")
- PHP_HTTP_STRLIST_ITEM("(Unused)")
- PHP_HTTP_STRLIST_ITEM("Precondition Required")
- PHP_HTTP_STRLIST_ITEM("Too Many Requests")
- PHP_HTTP_STRLIST_ITEM("(Unused)")
- PHP_HTTP_STRLIST_ITEM("Request Header Fields Too Large")
- PHP_HTTP_STRLIST_NEXT
- PHP_HTTP_STRLIST_ITEM("Internal Server Error")
- PHP_HTTP_STRLIST_ITEM("Not Implemented")
- PHP_HTTP_STRLIST_ITEM("Bad Gateway")
- PHP_HTTP_STRLIST_ITEM("Service Unavailable")
- PHP_HTTP_STRLIST_ITEM("Gateway Timeout")
- PHP_HTTP_STRLIST_ITEM("HTTP Version Not Supported")
- PHP_HTTP_STRLIST_ITEM("Variant Also Negotiates")
- PHP_HTTP_STRLIST_ITEM("Insufficient Storage")
- PHP_HTTP_STRLIST_ITEM("Loop Detected")
- PHP_HTTP_STRLIST_ITEM("(Unused)")
- PHP_HTTP_STRLIST_ITEM("Not Extended")
- PHP_HTTP_STRLIST_ITEM("Network Authentication Required")
- PHP_HTTP_STRLIST_STOP
-;
-
-PHP_HTTP_API const char *php_http_env_get_response_status_for_code(unsigned code)
+const char *php_http_env_get_response_status_for_code(unsigned code)
{
- return php_http_strlist_find(php_http_env_response_status, 100, code);
+ switch (code) {
+#define PHP_HTTP_RESPONSE_CODE(c, s) case c: return s;
+#include "php_http_response_codes.h"
+#undef PHP_HTTP_RESPONSE_CODE
+ default:
+ return NULL;
+ }
}
ZEND_BEGIN_ARG_INFO_EX(ai_HttpEnv_getRequestHeader, 0, 0, 0)
char *header_name_str = NULL;
int header_name_len = 0;
- if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s!", &header_name_str, &header_name_len)) {
- if (header_name_str && header_name_len) {
- size_t header_length;
- char *header_value = php_http_env_get_request_header(header_name_str, header_name_len, &header_length, NULL TSRMLS_CC);
+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s!", &header_name_str, &header_name_len)) {
+ return;
+ }
+ if (header_name_str && header_name_len) {
+ size_t header_length;
+ char *header_value = php_http_env_get_request_header(header_name_str, header_name_len, &header_length, NULL TSRMLS_CC);
- if (header_value) {
- RETURN_STRINGL(header_value, header_length, 0);
- }
- RETURN_NULL();
- } else {
- array_init(return_value);
- php_http_env_get_request_headers(Z_ARRVAL_P(return_value) TSRMLS_CC);
- return;
+ if (header_value) {
+ RETURN_STRINGL(header_value, header_length, 0);
}
+ } else {
+ array_init(return_value);
+ php_http_env_get_request_headers(Z_ARRVAL_P(return_value) TSRMLS_CC);
}
- RETURN_FALSE;
}
ZEND_BEGIN_ARG_INFO_EX(ai_HttpEnv_getRequestBody, 0, 0, 0)
ZEND_END_ARG_INFO();
static PHP_METHOD(HttpEnv, getRequestBody)
{
- with_error_handling(EH_THROW, php_http_exception_class_entry) {
- zend_class_entry *class_entry = php_http_message_body_class_entry;
+ zend_object_value ov;
+ php_http_message_body_t *body;
+ zend_class_entry *class_entry = php_http_message_body_class_entry;
- if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|C", &class_entry)) {
- zend_object_value ov;
- php_http_message_body_t *body = php_http_env_get_request_body(TSRMLS_C);
+ php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|C", &class_entry), invalid_arg, return);
- if (SUCCESS == php_http_new(&ov, class_entry, (php_http_new_t) php_http_message_body_object_new_ex, php_http_message_body_class_entry, php_http_message_body_init(&body, NULL TSRMLS_CC), NULL TSRMLS_CC)) {
- RETVAL_OBJVAL(ov, 0);
- }
- }
- } end_error_handling();
+ body = php_http_env_get_request_body(TSRMLS_C);
+ if (SUCCESS == php_http_new(&ov, class_entry, (php_http_new_t) php_http_message_body_object_new_ex, php_http_message_body_class_entry, body, NULL TSRMLS_CC)) {
+ php_http_message_body_addref(body);
+ RETVAL_OBJVAL(ov, 0);
+ }
}
ZEND_BEGIN_ARG_INFO_EX(ai_HttpEnv_getResponseStatusForCode, 0, 0, 1)
static PHP_METHOD(HttpEnv, getResponseStatusForCode)
{
long code;
+ const char *status;
- if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &code)) {
- RETURN_STRING(php_http_env_get_response_status_for_code(code), 1);
+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &code)) {
+ return;
+ }
+
+ if ((status = php_http_env_get_response_status_for_code(code))) {
+ RETURN_STRING(status, 1);
}
- RETURN_FALSE;
}
ZEND_BEGIN_ARG_INFO_EX(ai_HttpEnv_getResponseStatusForAllCodes, 0, 0, 0)
ZEND_END_ARG_INFO();
static PHP_METHOD(HttpEnv, getResponseStatusForAllCodes)
{
- const char *s;
- unsigned c;
- php_http_strlist_iterator_t i;
-
if (SUCCESS != zend_parse_parameters_none()) {
- RETURN_FALSE;
+ return;
}
array_init(return_value);
- for ( php_http_strlist_iterator_init(&i, php_http_env_response_status, 100);
- *(s = php_http_strlist_iterator_this(&i, &c));
- php_http_strlist_iterator_next(&i)
- ) {
- add_index_string(return_value, c, s, 1);
- }
+#define PHP_HTTP_RESPONSE_CODE(code, status) add_index_string(return_value, code, status, 1);
+#include "php_http_response_codes.h"
+#undef PHP_HTTP_RESPONSE_CODE
}
ZEND_BEGIN_ARG_INFO_EX(ai_HttpEnv_getResponseHeader, 0, 0, 0)
char *header_name_str = NULL;
int header_name_len = 0;
- if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s!", &header_name_str, &header_name_len)) {
- if (header_name_str && header_name_len) {
- char *header_value = php_http_env_get_response_header(header_name_str, header_name_len TSRMLS_CC);
+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s!", &header_name_str, &header_name_len)) {
+ return;
+ }
+ if (header_name_str && header_name_len) {
+ char *header_value = php_http_env_get_response_header(header_name_str, header_name_len TSRMLS_CC);
- if (header_value) {
- RETURN_STRING(header_value, 0);
- }
- RETURN_NULL();
- } else {
- array_init(return_value);
- php_http_env_get_response_headers(Z_ARRVAL_P(return_value) TSRMLS_CC);
- return;
+ if (header_value) {
+ RETURN_STRING(header_value, 0);
}
+ } else {
+ array_init(return_value);
+ php_http_env_get_response_headers(Z_ARRVAL_P(return_value) TSRMLS_CC);
}
- RETURN_FALSE;
}
ZEND_BEGIN_ARG_INFO_EX(ai_HttpEnv_getResponseCode, 0, 0, 0)
ZEND_END_ARG_INFO();
static PHP_METHOD(HttpEnv, getResponseCode)
{
- if (SUCCESS == zend_parse_parameters_none()) {
- RETURN_LONG(php_http_env_get_response_code(TSRMLS_C));
+ if (SUCCESS != zend_parse_parameters_none()) {
+ return;
}
- RETURN_FALSE;
+ RETURN_LONG(php_http_env_get_response_code(TSRMLS_C));
}
ZEND_BEGIN_ARG_INFO_EX(ai_HttpEnv_setResponseHeader, 0, 0, 1)
long code = 0;
zend_bool replace_header = 1;
- if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|z!lb", &header_name_str, &header_name_len, &header_value, &code, &replace_header)) {
- RETURN_BOOL(SUCCESS == php_http_env_set_response_header_value(code, header_name_str, header_name_len, header_value, replace_header TSRMLS_CC));
+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|z!lb", &header_name_str, &header_name_len, &header_value, &code, &replace_header)) {
+ return;
}
- RETURN_FALSE;
+ RETURN_BOOL(SUCCESS == php_http_env_set_response_header_value(code, header_name_str, header_name_len, header_value, replace_header TSRMLS_CC));
}
ZEND_BEGIN_ARG_INFO_EX(ai_HttpEnv_setResponseCode, 0, 0, 1)
{
long code;
- if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &code)) {
- RETURN_BOOL(SUCCESS == php_http_env_set_response_code(code TSRMLS_CC));
+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &code)) {
+ return;
}
- RETURN_FALSE;
+ RETURN_BOOL(SUCCESS == php_http_env_set_response_code(code TSRMLS_CC));
}
ZEND_BEGIN_ARG_INFO_EX(ai_HttpEnv_negotiateLanguage, 0, 0, 1)
HashTable *supported;
zval *rs_array = NULL;
- if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "H|z", &supported, &rs_array)) {
- if (rs_array) {
- zval_dtor(rs_array);
- array_init(rs_array);
- }
-
- PHP_HTTP_DO_NEGOTIATE(language, supported, rs_array);
- } else {
- RETURN_FALSE;
+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "H|z", &supported, &rs_array)) {
+ return;
+ }
+ if (rs_array) {
+ zval_dtor(rs_array);
+ array_init(rs_array);
}
+
+ PHP_HTTP_DO_NEGOTIATE(language, supported, rs_array);
}
ZEND_BEGIN_ARG_INFO_EX(ai_HttpEnv_negotiateCharset, 0, 0, 1)
HashTable *supported;
zval *rs_array = NULL;
- if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "H|z", &supported, &rs_array)) {
- if (rs_array) {
- zval_dtor(rs_array);
- array_init(rs_array);
- }
- PHP_HTTP_DO_NEGOTIATE(charset, supported, rs_array);
- } else {
- RETURN_FALSE;
+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "H|z", &supported, &rs_array)) {
+ return;
+ }
+ if (rs_array) {
+ zval_dtor(rs_array);
+ array_init(rs_array);
}
+ PHP_HTTP_DO_NEGOTIATE(charset, supported, rs_array);
}
ZEND_BEGIN_ARG_INFO_EX(ai_HttpEnv_negotiateEncoding, 0, 0, 1)
HashTable *supported;
zval *rs_array = NULL;
- if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "H|z", &supported, &rs_array)) {
- if (rs_array) {
- zval_dtor(rs_array);
- array_init(rs_array);
- }
- PHP_HTTP_DO_NEGOTIATE(encoding, supported, rs_array);
- } else {
- RETURN_FALSE;
+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "H|z", &supported, &rs_array)) {
+ return;
+ }
+ if (rs_array) {
+ zval_dtor(rs_array);
+ array_init(rs_array);
}
+ PHP_HTTP_DO_NEGOTIATE(encoding, supported, rs_array);
}
ZEND_BEGIN_ARG_INFO_EX(ai_HttpEnv_negotiateContentType, 0, 0, 1)
HashTable *supported;
zval *rs_array = NULL;
- if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "H|z", &supported, &rs_array)) {
- if (rs_array) {
- zval_dtor(rs_array);
- array_init(rs_array);
- }
- PHP_HTTP_DO_NEGOTIATE(content_type, supported, rs_array);
- } else {
- RETURN_FALSE;
+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "H|z", &supported, &rs_array)) {
+ return;
}
+ if (rs_array) {
+ zval_dtor(rs_array);
+ array_init(rs_array);
+ }
+ PHP_HTTP_DO_NEGOTIATE(content_type, supported, rs_array);
}
ZEND_BEGIN_ARG_INFO_EX(ai_HttpEnv_negotiate, 0, 0, 2)
- ZEND_ARG_INFO(0, value)
+ ZEND_ARG_INFO(0, params)
ZEND_ARG_INFO(0, supported)
ZEND_ARG_INFO(0, primary_type_separator)
ZEND_ARG_INFO(1, result_array)
ZEND_END_ARG_INFO();
static PHP_METHOD(HttpEnv, negotiate)
{
- HashTable *supported;
+ HashTable *supported, *rs;
zval *rs_array = NULL;
char *value_str, *sep_str = NULL;
int value_len, sep_len = 0;
- if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sH|s!z", &value_str, &value_len, &supported, &sep_str, &sep_len, &rs_array)) {
- HashTable *rs;
+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sH|s!z", &value_str, &value_len, &supported, &sep_str, &sep_len, &rs_array)) {
+ return;
+ }
- if (rs_array) {
- zval_dtor(rs_array);
- array_init(rs_array);
- }
- if ((rs = php_http_negotiate(value_str, value_len, supported, sep_str, sep_len TSRMLS_CC))) {
- PHP_HTTP_DO_NEGOTIATE_HANDLE_RESULT(rs, supported, rs_array);
- } else {
- PHP_HTTP_DO_NEGOTIATE_HANDLE_DEFAULT(supported, rs_array);
- }
+ if (rs_array) {
+ zval_dtor(rs_array);
+ array_init(rs_array);
+ }
+
+ if ((rs = php_http_negotiate(value_str, value_len, supported, sep_str, sep_len TSRMLS_CC))) {
+ PHP_HTTP_DO_NEGOTIATE_HANDLE_RESULT(rs, supported, rs_array);
} else {
- RETURN_FALSE;
+ PHP_HTTP_DO_NEGOTIATE_HANDLE_DEFAULT(supported, rs_array);
}
}
EMPTY_FUNCTION_ENTRY
};
-#ifdef PHP_HTTP_HAVE_JSON
-#include "ext/json/php_json.h"
-
-static SAPI_POST_HANDLER_FUNC(php_http_json_post_handler)
-{
- zval *zarg = arg;
- char *json_str = NULL;
- size_t json_len = 0;
-
-#if PHP_VERSION_ID >= 50600
- php_http_message_body_to_string(php_http_env_get_request_body(TSRMLS_C),
- &json_str, &json_len, 0, -1 TSRMLS_CC);
-#else
- json_str = SG(request_info).raw_post_data;
- json_len = SG(request_info).raw_post_data_length;
-#endif
-
- if (json_len) {
- zval_dtor(zarg);
- ZVAL_NULL(zarg);
- php_json_decode(zarg, json_str, json_len, 1, PG(max_input_nesting_level) TSRMLS_CC);
- }
-#if PHP_VERSION_ID >= 50600
- STR_FREE(json_str);
-#endif
-
- /* always let $_POST be array() */
- if (Z_TYPE_P(zarg) == IS_NULL) {
- array_init(zarg);
- }
-}
-
-static void php_http_env_register_json_handler(TSRMLS_D)
-{
- sapi_post_entry entry = {NULL, 0, NULL, NULL};
-
- entry.post_reader = sapi_read_standard_form_data;
- entry.post_handler = php_http_json_post_handler;
-
- entry.content_type = "text/json";
- entry.content_type_len = lenof("text/json");
- sapi_register_post_entry(&entry TSRMLS_CC);
-
- entry.content_type = "application/json";
- entry.content_type_len = lenof("application/json");
- sapi_register_post_entry(&entry TSRMLS_CC);
-}
-#endif
-
zend_class_entry *php_http_env_class_entry;
PHP_MINIT_FUNCTION(http_env)
zend_class_entry ce = {0};
INIT_NS_CLASS_ENTRY(ce, "http", "Env", php_http_env_methods);
- php_http_env_class_entry = zend_register_internal_class_ex(&ce, php_http_object_class_entry, NULL TSRMLS_CC);
-
-#ifdef PHP_HTTP_HAVE_JSON
- php_http_env_register_json_handler(TSRMLS_C);
-#endif
+ php_http_env_class_entry = zend_register_internal_class(&ce TSRMLS_CC);
return SUCCESS;
}
projects / m6w6 / ext-http / blobdiff