+--------------------------------------------------------------------+
| Redistribution and use in source and binary forms, with or without |
| modification, are permitted provided that the conditions mentioned |
- | in the accomp395anying LICENSE file are met. |
+ | in the accompanying LICENSE file are met. |
+--------------------------------------------------------------------+
| Copyright (c) 2004-2011, 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];
+
+ zend_is_auto_global(ZEND_STRL("_POST") TSRMLS_CC);
+
+ 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;
}
if (SUCCESS == zend_hash_find(&EG(symbol_table), "_SERVER", sizeof("_SERVER"), (void *) &hsv) && Z_TYPE_PP(hsv) == IS_ARRAY) {
FOREACH_KEY(pos, *hsv, key) {
- if (key.type == HASH_KEY_IS_STRING && key.len > 6 && !strncmp(key.str, "HTTP_", 5)) {
+ if (key.type == HASH_KEY_IS_STRING && key.len > 6 && *key.str == 'H' && !strncmp(key.str, "HTTP_", 5)) {
key.len -= 5;
key.str = php_http_pretty_key(estrndup(key.str + 5, key.len - 1), key.len - 1, 1, 1);
Z_ADDREF_P(*header);
zend_symtable_update(PHP_HTTP_G->env.request.headers, key.str, key.len, (void *) header, sizeof(zval *), NULL);
+ efree(key.str);
+ } else if (key.type == HASH_KEY_IS_STRING && key.len > 9 && *key.str == 'C' && !strncmp(key.str, "CONTENT_", 8)) {
+ key.str = php_http_pretty_key(estrndup(key.str, key.len - 1), key.len - 1, 1, 1);
+
+ zend_hash_get_current_data_ex(Z_ARRVAL_PP(hsv), (void *) &header, &pos);
+ Z_ADDREF_P(*header);
+ zend_symtable_update(PHP_HTTP_G->env.request.headers, key.str, key.len, (void *) header, sizeof(zval *), NULL);
+
efree(key.str);
}
}
zend_llist_apply_with_argument(&SG(sapi_headers).headers, grab_headers, &headers TSRMLS_CC);
php_http_buffer_fix(&headers);
- status = php_http_headers_parse(PHP_HTTP_BUFFER_VAL(&headers), PHP_HTTP_BUFFER_LEN(&headers), headers_ht, NULL, NULL TSRMLS_CC);
+ status = php_http_headers_parse(headers.data, headers.used, headers_ht, NULL, NULL TSRMLS_CC);
php_http_buffer_dtor(&headers);
return status;
char *val = NULL;
HashTable headers;
- zend_hash_init(&headers, 0, NULL, NULL, 0);
+ zend_hash_init(&headers, 0, NULL, ZVAL_PTR_DTOR, 0);
if (SUCCESS == php_http_env_get_response_headers(&headers TSRMLS_CC)) {
zval **zvalue;
char *key = php_http_pretty_key(estrndup(name_str, name_len), name_len, 1, 1);
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("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("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("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("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
;
return php_http_strlist_find(php_http_env_response_status, 100, code);
}
-zend_class_entry *php_http_env_class_entry;
#define PHP_HTTP_BEGIN_ARGS(method, req_args) PHP_HTTP_BEGIN_ARGS_EX(HttpEnv, method, 0, req_args)
#define PHP_HTTP_EMPTY_ARGS(method) PHP_HTTP_EMPTY_ARGS_EX(HttpEnv, method, 0)
PHP_HTTP_ARG_VAL(code, 0)
PHP_HTTP_END_ARGS;
+PHP_HTTP_EMPTY_ARGS(getResponseStatusForAllCodes);
+
PHP_HTTP_BEGIN_ARGS(getResponseHeader, 0)
PHP_HTTP_ARG_VAL(header_name, 0)
PHP_HTTP_END_ARGS;
PHP_HTTP_ARG_VAL(ident, 0)
PHP_HTTP_END_ARGS;
-zend_function_entry php_http_env_method_entry[] = {
+static zend_class_entry *php_http_env_class_entry;
+
+zend_class_entry *php_http_env_get_class_entry(void)
+{
+ return php_http_env_class_entry;
+}
+
+static zend_function_entry php_http_env_method_entry[] = {
PHP_HTTP_ENV_ME(getRequestHeader)
PHP_HTTP_ENV_ME(getRequestBody)
PHP_HTTP_ENV_ME(getResponseStatusForCode)
+ PHP_HTTP_ENV_ME(getResponseStatusForAllCodes)
PHP_HTTP_ENV_ME(getResponseHeader)
PHP_HTTP_ENV_ME(getResponseCode)
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;
+ with_error_handling(EH_THROW, php_http_exception_get_class_entry()) {
+ zend_class_entry *class_entry = php_http_message_body_get_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);
- 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_copy(body, NULL, 0), NULL TSRMLS_CC)) {
- RETURN_OBJVAL(ov, 0);
+ if (SUCCESS == php_http_new(&ov, class_entry, (php_http_new_t) php_http_message_body_object_new_ex, php_http_message_body_get_class_entry(), php_http_message_body_copy(body, NULL, 0), NULL TSRMLS_CC)) {
+ RETVAL_OBJVAL(ov, 0);
}
}
} end_error_handling();
RETURN_FALSE;
}
+PHP_METHOD(HttpEnv, getResponseStatusForAllCodes)
+{
+ const char *s;
+ unsigned c;
+ php_http_strlist_iterator_t i;
+
+ if (SUCCESS != zend_parse_parameters_none()) {
+ RETURN_FALSE;
+ }
+
+ 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);
+ }
+}
+
PHP_METHOD(HttpEnv, getResponseHeader)
{
char *header_name_str = NULL;
}
}
+#ifdef PHP_HTTP_HAVE_JSON
+#include "ext/json/php_json.h"
+
+static SAPI_POST_HANDLER_FUNC(php_http_json_post_handler)
+{
+ if (SG(request_info).raw_post_data) {
+ php_json_decode(arg, SG(request_info).raw_post_data, SG(request_info).raw_post_data_length, 1, PG(max_input_nesting_level) TSRMLS_CC);
+ }
+}
+
+#endif
+
PHP_MINIT_FUNCTION(http_env)
{
+#ifdef PHP_HTTP_HAVE_JSON
+ 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
+
PHP_HTTP_REGISTER_CLASS(http, Env, http_env, NULL, 0);
return SUCCESS;
projects / m6w6 / ext-http / blobdiff