| modification, are permitted provided that the conditions mentioned |
| in the accompanying LICENSE file are met. |
+--------------------------------------------------------------------+
- | Copyright (c) 2004-2010, Michael Wallner <mike@php.net> |
+ | Copyright (c) 2004-2011, Michael Wallner <mike@php.net> |
+--------------------------------------------------------------------+
*/
-/* $Id: http_message_api.c 298689 2010-04-28 06:50:06Z mike $ */
+#include "php_http_api.h"
-#include "php_http.h"
-
-#include <main/SAPI.h>
-#include <ext/spl/spl_iterators.h>
-#include <Zend/zend_interfaces.h>
+static void message_headers(php_http_message_t *msg, php_http_buffer_t *str);
PHP_HTTP_API zend_bool php_http_message_info_callback(php_http_message_t **message, HashTable **headers, php_http_info_t *info TSRMLS_DC)
{
php_http_message_t *old = *message;
/* advance message */
- if (old->type || zend_hash_num_elements(&old->hdrs) || PHP_HTTP_BUFFER_LEN(old)) {
- (*message) = php_http_message_init(NULL, 0);
+ if (!old || old->type || zend_hash_num_elements(&old->hdrs)) {
+ (*message) = php_http_message_init(NULL, 0, NULL TSRMLS_CC);
(*message)->parent = old;
- (*headers) = &((*message)->hdrs);
+ if (headers) {
+ (*headers) = &((*message)->hdrs);
+ }
}
- php_http_message_set_info(*message, info);
+ if (info) {
+ php_http_message_set_info(*message, info);
+ }
return old != *message;
}
-PHP_HTTP_API php_http_message_t *php_http_message_init(php_http_message_t *message, php_http_message_type_t type TSRMLS_DC)
+PHP_HTTP_API php_http_message_t *php_http_message_init(php_http_message_t *message, php_http_message_type_t type, php_http_message_body_t *body TSRMLS_DC)
{
if (!message) {
message = emalloc(sizeof(*message));
TSRMLS_SET_CTX(message->ts);
php_http_message_set_type(message, type);
+ message->http.version.major = 1;
+ message->http.version.minor = 1;
zend_hash_init(&message->hdrs, 0, NULL, ZVAL_PTR_DTOR, 0);
- php_http_message_body_init(&message->body, NULL TSRMLS_CC);
+ message->body = body ? body : php_http_message_body_init(NULL, NULL TSRMLS_CC);
return message;
}
zval *sval, tval;
php_http_message_body_t *mbody;
- message = php_http_message_init(message, type TSRMLS_CC);
-
switch (type) {
case PHP_HTTP_REQUEST:
+ mbody = php_http_env_get_request_body(TSRMLS_C);
+ php_http_message_body_addref(mbody);
+ message = php_http_message_init(message, type, mbody TSRMLS_CC);
if ((sval = php_http_env_get_server_var(ZEND_STRL("SERVER_PROTOCOL"), 1 TSRMLS_CC)) && !strncmp(Z_STRVAL_P(sval), "HTTP/", lenof("HTTP/"))) {
- php_http_version_parse(&message->http.version, Z_STRVAL_P(sval));
- } else {
- message->http.version.major = 1;
- message->http.version.minor = 1;
+ php_http_version_parse(&message->http.version, Z_STRVAL_P(sval) TSRMLS_CC);
}
if ((sval = php_http_env_get_server_var(ZEND_STRL("REQUEST_METHOD"), 1 TSRMLS_CC))) {
message->http.info.request.method = estrdup(Z_STRVAL_P(sval));
}
php_http_env_get_request_headers(&message->hdrs TSRMLS_CC);
-
- if ((mbody = php_http_env_get_request_body(TSRMLS_C))) {
- php_http_message_body_dtor(&message->body);
- php_http_message_body_copy(mbody, &message->body, 0 TSRMLS_CC);
- }
break;
case PHP_HTTP_RESPONSE:
+ message = php_http_message_init(NULL, type, NULL TSRMLS_CC);
if (!SG(sapi_headers).http_status_line || !php_http_info_parse((php_http_info_t *) &message->http, SG(sapi_headers).http_status_line TSRMLS_CC)) {
- message->http.version.major = 1;
- message->http.version.minor = 1;
- switch ((message->http.info.response.code = SG(sapi_headers).http_response_code)) {
- case 0:
- message->http.info.response.code = 200;
- case 200:
- message->http.info.response.status = estrdup("Ok");
- break;
- default:
- message->http.info.response.status = estrdup("");
- break;
+ if (!(message->http.info.response.code = SG(sapi_headers).http_response_code)) {
+ message->http.info.response.code = 200;
}
-
+ message->http.info.response.status = estrdup(php_http_env_get_response_status_for_code(message->http.info.response.code));
}
php_http_env_get_response_headers(&message->hdrs TSRMLS_CC);
-
- if (php_output_get_level()) {
+#if PHP_VERSION_ID >= 50400
+ if (php_output_get_level(TSRMLS_C)) {
if (php_output_get_status(TSRMLS_C) & PHP_OUTPUT_SENT) {
php_http_error(HE_WARNING, PHP_HTTP_E_RUNTIME, "Could not fetch response body, output has already been sent at %s:%d", php_output_get_start_filename(TSRMLS_C), php_output_get_start_lineno(TSRMLS_C));
goto error;
php_http_error(HE_WARNING, PHP_HTTP_E_RUNTIME, "Could not fetch response body");
goto error;
} else {
- php_http_message_body_append(&message->body, Z_STRVAL(tval), Z_STRLEN(tval));
+ php_http_message_body_append(message->body, Z_STRVAL(tval), Z_STRLEN(tval));
zval_dtor(&tval);
}
}
+#endif
break;
default:
error:
if (free_msg) {
- php_http_message_free(&message);
+ if (message) {
+ php_http_message_free(&message);
+ }
} else {
message = NULL;
}
return message;
}
-PHP_HTTP_API php_http_message_t *php_http_message_parse(php_http_message_t *msg, const char *str, size_t len TSRMLS_DC)
+PHP_HTTP_API php_http_message_t *php_http_message_parse(php_http_message_t *msg, const char *str, size_t len, zend_bool greedy TSRMLS_DC)
{
php_http_message_parser_t p;
php_http_buffer_t buf;
+ unsigned flags = PHP_HTTP_MESSAGE_PARSER_CLEANUP;
+ int free_msg;
- if (!msg) {
- msg = php_http_message_init(NULL, 0 TSRMLS_CC);
- }
php_http_buffer_from_string_ex(&buf, str, len);
php_http_message_parser_init(&p TSRMLS_CC);
- php_http_message_parser_parse(&p, &buf, PHP_HTTP_MESSAGE_PARSER_CLEANUP, &msg);
+
+ if ((free_msg = !msg)) {
+ msg = php_http_message_init(NULL, 0, NULL TSRMLS_CC);
+ }
+
+ if (greedy) {
+ flags |= PHP_HTTP_MESSAGE_PARSER_GREEDY;
+ }
+ if (PHP_HTTP_MESSAGE_PARSER_STATE_FAILURE == php_http_message_parser_parse(&p, &buf, flags, &msg)) {
+ if (free_msg) {
+ php_http_message_free(&msg);
+ }
+ msg = NULL;
+ }
+
php_http_message_parser_dtor(&p);
php_http_buffer_dtor(&buf);
- /* FIXME */
return msg;
}
-PHP_HTTP_API zval *php_http_message_header(php_http_message_t *msg, char *key_str, size_t key_len, int join)
+PHP_HTTP_API zval *php_http_message_header(php_http_message_t *msg, const char *key_str, size_t key_len, int join)
{
zval *ret = NULL, **header;
char *key = php_http_pretty_key(estrndup(key_str, key_len), key_len, 1, 1);
- if (SUCCESS == zend_hash_find(&msg->hdrs, key, key_len + 1, (void *) &header)) {
+ if (SUCCESS == zend_symtable_find(&msg->hdrs, key, key_len + 1, (void *) &header)) {
if (join && Z_TYPE_PP(header) == IS_ARRAY) {
- zval *header_str, **val;
- HashPosition pos;
- php_http_buffer_t str;
-
- php_http_buffer_init(&str);
- MAKE_STD_ZVAL(header_str);
- FOREACH_VAL(pos, *header, val) {
- php_http_buffer_appendf(&str, PHP_HTTP_BUFFER_LEN(&str) ? ", %s":"%s", Z_STRVAL_PP(val));
- }
- php_http_buffer_fix(&str);
- ZVAL_STRINGL(header_str, PHP_HTTP_BUFFER_VAL(&str), PHP_HTTP_BUFFER_LEN(&str), 0);
- ret = header_str;
+ TSRMLS_FETCH_FROM_CTX(msg->ts);
+
+ ret = php_http_header_value_to_string(*header TSRMLS_CC);
} else {
- ret = php_http_zsep(IS_STRING, *header);
+ Z_ADDREF_PP(header);
+ ret = *header;
}
}
return ret;
}
+PHP_HTTP_API zend_bool php_http_message_is_multipart(php_http_message_t *msg, char **boundary)
+{
+ zval *ct = php_http_message_header(msg, ZEND_STRL("Content-Type"), 1);
+ zend_bool is_multipart = 0;
+ TSRMLS_FETCH_FROM_CTX(msg->ts);
+
+ if (ct) {
+ php_http_params_opts_t popts;
+ HashTable params;
+
+ ZEND_INIT_SYMTABLE(¶ms);
+ php_http_params_opts_default_get(&popts);
+ popts.input.str = Z_STRVAL_P(ct);
+ popts.input.len = Z_STRLEN_P(ct);
+
+ if (php_http_params_parse(¶ms, &popts TSRMLS_CC)) {
+ zval **cur, **arg;
+ char *ct_str;
+
+ zend_hash_internal_pointer_reset(¶ms);
+
+ if (SUCCESS == zend_hash_get_current_data(¶ms, (void *) &cur)
+ && Z_TYPE_PP(cur) == IS_ARRAY
+ && HASH_KEY_IS_STRING == zend_hash_get_current_key(¶ms, &ct_str, NULL, 0)
+ ) {
+ if (php_http_match(ct_str, "multipart", PHP_HTTP_MATCH_WORD)) {
+ is_multipart = 1;
+
+ /* get boundary */
+ if (boundary
+ && SUCCESS == zend_hash_find(Z_ARRVAL_PP(cur), ZEND_STRS("arguments"), (void *) &arg)
+ && Z_TYPE_PP(arg) == IS_ARRAY
+ ) {
+ zval **val;
+ HashPosition pos;
+ php_http_array_hashkey_t key = php_http_array_hashkey_init(0);
+
+ FOREACH_KEYVAL(pos, *arg, key, val) {
+ if (key.type == HASH_KEY_IS_STRING && !strcasecmp(key.str, "boundary")) {
+ zval *bnd = php_http_ztyp(IS_STRING, *val);
+
+ if (Z_STRLEN_P(bnd)) {
+ *boundary = estrndup(Z_STRVAL_P(bnd), Z_STRLEN_P(bnd));
+ }
+ zval_ptr_dtor(&bnd);
+ }
+ }
+ }
+ }
+ }
+ }
+ zend_hash_destroy(¶ms);
+ zval_ptr_dtor(&ct);
+ }
+
+ return is_multipart;
+}
/* */
PHP_HTTP_API void php_http_message_set_type(php_http_message_t *message, php_http_message_type_t type)
if (type != message->type) {
/* free request info */
- switch (message->type = type) {
+ switch (message->type) {
case PHP_HTTP_REQUEST:
STR_FREE(message->http.info.request.method);
STR_FREE(message->http.info.request.url);
break;
}
+ message->type = type;
memset(&message->http, 0, sizeof(message->http));
}
}
}
}
-static inline void message_headers(php_http_message_t *msg, php_http_buffer_t *str)
+PHP_HTTP_API void php_http_message_update_headers(php_http_message_t *msg)
+{
+ zval *h;
+ size_t size;
+
+ if (php_http_message_body_stream(msg->body)->readfilters.head) {
+ /* if a read stream filter is attached to the body the caller must also care for the headers */
+ } else if ((size = php_http_message_body_size(msg->body))) {
+ MAKE_STD_ZVAL(h);
+ ZVAL_LONG(h, size);
+ zend_hash_update(&msg->hdrs, "Content-Length", sizeof("Content-Length"), &h, sizeof(zval *), NULL);
+
+ if (msg->body->boundary) {
+ char *str;
+ size_t len;
+
+ if (!(h = php_http_message_header(msg, ZEND_STRL("Content-Type"), 1))) {
+ len = spprintf(&str, 0, "multipart/form-data; boundary=\"%s\"", msg->body->boundary);
+ MAKE_STD_ZVAL(h);
+ ZVAL_STRINGL(h, str, len, 0);
+ zend_hash_update(&msg->hdrs, "Content-Type", sizeof("Content-Type"), &h, sizeof(zval *), NULL);
+ } else if (!php_http_match(Z_STRVAL_P(h), "boundary=", PHP_HTTP_MATCH_WORD)) {
+ zval_dtor(h);
+ Z_STRLEN_P(h) = spprintf(&Z_STRVAL_P(h), 0, "%s; boundary=\"%s\"", Z_STRVAL_P(h), msg->body->boundary);
+ zend_hash_update(&msg->hdrs, "Content-Type", sizeof("Content-Type"), &h, sizeof(zval *), NULL);
+ } else {
+ zval_ptr_dtor(&h);
+ }
+ }
+ }
+}
+
+static void message_headers(php_http_message_t *msg, php_http_buffer_t *str)
{
- php_http_array_hashkey_t key = php_http_array_hashkey_init(0);
- HashPosition pos1;
- zval **header;
+ TSRMLS_FETCH_FROM_CTX(msg->ts);
switch (msg->type) {
case PHP_HTTP_REQUEST:
break;
}
- FOREACH_HASH_KEYVAL(pos1, &msg->hdrs, key, header) {
- if (key.type == HASH_KEY_IS_STRING) {
- HashPosition pos2;
- zval **single_header;
-
- switch (Z_TYPE_PP(header)) {
- case IS_BOOL:
- php_http_buffer_appendf(str, "%s: %s" PHP_HTTP_CRLF, key.str, Z_BVAL_PP(header)?"true":"false");
- break;
-
- case IS_LONG:
- php_http_buffer_appendf(str, "%s: %ld" PHP_HTTP_CRLF, key.str, Z_LVAL_PP(header));
- break;
-
- case IS_DOUBLE:
- php_http_buffer_appendf(str, "%s: %F" PHP_HTTP_CRLF, key.str, Z_DVAL_PP(header));
- break;
-
- case IS_STRING:
- if (Z_STRVAL_PP(header)[Z_STRLEN_PP(header)-1] == '\r') fprintf(stderr, "DOH!\n");
- php_http_buffer_appendf(str, "%s: %s" PHP_HTTP_CRLF, key.str, Z_STRVAL_PP(header));
- break;
-
- case IS_ARRAY:
- FOREACH_VAL(pos2, *header, single_header) {
- switch (Z_TYPE_PP(single_header)) {
- case IS_BOOL:
- php_http_buffer_appendf(str, "%s: %s" PHP_HTTP_CRLF, key.str, Z_BVAL_PP(single_header)?"true":"false");
- break;
-
- case IS_LONG:
- php_http_buffer_appendf(str, "%s: %ld" PHP_HTTP_CRLF, key.str, Z_LVAL_PP(single_header));
- break;
-
- case IS_DOUBLE:
- php_http_buffer_appendf(str, "%s: %F" PHP_HTTP_CRLF, key.str, Z_DVAL_PP(single_header));
- break;
-
- case IS_STRING:
- php_http_buffer_appendf(str, "%s: %s" PHP_HTTP_CRLF, key.str, Z_STRVAL_PP(single_header));
- break;
- }
- }
- break;
- }
- }
- }
+ php_http_message_update_headers(msg);
+ php_http_headers_to_string(str, &msg->hdrs TSRMLS_CC);
}
PHP_HTTP_API void php_http_message_to_callback(php_http_message_t *msg, php_http_pass_callback_t cb, void *cb_arg)
{
php_http_buffer_t str;
- TSRMLS_FETCH_FROM_CTX(msg->ts);
php_http_buffer_init_ex(&str, 0x1000, 0);
message_headers(msg, &str);
- cb(cb_arg, PHP_HTTP_BUFFER_VAL(&str), PHP_HTTP_BUFFER_LEN(&str));
+ cb(cb_arg, str.data, str.used);
php_http_buffer_dtor(&str);
- if (php_http_message_body_size(&msg->body)) {
- cb(cb_arg, ZEND_STRL(PHP_HTTP_CRLF) TSRMLS_CC);
- php_http_message_body_to_callback(&msg->body, cb, cb_arg, 0, 0);
- cb(cb_arg, ZEND_STRL(PHP_HTTP_CRLF) TSRMLS_CC);
+ if (php_http_message_body_size(msg->body)) {
+ cb(cb_arg, ZEND_STRL(PHP_HTTP_CRLF));
+ php_http_message_body_to_callback(msg->body, cb, cb_arg, 0, 0);
}
}
php_http_buffer_init_ex(&str, 0x1000, 0);
message_headers(msg, &str);
- if (php_http_message_body_size(&msg->body)) {
- php_http_buffer_appends(&str, PHP_HTTP_CRLF);
- php_http_message_body_to_callback(&msg->body, (php_http_pass_callback_t) php_http_buffer_append, &str, 0, 0);
+ if (php_http_message_body_size(msg->body)) {
php_http_buffer_appends(&str, PHP_HTTP_CRLF);
+ php_http_message_body_to_callback(msg->body, (php_http_pass_callback_t) php_http_buffer_append, &str, 0, 0);
}
data = php_http_buffer_data(&str, string, length);
PHP_HTTP_API void php_http_message_serialize(php_http_message_t *message, char **string, size_t *length)
{
char *buf;
- size_t len;
php_http_buffer_t str;
+ php_http_message_t *msg;
php_http_buffer_init(&str);
+ msg = message = php_http_message_reverse(message);
do {
- php_http_message_to_string(message, &buf, &len);
- php_http_buffer_prepend(&str, buf, len);
- efree(buf);
+ php_http_message_to_callback(message, (php_http_pass_callback_t) php_http_buffer_append, &str);
+ php_http_buffer_appends(&str, PHP_HTTP_CRLF);
} while ((message = message->parent));
+ php_http_message_reverse(msg);
buf = php_http_buffer_data(&str, string, length);
if (!string) {
php_http_message_count(c, msg);
if (c > 1) {
- php_http_message_t *tmp = msg, **arr = ecalloc(c, sizeof(**arr));
-
+ php_http_message_t *tmp = msg, **arr;
+
+ arr = ecalloc(c, sizeof(**arr));
for (i = 0; i < c; ++i) {
arr[i] = tmp;
tmp = tmp->parent;
return msg;
}
-PHP_HTTP_API php_http_message_t *php_http_message_interconnect(php_http_message_t *m1, php_http_message_t *m2)
-{
- if (m1 && m2) {
- int i = 0, c1 = 0, c2 = 0;
- php_http_message_t *t1 = m1, *t2 = m2, *p1, *p2;
-
- php_http_message_count(c1, m1);
- php_http_message_count(c2, m2);
-
- while (i++ < (c1 - c2)) {
- t1 = t1->parent;
- }
- while (i++ <= c1) {
- p1 = t1->parent;
- p2 = t2->parent;
- t1->parent = t2;
- t2->parent = p1;
- t1 = p1;
- t2 = p2;
- }
- } else if (!m1 && m2) {
- m1 = m2;
- }
- return m1;
-}
-
-PHP_HTTP_API void php_http_message_to_struct(php_http_message_t *msg, zval *obj TSRMLS_DC)
-{
- zval strct;
- zval *headers;
- char *version;
-
- INIT_PZVAL_ARRAY(&strct, HASH_OF(obj));
-
- add_assoc_long(&strct, "type", msg->type);
- spprintf(&version, 0 ,"%u.%u", msg->http.version.major, msg->http.version.minor);
- add_assoc_string_ex(&strct, ZEND_STRL("httpVersion"), version, 0);
- switch (msg->type)
- {
- case PHP_HTTP_RESPONSE:
- add_assoc_long(&strct, "responseCode", msg->http.info.response.code);
- add_assoc_string(&strct, "responseStatus", STR_PTR(msg->http.info.response.status), 1);
- break;
-
- case PHP_HTTP_REQUEST:
- add_assoc_string(&strct, "requestMethod", STR_PTR(msg->http.info.request.method), 1);
- add_assoc_string(&strct, "requestUrl", STR_PTR(msg->http.info.request.url), 1);
- break;
-
- case PHP_HTTP_NONE:
- /* avoid compiler warning */
- break;
- }
-
- MAKE_STD_ZVAL(headers);
- array_init(headers);
- zend_hash_copy(Z_ARRVAL_P(headers), &msg->hdrs, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
- add_assoc_zval(&strct, "headers", headers);
-
- add_assoc_stringl(&strct, "body", PHP_HTTP_BUFFER_VAL(msg), PHP_HTTP_BUFFER_LEN(msg), 1);
-
- if (msg->parent) {
- zval *parent;
-
- MAKE_STD_ZVAL(parent);
- if (Z_TYPE_P(obj) == IS_ARRAY) {
- array_init(parent);
- } else {
- object_init(parent);
- }
- add_assoc_zval(&strct, "parentMessage", parent);
- php_http_message_to_struct(msg->parent, parent);
- } else {
- add_assoc_null(&strct, "parentMessage");
- }
-}
-/*
-PHP_HTTP_API STATUS _http_message_send(http_message *message TSRMLS_DC)
+PHP_HTTP_API php_http_message_t *php_http_message_zip(php_http_message_t *one, php_http_message_t *two)
{
- STATUS rs = FAILURE;
+ php_http_message_t *dst = php_http_message_copy(one, NULL), *src = php_http_message_copy(two, NULL), *tmp_dst, *tmp_src, *ret = dst;
- switch (message->type) {
- case PHP_HTTP_RESPONSE:
- {
- php_http_array_hashkey_t key = php_http_array_hashkey_init(0);
- zval **val;
- HashPosition pos;
-
- FOREACH_HASH_KEYVAL(pos, &message->hdrs, key, val) {
- if (key.type == HASH_KEY_IS_STRING) {
- http_send_header_zval_ex(key.str, key.len-1, val, 1);
- }
- }
- rs = SUCCESS == http_send_status(message->http.info.response.code) &&
- SUCCESS == http_send_data(PHP_HTTP_BUFFER_VAL(message), PHP_HTTP_BUFFER_LEN(message)) ?
- SUCCESS : FAILURE;
- break;
+ while(dst && src) {
+ tmp_dst = dst->parent;
+ tmp_src = src->parent;
+ dst->parent = src;
+ if (tmp_dst) {
+ src->parent = tmp_dst;
}
-
- case PHP_HTTP_REQUEST:
- {
-#ifdef PHP_HTTP_HAVE_CURL
- char *uri = NULL;
- http_request request;
- zval **zhost, *options, *headers;
-
- MAKE_STD_ZVAL(options);
- MAKE_STD_ZVAL(headers);
- array_init(options);
- array_init(headers);
- zend_hash_copy(Z_ARRVAL_P(headers), &message->hdrs, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
- add_assoc_zval(options, "headers", headers);
-
- if (SUCCESS == zend_hash_find(&message->hdrs, "Host", sizeof("Host"), (void *) &zhost) && Z_TYPE_PP(zhost) == IS_STRING) {
- char *colon = NULL;
- php_url parts, *url = php_url_parse(message->http.info.request.url);
-
- memset(&parts, 0, sizeof(php_url));
-
- if ((colon = strchr(Z_STRVAL_PP(zhost), ':'))) {
- parts.port = atoi(colon + 1);
- parts.host = estrndup(Z_STRVAL_PP(zhost), (Z_STRVAL_PP(zhost) - colon - 1));
- } else {
- parts.host = estrndup(Z_STRVAL_PP(zhost), Z_STRLEN_PP(zhost));
- }
-
- http_build_url(PHP_HTTP_URL_REPLACE, url, &parts, NULL, &uri, NULL);
- php_url_free(url);
- efree(parts.host);
- } else {
- uri = http_absolute_url(message->http.info.request.url);
- }
-
- if ((request.meth = http_request_method_exists(1, 0, message->http.info.request.method))) {
- http_request_body body;
-
- http_request_init_ex(&request, NULL, request.meth, uri);
- request.body = http_request_body_init_ex(&body, PHP_HTTP_REQUEST_BODY_CSTRING, PHP_HTTP_BUFFER_VAL(message), PHP_HTTP_BUFFER_LEN(message), 0);
- if (SUCCESS == (rs = http_request_prepare(&request, Z_ARRVAL_P(options)))) {
- http_request_exec(&request);
- }
- http_request_dtor(&request);
- } else {
- http_error_ex(HE_WARNING, PHP_HTTP_E_REQUEST_METHOD,
- "Cannot send HttpMessage. Request method %s not supported",
- message->http.info.request.method);
- }
- efree(uri);
- zval_ptr_dtor(&options);
-#else
- http_error(HE_WARNING, PHP_HTTP_E_RUNTIME, "HTTP requests not supported - ext/http was not linked against libcurl.");
-#endif
- break;
- }
-
- case PHP_HTTP_NONE:
- default:
- php_http_error(HE_WARNING, PHP_HTTP_E_MESSAGE_TYPE, "HttpMessage is neither of type PHP_HTTP_REQUEST nor PHP_HTTP_RESPONSE");
- break;
+ src = tmp_src;
+ dst = tmp_dst;
}
- return rs;
+ return ret;
}
-*/
-PHP_HTTP_API php_http_message_t *php_http_message_copy(php_http_message_t *from, php_http_message_t *to)
+PHP_HTTP_API php_http_message_t *php_http_message_copy_ex(php_http_message_t *from, php_http_message_t *to, zend_bool parents)
{
php_http_message_t *temp, *copy = NULL;
php_http_info_t info;
info.type = from->type;
info.http = from->http;
- copy = temp = php_http_message_init(to, 0);
+ copy = temp = php_http_message_init(to, 0, php_http_message_body_copy(from->body, NULL) TSRMLS_CC);
php_http_message_set_info(temp, &info);
zend_hash_copy(&temp->hdrs, &from->hdrs, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
- php_http_message_body_copy(&from->body, &temp->body, 1);
- while (from->parent) {
+ if (parents) while (from->parent) {
info.type = from->parent->type;
info.http = from->parent->http;
- temp->parent = php_http_message_init(NULL, 0);
+ temp->parent = php_http_message_init(NULL, 0, php_http_message_body_copy(from->parent->body, NULL) TSRMLS_CC);
php_http_message_set_info(temp->parent, &info);
zend_hash_copy(&temp->parent->hdrs, &from->parent->hdrs, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
- php_http_message_body_copy(&from->body, &temp->body, 1);
temp = temp->parent;
from = from->parent;
return copy;
}
+PHP_HTTP_API php_http_message_t *php_http_message_copy(php_http_message_t *from, php_http_message_t *to)
+{
+ return php_http_message_copy_ex(from, to, 1);
+}
+
PHP_HTTP_API void php_http_message_dtor(php_http_message_t *message)
{
if (message) {
zend_hash_destroy(&message->hdrs);
- php_http_message_body_dtor(&message->body);
+ php_http_message_body_free(&message->body);
switch (message->type) {
case PHP_HTTP_REQUEST:
PHP_HTTP_BEGIN_ARGS(__construct, 0)
PHP_HTTP_ARG_VAL(message, 0)
+ PHP_HTTP_ARG_VAL(greedy, 0)
PHP_HTTP_END_ARGS;
PHP_HTTP_EMPTY_ARGS(getBody);
PHP_HTTP_ARG_VAL(body, 0)
PHP_HTTP_END_ARGS;
+PHP_HTTP_BEGIN_ARGS(addBody, 1)
+ PHP_HTTP_ARG_VAL(body, 0)
+PHP_HTTP_END_ARGS;
+
PHP_HTTP_BEGIN_ARGS(getHeader, 1)
PHP_HTTP_ARG_VAL(header, 0)
PHP_HTTP_END_ARGS;
PHP_HTTP_ARG_VAL(http_version, 0)
PHP_HTTP_END_ARGS;
-PHP_HTTP_BEGIN_ARGS(guessContentType, 1)
- PHP_HTTP_ARG_VAL(magic_file, 0)
- PHP_HTTP_ARG_VAL(magic_mode, 0)
-PHP_HTTP_END_ARGS;
-
PHP_HTTP_EMPTY_ARGS(getParentMessage);
-PHP_HTTP_EMPTY_ARGS(send);
PHP_HTTP_EMPTY_ARGS(__toString);
PHP_HTTP_BEGIN_ARGS(toString, 0)
PHP_HTTP_ARG_VAL(include_parent, 0)
PHP_HTTP_END_ARGS;
-
-PHP_HTTP_EMPTY_ARGS(toMessageTypeObject);
+PHP_HTTP_BEGIN_ARGS(toCallback, 1)
+ PHP_HTTP_ARG_VAL(callback, 0)
+PHP_HTTP_END_ARGS;
+PHP_HTTP_BEGIN_ARGS(toStream, 1)
+ PHP_HTTP_ARG_VAL(stream, 0)
+PHP_HTTP_END_ARGS;
PHP_HTTP_EMPTY_ARGS(count);
PHP_HTTP_END_ARGS;
PHP_HTTP_EMPTY_ARGS(reverse);
-static zval *php_http_message_object_read_prop(zval *object, zval *member, int type, const zend_literal *literal_key TSRMLS_DC);
-static void php_http_message_object_write_prop(zval *object, zval *member, zval *value, const zend_literal *literal_key TSRMLS_DC);
-static zval **php_http_message_object_get_prop_ptr(zval *object, zval *member, const zend_literal *literal_key TSRMLS_DC);
+PHP_HTTP_BEGIN_ARGS(isMultipart, 0)
+ PHP_HTTP_ARG_VAL(boundary, 1)
+PHP_HTTP_END_ARGS;
+PHP_HTTP_EMPTY_ARGS(splitMultipartBody);
+
+static zval *php_http_message_object_read_prop(zval *object, zval *member, int type PHP_HTTP_ZEND_LITERAL_DC TSRMLS_DC);
+static void php_http_message_object_write_prop(zval *object, zval *member, zval *value PHP_HTTP_ZEND_LITERAL_DC TSRMLS_DC);
static HashTable *php_http_message_object_get_props(zval *object TSRMLS_DC);
-zend_class_entry *php_http_message_class_entry;
-zend_function_entry php_http_message_method_entry[] = {
+static zend_class_entry *php_http_message_class_entry;
+
+zend_class_entry *php_http_message_get_class_entry(void)
+{
+ return php_http_message_class_entry;
+}
+
+static zend_function_entry php_http_message_method_entry[] = {
PHP_HTTP_MESSAGE_ME(__construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
PHP_HTTP_MESSAGE_ME(getBody, ZEND_ACC_PUBLIC)
PHP_HTTP_MESSAGE_ME(setBody, ZEND_ACC_PUBLIC)
+ PHP_HTTP_MESSAGE_ME(addBody, ZEND_ACC_PUBLIC)
PHP_HTTP_MESSAGE_ME(getHeader, ZEND_ACC_PUBLIC)
PHP_HTTP_MESSAGE_ME(setHeader, ZEND_ACC_PUBLIC)
PHP_HTTP_MESSAGE_ME(addHeader, ZEND_ACC_PUBLIC)
PHP_HTTP_MESSAGE_ME(setHttpVersion, ZEND_ACC_PUBLIC)
PHP_HTTP_MESSAGE_ME(getParentMessage, ZEND_ACC_PUBLIC)
PHP_HTTP_MESSAGE_ME(toString, ZEND_ACC_PUBLIC)
+ PHP_HTTP_MESSAGE_ME(toCallback, ZEND_ACC_PUBLIC)
+ PHP_HTTP_MESSAGE_ME(toStream, ZEND_ACC_PUBLIC)
/* implements Countable */
PHP_HTTP_MESSAGE_ME(count, ZEND_ACC_PUBLIC)
PHP_HTTP_MESSAGE_ME(prepend, ZEND_ACC_PUBLIC)
PHP_HTTP_MESSAGE_ME(reverse, ZEND_ACC_PUBLIC)
+ PHP_HTTP_MESSAGE_ME(isMultipart, ZEND_ACC_PUBLIC)
+ PHP_HTTP_MESSAGE_ME(splitMultipartBody, ZEND_ACC_PUBLIC)
+
EMPTY_FUNCTION_ENTRY
};
static zend_object_handlers php_http_message_object_handlers;
php_http_message_object_prophandler_t h = { read, write };
return zend_hash_add(&php_http_message_object_prophandlers, prop_str, prop_len + 1, (void *) &h, sizeof(h), NULL);
}
-static int php_http_message_object_has_prophandler(const char *prop_str, size_t prop_len) {
- return zend_hash_exists(&php_http_message_object_prophandlers, prop_str, prop_len + 1);
-}
static STATUS php_http_message_object_get_prophandler(const char *prop_str, size_t prop_len, php_http_message_object_prophandler_t **handler) {
return zend_hash_find(&php_http_message_object_prophandlers, prop_str, prop_len + 1, (void *) handler);
}
RETVAL_LONG(obj->message->type);
}
static void php_http_message_object_prophandler_set_type(php_http_message_object_t *obj, zval *value TSRMLS_DC) {
- zval *cpy = php_http_zsep(IS_LONG, value);
+ zval *cpy = php_http_ztyp(IS_LONG, value);
php_http_message_set_type(obj->message, Z_LVAL_P(cpy));
zval_ptr_dtor(&cpy);
}
}
static void php_http_message_object_prophandler_set_request_method(php_http_message_object_t *obj, zval *value TSRMLS_DC) {
if (PHP_HTTP_MESSAGE_TYPE(REQUEST, obj->message)) {
- zval *cpy = php_http_zsep(IS_STRING, value);
+ zval *cpy = php_http_ztyp(IS_STRING, value);
STR_SET(obj->message->http.info.request.method, estrndup(Z_STRVAL_P(cpy), Z_STRLEN_P(cpy)));
zval_ptr_dtor(&cpy);
}
}
static void php_http_message_object_prophandler_set_request_url(php_http_message_object_t *obj, zval *value TSRMLS_DC) {
if (PHP_HTTP_MESSAGE_TYPE(REQUEST, obj->message)) {
- zval *cpy = php_http_zsep(IS_STRING, value);
+ zval *cpy = php_http_ztyp(IS_STRING, value);
STR_SET(obj->message->http.info.request.url, estrndup(Z_STRVAL_P(cpy), Z_STRLEN_P(cpy)));
zval_ptr_dtor(&cpy);
}
}
static void php_http_message_object_prophandler_set_response_status(php_http_message_object_t *obj, zval *value TSRMLS_DC) {
if (PHP_HTTP_MESSAGE_TYPE(RESPONSE, obj->message)) {
- zval *cpy = php_http_zsep(IS_STRING, value);
+ zval *cpy = php_http_ztyp(IS_STRING, value);
STR_SET(obj->message->http.info.response.status, estrndup(Z_STRVAL_P(cpy), Z_STRLEN_P(cpy)));
zval_ptr_dtor(&cpy);
}
}
static void php_http_message_object_prophandler_set_response_code(php_http_message_object_t *obj, zval *value TSRMLS_DC) {
if (PHP_HTTP_MESSAGE_TYPE(RESPONSE, obj->message)) {
- zval *cpy = php_http_zsep(IS_LONG, value);
+ zval *cpy = php_http_ztyp(IS_LONG, value);
obj->message->http.info.response.code = Z_LVAL_P(cpy);
+ STR_SET(obj->message->http.info.response.status, estrdup(php_http_env_get_response_status_for_code(obj->message->http.info.response.code)));
zval_ptr_dtor(&cpy);
}
}
RETVAL_STRINGL(version_str, version_len, 0);
}
static void php_http_message_object_prophandler_set_http_version(php_http_message_object_t *obj, zval *value TSRMLS_DC) {
- zval *cpy = php_http_zsep(IS_STRING, value);
+ zval *cpy = php_http_ztyp(IS_STRING, value);
php_http_version_parse(&obj->message->http.version, Z_STRVAL_P(cpy) TSRMLS_CC);
zval_ptr_dtor(&cpy);
}
zend_hash_copy(Z_ARRVAL_P(return_value), &obj->message->hdrs, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
}
static void php_http_message_object_prophandler_set_headers(php_http_message_object_t *obj, zval *value TSRMLS_DC) {
- zval *cpy = php_http_zsep(IS_ARRAY, value);
+ zval *cpy = php_http_ztyp(IS_ARRAY, value);
zend_hash_clean(&obj->message->hdrs);
zend_hash_copy(&obj->message->hdrs, Z_ARRVAL_P(cpy), (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
}
}
static void php_http_message_object_prophandler_set_body(php_http_message_object_t *obj, zval *value TSRMLS_DC) {
- if (Z_TYPE_P(value) == IS_OBJECT && instanceof_function(Z_OBJCE_P(value), php_http_message_body_class_entry TSRMLS_CC)) {
- if (obj->body.handle) {
- zend_objects_store_del_ref_by_handle(obj->body.handle TSRMLS_CC);
- }
- Z_OBJ_ADDREF_P(value);
- obj->body = Z_OBJVAL_P(value);
- }
+ php_http_message_object_set_body(obj, value TSRMLS_CC);
}
static void php_http_message_object_prophandler_get_parent_message(php_http_message_object_t *obj, zval *return_value TSRMLS_DC) {
if (obj->message->parent) {
}
static void php_http_message_object_prophandler_set_parent_message(php_http_message_object_t *obj, zval *value TSRMLS_DC) {
if (Z_TYPE_P(value) == IS_OBJECT && instanceof_function(Z_OBJCE_P(value), php_http_message_class_entry TSRMLS_CC)) {
+ php_http_message_object_t *parent_obj = zend_object_store_get_object(value TSRMLS_CC);
+
if (obj->message->parent) {
zend_objects_store_del_ref_by_handle(obj->parent.handle TSRMLS_CC);
}
Z_OBJ_ADDREF_P(value);
obj->parent = Z_OBJVAL_P(value);
+ obj->message->parent = parent_obj->message;
}
}
PHP_MINIT_FUNCTION(http_message)
{
- PHP_HTTP_REGISTER_CLASS(http, Message, http_message, php_http_object_class_entry, 0);
+ PHP_HTTP_REGISTER_CLASS(http, Message, http_message, php_http_object_get_class_entry(), 0);
php_http_message_class_entry->create_object = php_http_message_object_new;
memcpy(&php_http_message_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
php_http_message_object_handlers.clone_obj = php_http_message_object_clone;
php_http_message_object_handlers.read_property = php_http_message_object_read_prop;
php_http_message_object_handlers.write_property = php_http_message_object_write_prop;
php_http_message_object_handlers.get_properties = php_http_message_object_get_props;
- php_http_message_object_handlers.get_property_ptr_ptr = php_http_message_object_get_prop_ptr;
+ php_http_message_object_handlers.get_property_ptr_ptr = NULL;
zend_class_implements(php_http_message_class_entry TSRMLS_CC, 3, spl_ce_Countable, zend_ce_serializable, zend_ce_iterator);
zend_hash_init(&php_http_message_object_prophandlers, 9, NULL, NULL, 1);
zend_declare_property_long(php_http_message_class_entry, ZEND_STRL("type"), PHP_HTTP_NONE, ZEND_ACC_PROTECTED TSRMLS_CC);
php_http_message_object_add_prophandler(ZEND_STRL("type"), php_http_message_object_prophandler_get_type, php_http_message_object_prophandler_set_type);
- zend_declare_property_string(php_http_message_class_entry, ZEND_STRL("body"), "", ZEND_ACC_PROTECTED TSRMLS_CC);
+ zend_declare_property_null(php_http_message_class_entry, ZEND_STRL("body"), ZEND_ACC_PROTECTED TSRMLS_CC);
php_http_message_object_add_prophandler(ZEND_STRL("body"), php_http_message_object_prophandler_get_body, php_http_message_object_prophandler_set_body);
zend_declare_property_string(php_http_message_class_entry, ZEND_STRL("requestMethod"), "", ZEND_ACC_PROTECTED TSRMLS_CC);
php_http_message_object_add_prophandler(ZEND_STRL("requestMethod"), php_http_message_object_prophandler_get_request_method, php_http_message_object_prophandler_set_request_method);
return SUCCESS;
}
+#define PHP_HTTP_MESSAGE_OBJECT_INIT(obj) \
+ do { \
+ if (!obj->message) { \
+ obj->message = php_http_message_init(NULL, 0, NULL TSRMLS_CC); \
+ } \
+ } while(0)
+
+
void php_http_message_object_reverse(zval *this_ptr, zval *return_value TSRMLS_DC)
{
int i = 0;
php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+ PHP_HTTP_MESSAGE_OBJECT_INIT(obj);
+
/* count */
php_http_message_count(i, obj->message);
if (i > 1) {
- zval o;
zend_object_value *ovalues = NULL;
php_http_message_object_t **objects = NULL;
- int last = i - 1;
+ int last;
objects = ecalloc(i, sizeof(**objects));
ovalues = ecalloc(i, sizeof(*ovalues));
ovalues[0] = getThis()->value.obj;
/* fetch parents */
- INIT_PZVAL(&o);
- o.type = IS_OBJECT;
for (i = 1; obj->parent.handle; ++i) {
- o.value.obj = obj->parent;
- ovalues[i] = o.value.obj;
- objects[i] = obj = zend_object_store_get_object(&o TSRMLS_CC);
+ ovalues[i] = obj->parent;
+ objects[i] = obj = zend_object_store_get_object_by_handle(obj->parent.handle TSRMLS_CC);
}
/* reorder parents */
objects[i]->message->parent = objects[i-1]->message;
objects[i]->parent = ovalues[i-1];
}
+
objects[0]->message->parent = NULL;
objects[0]->parent.handle = 0;
objects[0]->parent.handlers = NULL;
- /* add ref (why?) */
+ /* add ref, because we previously have not been a parent message */
Z_OBJ_ADDREF_P(getThis());
RETVAL_OBJVAL(ovalues[last], 1);
}
}
+STATUS php_http_message_object_set_body(php_http_message_object_t *msg_obj, zval *zbody TSRMLS_DC)
+{
+ zval *tmp = NULL;
+ php_stream *s;
+ zend_object_value ov;
+ php_http_message_body_t *body;
+ php_http_message_body_object_t *body_obj;
+
+ switch (Z_TYPE_P(zbody)) {
+ case IS_RESOURCE:
+ php_stream_from_zval_no_verify(s, &zbody);
+ if (!s) {
+ php_http_error(HE_THROW, PHP_HTTP_E_CLIENT, "not a valid stream resource");
+ return FAILURE;
+ }
+
+ is_resource:
+
+ body = php_http_message_body_init(NULL, s TSRMLS_CC);
+ if (SUCCESS != php_http_new(&ov, php_http_message_body_get_class_entry(), (php_http_new_t) php_http_message_body_object_new_ex, NULL, body, NULL TSRMLS_CC)) {
+ php_http_message_body_free(&body);
+ return FAILURE;
+ }
+ MAKE_STD_ZVAL(tmp);
+ ZVAL_OBJVAL(tmp, ov, 0);
+ zbody = tmp;
+ break;
+
+ case IS_OBJECT:
+ if (instanceof_function(Z_OBJCE_P(zbody), php_http_message_body_get_class_entry() TSRMLS_CC)) {
+ Z_OBJ_ADDREF_P(zbody);
+ break;
+ }
+ /* no break */
+
+ default:
+ tmp = php_http_ztyp(IS_STRING, zbody);
+ s = php_stream_temp_new();
+ php_stream_write(s, Z_STRVAL_P(tmp), Z_STRLEN_P(tmp));
+ zval_ptr_dtor(&tmp);
+ tmp = NULL;
+ goto is_resource;
+
+ }
+
+ body_obj = zend_object_store_get_object(zbody TSRMLS_CC);
+
+ if (msg_obj->body.handle) {
+ zend_objects_store_del_ref_by_handle(msg_obj->body.handle TSRMLS_CC);
+ }
+ php_http_message_body_free(&msg_obj->message->body);
+
+ msg_obj->message->body = php_http_message_body_init(&body_obj->body, NULL TSRMLS_CC);
+ msg_obj->body = Z_OBJVAL_P(zbody);
+
+ if (tmp) {
+ FREE_ZVAL(tmp);
+ }
+ return SUCCESS;
+}
+
zend_object_value php_http_message_object_new(zend_class_entry *ce TSRMLS_DC)
{
return php_http_message_object_new_ex(ce, NULL, NULL TSRMLS_CC);
if (msg->parent) {
o->parent = php_http_message_object_new_ex(ce, msg->parent, NULL TSRMLS_CC);
}
- o->body = php_http_message_body_object_new_ex(php_http_message_body_class_entry, php_http_message_body_copy(&msg->body, NULL, 0), NULL TSRMLS_CC);
+ o->body = php_http_message_body_object_new_ex(php_http_message_body_get_class_entry(), php_http_message_body_init(&msg->body, NULL TSRMLS_CC), NULL TSRMLS_CC);
}
ov.handle = zend_objects_store_put((zend_object *) o, NULL, php_http_message_object_free, NULL TSRMLS_CC);
php_http_message_object_t *new_obj = NULL;
php_http_message_object_t *old_obj = zend_object_store_get_object(this_ptr TSRMLS_CC);
- new_ov = php_http_message_object_new_ex(old_obj->zo.ce, php_http_message_copy(old_obj->message, NULL), &new_obj);
+ new_ov = php_http_message_object_new_ex(old_obj->zo.ce, php_http_message_copy(old_obj->message, NULL), &new_obj TSRMLS_CC);
zend_objects_clone_members(&new_obj->zo, new_ov, &old_obj->zo, Z_OBJ_HANDLE_P(this_ptr) TSRMLS_CC);
return new_ov;
efree(o);
}
-
-static zval **php_http_message_object_get_prop_ptr(zval *object, zval *member, const zend_literal *literal_key TSRMLS_DC) {
- php_http_message_object_prophandler_t *handler;
- zval *copy = php_http_zsep(IS_STRING, member);
-
- if (SUCCESS == php_http_message_object_get_prophandler(Z_STRVAL_P(copy), Z_STRLEN_P(copy), &handler)) {
- zval_ptr_dtor(©);
- return &php_http_property_proxy_init(NULL, object, member TSRMLS_CC)->myself;
- }
- zval_ptr_dtor(©);
-
- return zend_get_std_object_handlers()->get_property_ptr_ptr(object, member, literal_key TSRMLS_CC);
-}
-
-static zval *php_http_message_object_read_prop(zval *object, zval *member, int type, const zend_literal *literal_key TSRMLS_DC)
+static zval *php_http_message_object_read_prop(zval *object, zval *member, int type PHP_HTTP_ZEND_LITERAL_DC TSRMLS_DC)
{
php_http_message_object_t *obj = zend_object_store_get_object(object TSRMLS_CC);
php_http_message_object_prophandler_t *handler;
- zval *return_value, *copy = php_http_zsep(IS_STRING, member);
+ zval *return_value, *copy = php_http_ztyp(IS_STRING, member);
- if (SUCCESS == php_http_message_object_get_prophandler(Z_STRVAL_P(copy), Z_STRLEN_P(copy), &handler)) {
- if (type == BP_VAR_W) {
- zval_ptr_dtor(©);
- zend_error(E_ERROR, "Cannot access HttpMessage properties by reference or array key/index");
- return NULL;
- }
+ PHP_HTTP_MESSAGE_OBJECT_INIT(obj);
+ if (SUCCESS == php_http_message_object_get_prophandler(Z_STRVAL_P(copy), Z_STRLEN_P(copy), &handler)) {
ALLOC_ZVAL(return_value);
Z_SET_REFCOUNT_P(return_value, 0);
Z_UNSET_ISREF_P(return_value);
- handler->read(obj, return_value TSRMLS_CC);
-
+ if (type == BP_VAR_R) {
+ handler->read(obj, return_value TSRMLS_CC);
+ } else {
+ php_property_proxy_t *proxy = php_property_proxy_init(object, Z_STRVAL_P(copy), Z_STRLEN_P(copy) TSRMLS_CC);
+ RETVAL_OBJVAL(php_property_proxy_object_new_ex(php_property_proxy_get_class_entry(), proxy, NULL TSRMLS_CC), 0);
+ }
} else {
- return_value = zend_get_std_object_handlers()->read_property(object, member, type, literal_key TSRMLS_CC);
+ return_value = zend_get_std_object_handlers()->read_property(object, member, type PHP_HTTP_ZEND_LITERAL_CC TSRMLS_CC);
}
zval_ptr_dtor(©);
return return_value;
}
-static void php_http_message_object_write_prop(zval *object, zval *member, zval *value, const zend_literal *literal_key TSRMLS_DC)
+static void php_http_message_object_write_prop(zval *object, zval *member, zval *value PHP_HTTP_ZEND_LITERAL_DC TSRMLS_DC)
{
php_http_message_object_t *obj = zend_object_store_get_object(object TSRMLS_CC);
php_http_message_object_prophandler_t *handler;
- zval *copy = php_http_zsep(IS_STRING, member);
+ zval *copy = php_http_ztyp(IS_STRING, member);
+
+ PHP_HTTP_MESSAGE_OBJECT_INIT(obj);
if (SUCCESS == php_http_message_object_get_prophandler(Z_STRVAL_P(copy), Z_STRLEN_P(copy), &handler)) {
handler->write(obj, value TSRMLS_CC);
} else {
- zend_get_std_object_handlers()->write_property(object, member, value, literal_key TSRMLS_CC);
+ zend_get_std_object_handlers()->write_property(object, member, value PHP_HTTP_ZEND_LITERAL_CC TSRMLS_CC);
}
zval_ptr_dtor(©);
}
-
static HashTable *php_http_message_object_get_props(zval *object TSRMLS_DC)
{
zval *headers;
zval array, *parent, *body;
char *version;
+ PHP_HTTP_MESSAGE_OBJECT_INIT(obj);
+
INIT_PZVAL_ARRAY(&array, props);
-
-#define ASSOC_PROP(array, ptype, name, val) \
- { \
- char *m_prop_name; \
- int m_prop_len; \
- zend_mangle_property_name(&m_prop_name, &m_prop_len, "*", 1, name, lenof(name), 0); \
- add_assoc_ ##ptype## _ex(&array, m_prop_name, sizeof(name)+3, val); \
- efree(m_prop_name); \
- }
-#define ASSOC_STRING(array, name, val) ASSOC_STRINGL(array, name, val, strlen(val))
-#define ASSOC_STRINGL(array, name, val, len) ASSOC_STRINGL_EX(array, name, val, len, 1)
-#define ASSOC_STRINGL_EX(array, name, val, len, cpy) \
- { \
- char *m_prop_name; \
- int m_prop_len; \
- zend_mangle_property_name(&m_prop_name, &m_prop_len, "*", 1, name, lenof(name), 0); \
- add_assoc_stringl_ex(&array, m_prop_name, sizeof(name)+3, val, len, cpy); \
- efree(m_prop_name); \
- }
-
- ASSOC_PROP(array, long, "type", msg->type);
- ASSOC_STRINGL_EX(array, "httpVersion", version, spprintf(&version, 0, "%u.%u", msg->http.version.major, msg->http.version.minor), 0);
+
+#define ASSOC_PROP(ptype, n, val) \
+ do { \
+ zend_property_info *pi; \
+ if (SUCCESS == zend_hash_find(&obj->zo.ce->properties_info, n, sizeof(n), (void *) &pi)) { \
+ add_assoc_ ##ptype## _ex(&array, pi->name, pi->name_length + 1, val); \
+ } \
+ } while(0) \
+
+#define ASSOC_STRING(name, val) ASSOC_STRINGL(name, val, strlen(val))
+#define ASSOC_STRINGL(name, val, len) ASSOC_STRINGL_EX(name, val, len, 1)
+#define ASSOC_STRINGL_EX(n, val, len, cpy) \
+ do { \
+ zend_property_info *pi; \
+ if (SUCCESS == zend_hash_find(&obj->zo.ce->properties_info, n, sizeof(n), (void *) &pi)) { \
+ add_assoc_stringl_ex(&array, pi->name, pi->name_length + 1, val, len, cpy); \
+ } \
+ } while(0)
+
+ ASSOC_PROP(long, "type", msg->type);
+ ASSOC_STRINGL_EX("httpVersion", version, spprintf(&version, 0, "%u.%u", msg->http.version.major, msg->http.version.minor), 0);
switch (msg->type) {
case PHP_HTTP_REQUEST:
- ASSOC_PROP(array, long, "responseCode", 0);
- ASSOC_STRINGL(array, "responseStatus", "", 0);
- ASSOC_STRING(array, "requestMethod", STR_PTR(msg->http.info.request.method));
- ASSOC_STRING(array, "requestUrl", STR_PTR(msg->http.info.request.url));
+ ASSOC_PROP(long, "responseCode", 0);
+ ASSOC_STRINGL("responseStatus", "", 0);
+ ASSOC_STRING("requestMethod", STR_PTR(msg->http.info.request.method));
+ ASSOC_STRING("requestUrl", STR_PTR(msg->http.info.request.url));
break;
case PHP_HTTP_RESPONSE:
- ASSOC_PROP(array, long, "responseCode", msg->http.info.response.code);
- ASSOC_STRING(array, "responseStatus", STR_PTR(msg->http.info.response.status));
- ASSOC_STRINGL(array, "requestMethod", "", 0);
- ASSOC_STRINGL(array, "requestUrl", "", 0);
+ ASSOC_PROP(long, "responseCode", msg->http.info.response.code);
+ ASSOC_STRING("responseStatus", STR_PTR(msg->http.info.response.status));
+ ASSOC_STRINGL("requestMethod", "", 0);
+ ASSOC_STRINGL("requestUrl", "", 0);
break;
case PHP_HTTP_NONE:
default:
- ASSOC_PROP(array, long, "responseCode", 0);
- ASSOC_STRINGL(array, "responseStatus", "", 0);
- ASSOC_STRINGL(array, "requestMethod", "", 0);
- ASSOC_STRINGL(array, "requestUrl", "", 0);
+ ASSOC_PROP(long, "responseCode", 0);
+ ASSOC_STRINGL("responseStatus", "", 0);
+ ASSOC_STRINGL("requestMethod", "", 0);
+ ASSOC_STRINGL("requestUrl", "", 0);
break;
}
MAKE_STD_ZVAL(headers);
array_init(headers);
zend_hash_copy(Z_ARRVAL_P(headers), &msg->hdrs, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
- ASSOC_PROP(array, zval, "headers", headers);
+ ASSOC_PROP(zval, "headers", headers);
MAKE_STD_ZVAL(body);
if (!obj->body.handle) {
- php_http_new(&obj->body, php_http_message_body_class_entry, (php_http_new_t) php_http_message_body_object_new_ex, NULL, (void *) php_http_message_body_copy(&obj->message->body, NULL, 0), NULL TSRMLS_CC);
+ php_http_new(&obj->body, php_http_message_body_get_class_entry(), (php_http_new_t) php_http_message_body_object_new_ex, NULL, (void *) php_http_message_body_init(&obj->message->body, NULL TSRMLS_CC), NULL TSRMLS_CC);
}
ZVAL_OBJVAL(body, obj->body, 1);
- ASSOC_PROP(array, zval, "body", body);
+ ASSOC_PROP(zval, "body", body);
MAKE_STD_ZVAL(parent);
if (msg->parent) {
} else {
ZVAL_NULL(parent);
}
- ASSOC_PROP(array, zval, "parentMessage", parent);
+ ASSOC_PROP(zval, "parentMessage", parent);
return props;
}
PHP_METHOD(HttpMessage, __construct)
{
- int length = 0;
- char *message = NULL;
+ zend_bool greedy = 1;
+ zval *zmessage = NULL;
+ php_http_message_t *msg = NULL;
php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
- with_error_handling(EH_THROW, PHP_HTTP_EX_CE(runtime)) {
- if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &message, &length) && message && length) {
- php_http_message_t *msg = obj->message;
+ with_error_handling(EH_THROW, php_http_exception_get_class_entry()) {
+ if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|z!b", &zmessage, &greedy) && zmessage) {
+ if (Z_TYPE_P(zmessage) == IS_RESOURCE) {
+ php_stream *s;
+ php_http_message_parser_t p;
- php_http_message_dtor(msg);
- with_error_handling(EH_THROW, PHP_HTTP_EX_CE(message)) {
- if ((obj->message = php_http_message_parse(msg, message, length))) {
- if (obj->message->parent) {
- obj->parent = php_http_message_object_new_ex(Z_OBJCE_P(getThis()), obj->message->parent, NULL TSRMLS_CC);
- }
- } else {
- obj->message = php_http_message_init(msg, 0 TSRMLS_CC);
+ php_stream_from_zval(s, &zmessage);
+ if (s && php_http_message_parser_init(&p TSRMLS_CC)) {
+ unsigned flags = (greedy ? PHP_HTTP_MESSAGE_PARSER_GREEDY : 0);
+
+ php_http_message_parser_parse_stream(&p, s, flags, &msg);
+ php_http_message_parser_dtor(&p);
}
- } end_error_handling();
- }
- if (!obj->message) {
- obj->message = php_http_message_init(NULL, 0 TSRMLS_CC);
+
+ if (!msg) {
+ php_http_error(HE_THROW, PHP_HTTP_E_MESSAGE, "could not parse message from stream");
+ }
+ } else {
+ zmessage = php_http_ztyp(IS_STRING, zmessage);
+ if (!(msg = php_http_message_parse(NULL, Z_STRVAL_P(zmessage), Z_STRLEN_P(zmessage), greedy TSRMLS_CC))) {
+ php_http_error(HE_THROW, PHP_HTTP_E_MESSAGE, "could not parse message: %.*s", MIN(25, Z_STRLEN_P(zmessage)), Z_STRVAL_P(zmessage));
+ }
+ zval_ptr_dtor(&zmessage);
+ }
+
+ if (msg) {
+ php_http_message_dtor(obj->message);
+ obj->message = msg;
+ if (obj->message->parent) {
+ obj->parent = php_http_message_object_new_ex(Z_OBJCE_P(getThis()), obj->message->parent, NULL TSRMLS_CC);
+ }
+ }
}
+ PHP_HTTP_MESSAGE_OBJECT_INIT(obj);
} end_error_handling();
}
PHP_METHOD(HttpMessage, getBody)
{
- with_error_handling(EH_THROW, PHP_HTTP_EX_CE(message)) {
+ with_error_handling(EH_THROW, php_http_exception_get_class_entry()) {
if (SUCCESS == zend_parse_parameters_none()) {
php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
- if (!obj->message) {
- obj->message = php_http_message_init(NULL, 0 TSRMLS_CC);
- }
+ PHP_HTTP_MESSAGE_OBJECT_INIT(obj);
- if (obj->body.handle || SUCCESS == php_http_new(&obj->body, php_http_message_body_class_entry, (php_http_new_t) php_http_message_body_object_new_ex, NULL, (void *) php_http_message_body_copy(&obj->message->body, NULL, 0), NULL TSRMLS_CC)) {
+ if (!obj->body.handle) {
+ php_http_message_body_addref(obj->message->body);
+ php_http_new(&obj->body, php_http_message_body_get_class_entry(), (php_http_new_t) php_http_message_body_object_new_ex, NULL, obj->message->body, NULL TSRMLS_CC);
+ }
+ if (obj->body.handle) {
RETVAL_OBJVAL(obj->body, 1);
}
}
{
zval *zbody;
- if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O", &zbody, php_http_message_body_class_entry)) {
+ if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O", &zbody, php_http_message_body_get_class_entry())) {
php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
- php_http_message_body_object_t *body_obj = zend_object_store_get_object(zbody TSRMLS_CC);
- if (!obj->message) {
- obj->message = php_http_message_init(NULL, 0 TSRMLS_CC);
- }
+ PHP_HTTP_MESSAGE_OBJECT_INIT(obj);
+ php_http_message_object_prophandler_set_body(obj, zbody TSRMLS_CC);
+ }
+ RETVAL_ZVAL(getThis(), 1, 0);
+}
- php_http_message_body_dtor(&obj->message->body);
- php_http_message_body_init(&obj->message->body, php_http_message_body_stream(body_obj->body));
- Z_OBJ_ADDREF_P(zbody);
- obj->body = Z_OBJVAL_P(zbody);
- RETURN_TRUE;
+PHP_METHOD(HttpMessage, addBody)
+{
+ zval *new_body;
+
+ if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O", &new_body, php_http_message_body_get_class_entry())) {
+ php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+ php_http_message_body_object_t *new_obj = zend_object_store_get_object(new_body TSRMLS_CC);
+
+ PHP_HTTP_MESSAGE_OBJECT_INIT(obj);
+ php_http_message_body_to_callback(new_obj->body, (php_http_pass_callback_t) php_http_message_body_append, obj->message->body, 0, 0);
}
- RETURN_FALSE;
+ RETVAL_ZVAL(getThis(), 1, 0);
}
+
PHP_METHOD(HttpMessage, getHeader)
{
char *header_str;
php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
zval *header;
- if (!obj->message) {
- obj->message = php_http_message_init(NULL, 0 TSRMLS_CC);
- }
+ PHP_HTTP_MESSAGE_OBJECT_INIT(obj);
if ((header = php_http_message_header(obj->message, header_str, header_len, 0))) {
RETURN_ZVAL(header, 1, 1);
if (SUCCESS == zend_parse_parameters_none()) {
php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
- if (!obj->message) {
- obj->message = php_http_message_init(NULL, 0 TSRMLS_CC);
- }
+ PHP_HTTP_MESSAGE_OBJECT_INIT(obj);
array_init(return_value);
array_copy(&obj->message->hdrs, Z_ARRVAL_P(return_value));
php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
char *name = php_http_pretty_key(estrndup(name_str, name_len), name_len, 1, 1);
- if (!obj->message) {
- obj->message = php_http_message_init(NULL, 0 TSRMLS_CC);
- }
+ PHP_HTTP_MESSAGE_OBJECT_INIT(obj);
if (!zvalue) {
- RETVAL_SUCCESS(zend_hash_del(&obj->message->hdrs, name, name_len + 1));
+ zend_symtable_del(&obj->message->hdrs, name, name_len + 1);
} else {
Z_ADDREF_P(zvalue);
- RETVAL_SUCCESS(zend_hash_update(&obj->message->hdrs, name, name_len + 1, &zvalue, sizeof(void *), NULL));
+ zend_symtable_update(&obj->message->hdrs, name, name_len + 1, &zvalue, sizeof(void *), NULL);
}
efree(name);
- return;
}
- RETURN_FALSE;
+ RETVAL_ZVAL(getThis(), 1, 0);
}
PHP_METHOD(HttpMessage, setHeaders)
if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a/!", &new_headers)) {
php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
- if (!obj->message) {
- obj->message = php_http_message_init(NULL, 0 TSRMLS_CC);
- }
+ PHP_HTTP_MESSAGE_OBJECT_INIT(obj);
zend_hash_clean(&obj->message->hdrs);
if (new_headers) {
array_join(Z_ARRVAL_P(new_headers), &obj->message->hdrs, 0, ARRAY_JOIN_PRETTIFY|ARRAY_JOIN_STRONLY);
}
- RETURN_TRUE;
}
- RETURN_FALSE;
+ RETVAL_ZVAL(getThis(), 1, 0);
}
PHP_METHOD(HttpMessage, addHeader)
char *name = php_http_pretty_key(estrndup(name_str, name_len), name_len, 1, 1);
zval *header;
- if (!obj->message) {
- obj->message = php_http_message_init(NULL, 0 TSRMLS_CC);
- }
+ PHP_HTTP_MESSAGE_OBJECT_INIT(obj);
Z_ADDREF_P(zvalue);
if ((header = php_http_message_header(obj->message, name, name_len, 0))) {
convert_to_array(header);
- RETVAL_SUCCESS(zend_hash_next_index_insert(Z_ARRVAL_P(header), &zvalue, sizeof(void *), NULL));
+ zend_hash_next_index_insert(Z_ARRVAL_P(header), &zvalue, sizeof(void *), NULL);
+ zval_ptr_dtor(&header);
} else {
- RETVAL_SUCCESS(zend_hash_update(&obj->message->hdrs, name, name_len + 1, &zvalue, sizeof(void *), NULL));
+ zend_symtable_update(&obj->message->hdrs, name, name_len + 1, &zvalue, sizeof(void *), NULL);
}
efree(name);
- return;
}
- RETURN_FALSE;
+ RETVAL_ZVAL(getThis(), 1, 0);
}
PHP_METHOD(HttpMessage, addHeaders)
if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a|b", &new_headers, &append)) {
php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
- if (!obj->message) {
- obj->message = php_http_message_init(NULL, 0 TSRMLS_CC);
- }
+ PHP_HTTP_MESSAGE_OBJECT_INIT(obj);
array_join(Z_ARRVAL_P(new_headers), &obj->message->hdrs, append, ARRAY_JOIN_STRONLY|ARRAY_JOIN_PRETTIFY);
- RETURN_TRUE;
}
- RETURN_FALSE;
+ RETVAL_ZVAL(getThis(), 1, 0);
}
PHP_METHOD(HttpMessage, getType)
if (SUCCESS == zend_parse_parameters_none()) {
php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
- if (!obj->message) {
- obj->message = php_http_message_init(NULL, 0 TSRMLS_CC);
- }
+ PHP_HTTP_MESSAGE_OBJECT_INIT(obj);
RETURN_LONG(obj->message->type);
}
if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &type)) {
php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
- if (!obj->message) {
- obj->message = php_http_message_init(NULL, 0 TSRMLS_CC);
- }
+ PHP_HTTP_MESSAGE_OBJECT_INIT(obj);
php_http_message_set_type(obj->message, type);
- RETURN_TRUE;
}
- RETURN_FALSE;
+ RETVAL_ZVAL(getThis(), 1, 0);
}
PHP_METHOD(HttpMessage, getInfo)
if (SUCCESS == zend_parse_parameters_none()) {
php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
- if (!obj->message) {
- obj->message = php_http_message_init(NULL, 0 TSRMLS_CC);
- }
+ PHP_HTTP_MESSAGE_OBJECT_INIT(obj);
switch (obj->message->type) {
case PHP_HTTP_REQUEST:
&& php_http_info_parse(&inf, str TSRMLS_CC)) {
php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
- if (!obj->message) {
- obj->message = php_http_message_init(NULL, 0 TSRMLS_CC);
- }
+ PHP_HTTP_MESSAGE_OBJECT_INIT(obj);
php_http_message_set_info(obj->message, &inf);
php_http_info_dtor(&inf);
- RETURN_TRUE;
}
- RETURN_FALSE;
+ RETVAL_ZVAL(getThis(), 1, 0);
}
PHP_METHOD(HttpMessage, getHttpVersion)
size_t len;
php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
- if (!obj->message) {
- obj->message = php_http_message_init(NULL, 0 TSRMLS_CC);
- }
+ PHP_HTTP_MESSAGE_OBJECT_INIT(obj);
php_http_version_to_string(&obj->message->http.version, &str, &len, NULL, NULL TSRMLS_CC);
RETURN_STRINGL(str, len, 0);
php_http_version_t version;
php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
- if (!obj->message) {
- obj->message = php_http_message_init(NULL, 0 TSRMLS_CC);
- }
+ PHP_HTTP_MESSAGE_OBJECT_INIT(obj);
if (php_http_version_parse(&version, v_str TSRMLS_CC)) {
obj->message->http.version = version;
- RETURN_TRUE;
}
}
- RETURN_FALSE;
+ RETVAL_ZVAL(getThis(), 1, 0);
}
PHP_METHOD(HttpMessage, getResponseCode)
if (SUCCESS == zend_parse_parameters_none()) {
php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
- if (!obj->message) {
- obj->message = php_http_message_init(NULL, 0 TSRMLS_CC);
- }
+ PHP_HTTP_MESSAGE_OBJECT_INIT(obj);
PHP_HTTP_MESSAGE_TYPE_CHECK(RESPONSE, obj->message, RETURN_FALSE);
RETURN_LONG(obj->message->http.info.response.code);
if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l|b", &code, &strict)) {
php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
- if (!obj->message) {
- obj->message = php_http_message_init(NULL, 0 TSRMLS_CC);
- }
+ PHP_HTTP_MESSAGE_OBJECT_INIT(obj);
PHP_HTTP_MESSAGE_TYPE_CHECK(RESPONSE, obj->message, RETURN_FALSE);
if (strict && (code < 100 || code > 599)) {
}
obj->message->http.info.response.code = code;
- RETURN_TRUE;
+ STR_SET(obj->message->http.info.response.status, estrdup(php_http_env_get_response_status_for_code(code)));
}
-
- RETURN_FALSE;
+ RETVAL_ZVAL(getThis(), 1, 0);
}
PHP_METHOD(HttpMessage, getResponseStatus)
if (SUCCESS == zend_parse_parameters_none()) {
php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
- if (!obj->message) {
- obj->message = php_http_message_init(NULL, 0 TSRMLS_CC);
- }
+ PHP_HTTP_MESSAGE_OBJECT_INIT(obj);
PHP_HTTP_MESSAGE_TYPE_CHECK(RESPONSE, obj->message, RETURN_FALSE);
if (obj->message->http.info.response.status) {
if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &status, &status_len)) {
php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
- if (!obj->message) {
- obj->message = php_http_message_init(NULL, 0 TSRMLS_CC);
- }
+ PHP_HTTP_MESSAGE_OBJECT_INIT(obj);
PHP_HTTP_MESSAGE_TYPE_CHECK(RESPONSE, obj->message, RETURN_FALSE);
STR_SET(obj->message->http.info.response.status, estrndup(status, status_len));
- RETURN_TRUE;
}
-
- RETURN_FALSE;
+ RETVAL_ZVAL(getThis(), 1, 0);
}
PHP_METHOD(HttpMessage, getRequestMethod)
if (SUCCESS == zend_parse_parameters_none()) {
php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
- if (!obj->message) {
- obj->message = php_http_message_init(NULL, 0 TSRMLS_CC);
- }
+ PHP_HTTP_MESSAGE_OBJECT_INIT(obj);
PHP_HTTP_MESSAGE_TYPE_CHECK(REQUEST, obj->message, RETURN_FALSE);
if (obj->message->http.info.request.method) {
if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &method, &method_len)) {
php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
- if (!obj->message) {
- obj->message = php_http_message_init(NULL, 0 TSRMLS_CC);
- }
+ PHP_HTTP_MESSAGE_OBJECT_INIT(obj);
PHP_HTTP_MESSAGE_TYPE_CHECK(REQUEST, obj->message, RETURN_FALSE);
if (method_len < 1) {
}
STR_SET(obj->message->http.info.request.method, estrndup(method, method_len));
- RETURN_TRUE;
}
-
- RETURN_FALSE;
+ RETVAL_ZVAL(getThis(), 1, 0);
}
PHP_METHOD(HttpMessage, getRequestUrl)
if (SUCCESS == zend_parse_parameters_none()) {
php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
- if (!obj->message) {
- obj->message = php_http_message_init(NULL, 0 TSRMLS_CC);
- }
+ PHP_HTTP_MESSAGE_OBJECT_INIT(obj);
PHP_HTTP_MESSAGE_TYPE_CHECK(REQUEST, obj->message, RETURN_FALSE);
if (obj->message->http.info.request.url) {
if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &url_str, &url_len)) {
php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
- if (!obj->message) {
- obj->message = php_http_message_init(NULL, 0 TSRMLS_CC);
- }
+ PHP_HTTP_MESSAGE_OBJECT_INIT(obj);
PHP_HTTP_MESSAGE_TYPE_CHECK(REQUEST, obj->message, RETURN_FALSE);
if (url_len < 1) {
RETURN_FALSE;
}
STR_SET(obj->message->http.info.request.url, estrndup(url_str, url_len));
- RETURN_TRUE;
}
-
- RETURN_FALSE;
+ RETVAL_ZVAL(getThis(), 1, 0);
}
PHP_METHOD(HttpMessage, getParentMessage)
{
- with_error_handling(EH_THROW, PHP_HTTP_EX_CE(message)) {
+ with_error_handling(EH_THROW, php_http_exception_get_class_entry()) {
if (SUCCESS == zend_parse_parameters_none()) {
php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
- if (!obj->message) {
- obj->message = php_http_message_init(NULL, 0 TSRMLS_CC);
- }
+ PHP_HTTP_MESSAGE_OBJECT_INIT(obj);
if (obj->message->parent) {
RETVAL_OBJVAL(obj->parent, 1);
char *string;
size_t length;
- if (!obj->message) {
- obj->message = php_http_message_init(NULL, 0 TSRMLS_CC);
- }
+ PHP_HTTP_MESSAGE_OBJECT_INIT(obj);
if (include_parent) {
php_http_message_serialize(obj->message, &string, &length);
RETURN_EMPTY_STRING();
}
+PHP_METHOD(HttpMessage, toStream)
+{
+ zval *zstream;
+
+ if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &zstream)) {
+ php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+ php_stream *s;
+
+ PHP_HTTP_MESSAGE_OBJECT_INIT(obj);
+
+ php_stream_from_zval(s, &zstream);
+ php_http_message_to_callback(obj->message, (php_http_pass_callback_t) _php_stream_write, s);
+ }
+}
+
+PHP_METHOD(HttpMessage, toCallback)
+{
+ php_http_pass_fcall_arg_t fcd;
+
+ if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "f", &fcd.fci, &fcd.fcc)) {
+ php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+
+ PHP_HTTP_MESSAGE_OBJECT_INIT(obj);
+
+ fcd.fcz = getThis();
+ Z_ADDREF_P(fcd.fcz);
+ TSRMLS_SET_CTX(fcd.ts);
+
+ php_http_message_to_callback(obj->message, php_http_pass_fcall_callback, &fcd);
+ zend_fcall_info_args_clear(&fcd.fci, 1);
+
+ zval_ptr_dtor(&fcd.fcz);
+ RETURN_TRUE;
+ }
+ RETURN_FALSE;
+}
+
PHP_METHOD(HttpMessage, serialize)
{
if (SUCCESS == zend_parse_parameters_none()) {
char *string;
size_t length;
- if (!obj->message) {
- obj->message = php_http_message_init(NULL, 0 TSRMLS_CC);
- }
+ PHP_HTTP_MESSAGE_OBJECT_INIT(obj);
php_http_message_serialize(obj->message, &string, &length);
RETURN_STRINGL(string, length, 0);
php_http_message_dtor(obj->message);
efree(obj->message);
}
- if ((msg = php_http_message_parse(NULL, serialized, (size_t) length TSRMLS_CC))) {
+ if ((msg = php_http_message_parse(NULL, serialized, (size_t) length, 1 TSRMLS_CC))) {
obj->message = msg;
} else {
- obj->message = php_http_message_init(NULL, 0 TSRMLS_CC);
+ obj->message = php_http_message_init(NULL, 0, NULL TSRMLS_CC);
php_http_error(HE_ERROR, PHP_HTTP_E_RUNTIME, "Could not unserialize HttpMessage");
}
}
PHP_METHOD(HttpMessage, detach)
{
- with_error_handling(EH_THROW, PHP_HTTP_EX_CE(message)) {
+ with_error_handling(EH_THROW, php_http_exception_get_class_entry()) {
if (SUCCESS == zend_parse_parameters_none()) {
php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
- if (!obj->message) {
- obj->message = php_http_message_init(NULL, 0 TSRMLS_CC);
- }
+ PHP_HTTP_MESSAGE_OBJECT_INIT(obj);
- RETVAL_OBJVAL(php_http_message_object_new_ex(obj->zo.ce, php_http_message_copy(obj->message, NULL), NULL TSRMLS_CC), 0);
+ RETVAL_OBJVAL(php_http_message_object_new_ex(obj->zo.ce, php_http_message_copy_ex(obj->message, NULL, 0), NULL TSRMLS_CC), 0);
}
} end_error_handling();
}
php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
php_http_message_object_t *prepend_obj = zend_object_store_get_object(prepend TSRMLS_CC);
- if (!obj->message) {
- obj->message = php_http_message_init(NULL, 0 TSRMLS_CC);
- }
+ PHP_HTTP_MESSAGE_OBJECT_INIT(obj);
+
if (!prepend_obj->message) {
- prepend_obj->message = php_http_message_init(NULL, 0 TSRMLS_CC);
+ prepend_obj->message = php_http_message_init(NULL, 0, NULL TSRMLS_CC);
}
/* safety check */
}
}
+PHP_METHOD(HttpMessage, isMultipart)
+{
+ zval *zboundary = NULL;
+
+ if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|z", &zboundary)) {
+ php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+ char *boundary = NULL;
+
+ PHP_HTTP_MESSAGE_OBJECT_INIT(obj);
+
+ RETVAL_BOOL(php_http_message_is_multipart(obj->message, zboundary ? &boundary : NULL));
+
+ if (zboundary && boundary) {
+ zval_dtor(zboundary);
+ ZVAL_STRING(zboundary, boundary, 0);
+ }
+ }
+}
+
+PHP_METHOD(HttpMessage, splitMultipartBody)
+{
+ if (SUCCESS == zend_parse_parameters_none()) {
+ php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+ char *boundary = NULL;
+
+ PHP_HTTP_MESSAGE_OBJECT_INIT(obj);
+
+ if (php_http_message_is_multipart(obj->message, &boundary)) {
+ php_http_message_t *msg;
+
+ if ((msg = php_http_message_body_split(obj->message->body, boundary))) {
+ RETVAL_OBJVAL(php_http_message_object_new_ex(php_http_message_class_entry, msg, NULL TSRMLS_CC), 0);
+ }
+ }
+ STR_FREE(boundary);
+ }
+}
+
PHP_METHOD(HttpMessage, count)
{
if (SUCCESS == zend_parse_parameters_none()) {
long i = 0;
php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
- if (!obj->message) {
- obj->message = php_http_message_init(NULL, 0 TSRMLS_CC);
- }
+ PHP_HTTP_MESSAGE_OBJECT_INIT(obj);
php_http_message_count(i, obj->message);
RETURN_LONG(i);
projects / m6w6 / ext-http / blobdiff