| modification, are permitted provided that the conditions mentioned |
| in the accompanying LICENSE file are met. |
+--------------------------------------------------------------------+
- | Copyright (c) 2004-2006, Michael Wallner <mike@php.net> |
+ | Copyright (c) 2004-2010, Michael Wallner <mike@php.net> |
+--------------------------------------------------------------------+
*/
#include "zend_interfaces.h"
#include "ext/standard/url.h"
+#include "php_variables.h"
#include "php_http_api.h"
#include "php_http_send_api.h"
#include "php_http_request_method_api.h"
#include "php_http_request_api.h"
#include "php_http_request_object.h"
+#include "php_http_headers_api.h"
#if defined(HTTP_HAVE_SPL) && !defined(WONKY)
/* SPL doesn't install its headers */
HTTP_ARG_VAL(message, 0)
HTTP_END_ARGS;
-HTTP_BEGIN_ARGS(fromString, 1)
+HTTP_BEGIN_ARGS(factory, 0)
HTTP_ARG_VAL(message, 0)
+ HTTP_ARG_VAL(class_name, 0)
+HTTP_END_ARGS;
+
+HTTP_BEGIN_ARGS(fromEnv, 1)
+ HTTP_ARG_VAL(type, 0)
+ HTTP_ARG_VAL(class_name, 0)
HTTP_END_ARGS;
HTTP_EMPTY_ARGS(getBody);
HTTP_ARG_VAL(type, 0)
HTTP_END_ARGS;
+HTTP_EMPTY_ARGS(getInfo);
+HTTP_BEGIN_ARGS(setInfo, 1)
+ HTTP_ARG_VAL(http_info, 0)
+HTTP_END_ARGS;
+
HTTP_EMPTY_ARGS(getResponseCode);
HTTP_BEGIN_ARGS(setResponseCode, 1)
HTTP_ARG_VAL(response_code, 0)
HTTP_EMPTY_ARGS(getParentMessage);
HTTP_EMPTY_ARGS(send);
+HTTP_EMPTY_ARGS(__toString);
HTTP_BEGIN_ARGS(toString, 0)
HTTP_ARG_VAL(include_parent, 0)
HTTP_END_ARGS;
static zval *_http_message_object_read_prop(zval *object, zval *member, int type TSRMLS_DC);
#define http_message_object_write_prop _http_message_object_write_prop
static void _http_message_object_write_prop(zval *object, zval *member, zval *value TSRMLS_DC);
+#define http_message_object_get_prop_ptr _http_message_object_get_prop_ptr
+static zval **_http_message_object_get_prop_ptr(zval *object, zval *member TSRMLS_DC);
#define http_message_object_get_props _http_message_object_get_props
static HashTable *_http_message_object_get_props(zval *object TSRMLS_DC);
-#define OBJ_PROP_CE http_message_object_ce
+#define THIS_CE http_message_object_ce
zend_class_entry *http_message_object_ce;
zend_function_entry http_message_object_fe[] = {
HTTP_MESSAGE_ME(__construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
HTTP_MESSAGE_ME(addHeaders, ZEND_ACC_PUBLIC)
HTTP_MESSAGE_ME(getType, ZEND_ACC_PUBLIC)
HTTP_MESSAGE_ME(setType, ZEND_ACC_PUBLIC)
+ HTTP_MESSAGE_ME(getInfo, ZEND_ACC_PUBLIC)
+ HTTP_MESSAGE_ME(setInfo, ZEND_ACC_PUBLIC)
HTTP_MESSAGE_ME(getResponseCode, ZEND_ACC_PUBLIC)
HTTP_MESSAGE_ME(setResponseCode, ZEND_ACC_PUBLIC)
HTTP_MESSAGE_ME(getResponseStatus, ZEND_ACC_PUBLIC)
HTTP_MESSAGE_ME(key, ZEND_ACC_PUBLIC)
HTTP_MESSAGE_ME(next, ZEND_ACC_PUBLIC)
- ZEND_MALIAS(HttpMessage, __toString, toString, HTTP_ARGS(HttpMessage, toString), ZEND_ACC_PUBLIC)
+ ZEND_MALIAS(HttpMessage, __toString, toString, HTTP_ARGS(HttpMessage, __toString), ZEND_ACC_PUBLIC)
- HTTP_MESSAGE_ME(fromString, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
+ HTTP_MESSAGE_ME(factory, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
+ ZEND_MALIAS(HttpMessage, fromString, factory, HTTP_ARGS(HttpMessage, factory), ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
+ HTTP_MESSAGE_ME(fromEnv, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
HTTP_MESSAGE_ME(detach, ZEND_ACC_PUBLIC)
HTTP_MESSAGE_ME(prepend, ZEND_ACC_PUBLIC)
};
static zend_object_handlers http_message_object_handlers;
+static HashTable http_message_object_prophandlers;
+
+typedef void (*http_message_object_prophandler_func)(http_message_object *o, zval *v TSRMLS_DC);
+
+typedef struct _http_message_object_prophandler {
+ http_message_object_prophandler_func read;
+ http_message_object_prophandler_func write;
+} http_message_object_prophandler;
+
+static STATUS http_message_object_add_prophandler(const char *prop_str, size_t prop_len, http_message_object_prophandler_func read, http_message_object_prophandler_func write) {
+ http_message_object_prophandler h = { read, write };
+ return zend_hash_add(&http_message_object_prophandlers, prop_str, prop_len, (void *) &h, sizeof(h), NULL);
+}
+static STATUS http_message_object_get_prophandler(const char *prop_str, size_t prop_len, http_message_object_prophandler **handler) {
+ return zend_hash_find(&http_message_object_prophandlers, prop_str, prop_len, (void *) handler);
+}
+static void http_message_object_prophandler_get_type(http_message_object *obj, zval *return_value TSRMLS_DC) {
+ RETVAL_LONG(obj->message->type);
+}
+static void http_message_object_prophandler_set_type(http_message_object *obj, zval *value TSRMLS_DC) {
+ zval *cpy = http_zsep(IS_LONG, value);
+ http_message_set_type(obj->message, Z_LVAL_P(cpy));
+ zval_ptr_dtor(&cpy);
+}
+static void http_message_object_prophandler_get_body(http_message_object *obj, zval *return_value TSRMLS_DC) {
+ phpstr_fix(PHPSTR(obj->message));
+ RETVAL_PHPSTR(PHPSTR(obj->message), 0, 1);
+}
+static void http_message_object_prophandler_set_body(http_message_object *obj, zval *value TSRMLS_DC) {
+ zval *cpy = http_zsep(IS_STRING, value);
+ phpstr_dtor(PHPSTR(obj->message));
+ phpstr_from_string_ex(PHPSTR(obj->message), Z_STRVAL_P(cpy), Z_STRLEN_P(cpy));
+ zval_ptr_dtor(&cpy);
+}
+static void http_message_object_prophandler_get_request_method(http_message_object *obj, zval *return_value TSRMLS_DC) {
+ if (HTTP_MSG_TYPE(REQUEST, obj->message) && obj->message->http.info.request.method) {
+ RETVAL_STRING(obj->message->http.info.request.method, 1);
+ } else {
+ RETVAL_NULL();
+ }
+}
+static void http_message_object_prophandler_set_request_method(http_message_object *obj, zval *value TSRMLS_DC) {
+ if (HTTP_MSG_TYPE(REQUEST, obj->message)) {
+ zval *cpy = http_zsep(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 http_message_object_prophandler_get_request_url(http_message_object *obj, zval *return_value TSRMLS_DC) {
+ if (HTTP_MSG_TYPE(REQUEST, obj->message) && obj->message->http.info.request.url) {
+ RETVAL_STRING(obj->message->http.info.request.url, 1);
+ } else {
+ RETVAL_NULL();
+ }
+}
+static void http_message_object_prophandler_set_request_url(http_message_object *obj, zval *value TSRMLS_DC) {
+ if (HTTP_MSG_TYPE(REQUEST, obj->message)) {
+ zval *cpy = http_zsep(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 http_message_object_prophandler_get_response_status(http_message_object *obj, zval *return_value TSRMLS_DC) {
+ if (HTTP_MSG_TYPE(RESPONSE, obj->message) && obj->message->http.info.response.status) {
+ RETVAL_STRING(obj->message->http.info.response.status, 1);
+ } else {
+ RETVAL_NULL();
+ }
+}
+static void http_message_object_prophandler_set_response_status(http_message_object *obj, zval *value TSRMLS_DC) {
+ if (HTTP_MSG_TYPE(RESPONSE, obj->message)) {
+ zval *cpy = http_zsep(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 http_message_object_prophandler_get_response_code(http_message_object *obj, zval *return_value TSRMLS_DC) {
+ if (HTTP_MSG_TYPE(RESPONSE, obj->message)) {
+ RETVAL_LONG(obj->message->http.info.response.code);
+ } else {
+ RETVAL_NULL();
+ }
+}
+static void http_message_object_prophandler_set_response_code(http_message_object *obj, zval *value TSRMLS_DC) {
+ if (HTTP_MSG_TYPE(RESPONSE, obj->message)) {
+ zval *cpy = http_zsep(IS_LONG, value);
+ obj->message->http.info.response.code = Z_LVAL_P(cpy);
+ zval_ptr_dtor(&cpy);
+ }
+}
+static void http_message_object_prophandler_get_http_version(http_message_object *obj, zval *return_value TSRMLS_DC) {
+ RETVAL_DOUBLE(obj->message->http.version);
+}
+static void http_message_object_prophandler_set_http_version(http_message_object *obj, zval *value TSRMLS_DC) {
+ zval *cpy = http_zsep(IS_DOUBLE, value);
+ obj->message->http.version = Z_DVAL_P(cpy);
+ zval_ptr_dtor(&cpy);
+}
+static void http_message_object_prophandler_get_headers(http_message_object *obj, zval *return_value TSRMLS_DC) {
+ array_init(return_value);
+ zend_hash_copy(Z_ARRVAL_P(return_value), &obj->message->hdrs, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
+}
+static void http_message_object_prophandler_set_headers(http_message_object *obj, zval *value TSRMLS_DC) {
+ zval *cpy = http_zsep(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 *));
+ zval_ptr_dtor(&cpy);
+}
+static void http_message_object_prophandler_get_parent_message(http_message_object *obj, zval *return_value TSRMLS_DC) {
+ if (obj->message->parent) {
+ RETVAL_OBJVAL(obj->parent, 1);
+ } else {
+ RETVAL_NULL();
+ }
+}
+static void http_message_object_prophandler_set_parent_message(http_message_object *obj, zval *value TSRMLS_DC) {
+ if (Z_TYPE_P(value) == IS_OBJECT && instanceof_function(Z_OBJCE_P(value), http_message_object_ce TSRMLS_CC)) {
+ if (obj->message->parent) {
+ zval tmp;
+ tmp.value.obj = obj->parent;
+ Z_OBJ_DELREF(tmp);
+ }
+ Z_OBJ_ADDREF_P(value);
+ obj->parent = value->value.obj;
+ }
+}
+
PHP_MINIT_FUNCTION(http_message_object)
{
HTTP_REGISTER_CLASS_EX(HttpMessage, http_message_object, NULL, 0);
http_message_object_handlers.read_property = http_message_object_read_prop;
http_message_object_handlers.write_property = http_message_object_write_prop;
http_message_object_handlers.get_properties = http_message_object_get_props;
- http_message_object_handlers.get_property_ptr_ptr = NULL;
-
- DCL_PROP(PROTECTED, long, type, HTTP_MSG_NONE);
- DCL_PROP(PROTECTED, string, body, "");
- DCL_PROP(PROTECTED, string, requestMethod, "");
- DCL_PROP(PROTECTED, string, requestUrl, "");
- DCL_PROP(PROTECTED, string, responseStatus, "");
- DCL_PROP(PROTECTED, long, responseCode, 0);
- DCL_PROP_N(PROTECTED, httpVersion);
- DCL_PROP_N(PROTECTED, headers);
- DCL_PROP_N(PROTECTED, parentMessage);
+ http_message_object_handlers.get_property_ptr_ptr = http_message_object_get_prop_ptr;
+
+ zend_hash_init(&http_message_object_prophandlers, 9, NULL, NULL, 1);
+ zend_declare_property_long(THIS_CE, ZEND_STRS("type")-1, HTTP_MSG_NONE, ZEND_ACC_PROTECTED TSRMLS_CC);
+ http_message_object_add_prophandler(ZEND_STRS("type")-1, http_message_object_prophandler_get_type, http_message_object_prophandler_set_type);
+ zend_declare_property_string(THIS_CE, ZEND_STRS("body")-1, "", ZEND_ACC_PROTECTED TSRMLS_CC);
+ http_message_object_add_prophandler(ZEND_STRS("body")-1, http_message_object_prophandler_get_body, http_message_object_prophandler_set_body);
+ zend_declare_property_string(THIS_CE, ZEND_STRS("requestMethod")-1, "", ZEND_ACC_PROTECTED TSRMLS_CC);
+ http_message_object_add_prophandler(ZEND_STRS("requestMethod")-1, http_message_object_prophandler_get_request_method, http_message_object_prophandler_set_request_method);
+ zend_declare_property_string(THIS_CE, ZEND_STRS("requestUrl")-1, "", ZEND_ACC_PROTECTED TSRMLS_CC);
+ http_message_object_add_prophandler(ZEND_STRS("requestUrl")-1, http_message_object_prophandler_get_request_url, http_message_object_prophandler_set_request_url);
+ zend_declare_property_string(THIS_CE, ZEND_STRS("responseStatus")-1, "", ZEND_ACC_PROTECTED TSRMLS_CC);
+ http_message_object_add_prophandler(ZEND_STRS("responseStatus")-1, http_message_object_prophandler_get_response_status, http_message_object_prophandler_set_response_status);
+ zend_declare_property_long(THIS_CE, ZEND_STRS("responseCode")-1, 0, ZEND_ACC_PROTECTED TSRMLS_CC);
+ http_message_object_add_prophandler(ZEND_STRS("responseCode")-1, http_message_object_prophandler_get_response_code, http_message_object_prophandler_set_response_code);
+ zend_declare_property_null(THIS_CE, ZEND_STRS("httpVersion")-1, ZEND_ACC_PROTECTED TSRMLS_CC);
+ http_message_object_add_prophandler(ZEND_STRS("httpVersion")-1, http_message_object_prophandler_get_http_version, http_message_object_prophandler_set_http_version);
+ zend_declare_property_null(THIS_CE, ZEND_STRS("headers")-1, ZEND_ACC_PROTECTED TSRMLS_CC);
+ http_message_object_add_prophandler(ZEND_STRS("headers")-1, http_message_object_prophandler_get_headers, http_message_object_prophandler_set_headers);
+ zend_declare_property_null(THIS_CE, ZEND_STRS("parentMessage")-1, ZEND_ACC_PROTECTED TSRMLS_CC);
+ http_message_object_add_prophandler(ZEND_STRS("parentMessage")-1, http_message_object_prophandler_get_parent_message, http_message_object_prophandler_set_parent_message);
#ifndef WONKY
- DCL_CONST(long, "TYPE_NONE", HTTP_MSG_NONE);
- DCL_CONST(long, "TYPE_REQUEST", HTTP_MSG_REQUEST);
- DCL_CONST(long, "TYPE_RESPONSE", HTTP_MSG_RESPONSE);
+ zend_declare_class_constant_long(THIS_CE, ZEND_STRS("TYPE_NONE")-1, HTTP_MSG_NONE TSRMLS_CC);
+ zend_declare_class_constant_long(THIS_CE, ZEND_STRS("TYPE_REQUEST")-1, HTTP_MSG_REQUEST TSRMLS_CC);
+ zend_declare_class_constant_long(THIS_CE, ZEND_STRS("TYPE_RESPONSE")-1, HTTP_MSG_RESPONSE TSRMLS_CC);
#endif
HTTP_LONG_CONSTANT("HTTP_MSG_NONE", HTTP_MSG_NONE);
return SUCCESS;
}
+PHP_MSHUTDOWN_FUNCTION(http_message_object)
+{
+ zend_hash_destroy(&http_message_object_prophandlers);
+
+ return SUCCESS;
+}
+
void _http_message_object_reverse(zval *this_ptr, zval *return_value TSRMLS_DC)
{
int i;
{
http_message_object *o = (http_message_object *) object;
+ if (o->iterator) {
+ zval_ptr_dtor(&o->iterator);
+ o->iterator = NULL;
+ }
if (o->message) {
http_message_dtor(o->message);
efree(o->message);
freeObject(o);
}
-static zval *_http_message_object_read_prop(zval *object, zval *member, int type TSRMLS_DC)
-{
+static zval **_http_message_object_get_prop_ptr(zval *object, zval *member TSRMLS_DC) {
getObjectEx(http_message_object, obj, object);
- http_message *msg = obj->message;
- zval *return_value;
-#ifdef WONKY
- ulong h = zend_get_hash_value(Z_STRVAL_P(member), Z_STRLEN_P(member)+1);
-#else
- zend_property_info *pinfo = zend_get_property_info(obj->zo.ce, member, 1 TSRMLS_CC);
+ http_message_object_prophandler *handler;
- if (!pinfo || ACC_PROP_PUBLIC(pinfo->flags)) {
- return zend_get_std_object_handlers()->read_property(object, member, type TSRMLS_CC);
- }
-#endif
-
- if (type == BP_VAR_W) {
+ if (SUCCESS == http_message_object_get_prophandler(Z_STRVAL_P(member), Z_STRLEN_P(member), &handler)) {
zend_error(E_ERROR, "Cannot access HttpMessage properties by reference or array key/index");
return NULL;
}
-
- ALLOC_ZVAL(return_value);
- return_value->refcount = 0;
- return_value->is_ref = 0;
-
-#ifdef WONKY
- switch (h)
-#else
- switch (pinfo->h)
-#endif
- {
- case HTTP_MSG_PROPHASH_TYPE:
- case HTTP_MSG_CHILD_PROPHASH_TYPE:
- RETVAL_LONG(msg->type);
- break;
-
- case HTTP_MSG_PROPHASH_HTTP_VERSION:
- case HTTP_MSG_CHILD_PROPHASH_HTTP_VERSION:
- RETVAL_DOUBLE(msg->http.version);
- break;
-
- case HTTP_MSG_PROPHASH_BODY:
- case HTTP_MSG_CHILD_PROPHASH_BODY:
- phpstr_fix(PHPSTR(msg));
- RETVAL_PHPSTR(PHPSTR(msg), 0, 1);
- break;
-
- case HTTP_MSG_PROPHASH_HEADERS:
- case HTTP_MSG_CHILD_PROPHASH_HEADERS:
- array_init(return_value);
- zend_hash_copy(Z_ARRVAL_P(return_value), &msg->hdrs, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
- break;
- case HTTP_MSG_PROPHASH_PARENT_MESSAGE:
- case HTTP_MSG_CHILD_PROPHASH_PARENT_MESSAGE:
- if (msg->parent) {
- RETVAL_OBJVAL(obj->parent, 1);
- } else {
- RETVAL_NULL();
- }
- break;
+ return zend_get_std_object_handlers()->get_property_ptr_ptr(object, member TSRMLS_CC);
+}
- case HTTP_MSG_PROPHASH_REQUEST_METHOD:
- case HTTP_MSG_CHILD_PROPHASH_REQUEST_METHOD:
- if (HTTP_MSG_TYPE(REQUEST, msg) && msg->http.info.request.method) {
- RETVAL_STRING(msg->http.info.request.method, 1);
- } else {
- RETVAL_NULL();
- }
- break;
+static zval *_http_message_object_read_prop(zval *object, zval *member, int type TSRMLS_DC)
+{
+ getObjectEx(http_message_object, obj, object);
+ http_message_object_prophandler *handler;
+ zval *return_value;
- case HTTP_MSG_PROPHASH_REQUEST_URL:
- case HTTP_MSG_CHILD_PROPHASH_REQUEST_URL:
- if (HTTP_MSG_TYPE(REQUEST, msg) && msg->http.info.request.url) {
- RETVAL_STRING(msg->http.info.request.url, 1);
- } else {
- RETVAL_NULL();
- }
- break;
+ if (SUCCESS == http_message_object_get_prophandler(Z_STRVAL_P(member), Z_STRLEN_P(member), &handler)) {
+ if (type == BP_VAR_W) {
+ zend_error(E_ERROR, "Cannot access HttpMessage properties by reference or array key/index");
+ return NULL;
+ }
- case HTTP_MSG_PROPHASH_RESPONSE_CODE:
- case HTTP_MSG_CHILD_PROPHASH_RESPONSE_CODE:
- if (HTTP_MSG_TYPE(RESPONSE, msg)) {
- RETVAL_LONG(msg->http.info.response.code);
- } else {
- RETVAL_NULL();
- }
- break;
-
- case HTTP_MSG_PROPHASH_RESPONSE_STATUS:
- case HTTP_MSG_CHILD_PROPHASH_RESPONSE_STATUS:
- if (HTTP_MSG_TYPE(RESPONSE, msg) && msg->http.info.response.status) {
- RETVAL_STRING(msg->http.info.response.status, 1);
- } else {
- RETVAL_NULL();
- }
- break;
-
- default:
-#ifdef WONKY
- return zend_get_std_object_handlers()->read_property(object, member, type TSRMLS_CC);
+ ALLOC_ZVAL(return_value);
+#ifdef Z_SET_REFCOUNT
+ Z_SET_REFCOUNT_P(return_value, 0);
+ Z_UNSET_ISREF_P(return_value);
#else
- RETVAL_NULL();
+ return_value->refcount = 0;
+ return_value->is_ref = 0;
#endif
- }
+ handler->read(obj, return_value TSRMLS_CC);
+
+ } else {
+ return_value = zend_get_std_object_handlers()->read_property(object, member, type TSRMLS_CC);
+ }
+
return return_value;
}
static void _http_message_object_write_prop(zval *object, zval *member, zval *value TSRMLS_DC)
{
getObjectEx(http_message_object, obj, object);
- http_message *msg = obj->message;
- zval *cpy = NULL;
-#ifdef WONKY
- ulong h = zend_get_hash_value(Z_STRVAL_P(member), Z_STRLEN_P(member) + 1);
-#else
- zend_property_info *pinfo = zend_get_property_info(obj->zo.ce, member, 1 TSRMLS_CC);
+ http_message_object_prophandler *handler;
- if (!pinfo || ACC_PROP_PUBLIC(pinfo->flags)) {
+ if (SUCCESS == http_message_object_get_prophandler(Z_STRVAL_P(member), Z_STRLEN_P(member), &handler)) {
+ handler->write(obj, value TSRMLS_CC);
+ } else {
zend_get_std_object_handlers()->write_property(object, member, value TSRMLS_CC);
- return;
- }
-#endif
-
- cpy = zval_copy(Z_TYPE_P(value), value);
-
-#ifdef WONKY
- switch (h)
-#else
- switch (pinfo->h)
-#endif
- {
- case HTTP_MSG_PROPHASH_TYPE:
- case HTTP_MSG_CHILD_PROPHASH_TYPE:
- convert_to_long(cpy);
- http_message_set_type(msg, Z_LVAL_P(cpy));
- break;
-
- case HTTP_MSG_PROPHASH_HTTP_VERSION:
- case HTTP_MSG_CHILD_PROPHASH_HTTP_VERSION:
- convert_to_double(cpy);
- msg->http.version = Z_DVAL_P(cpy);
- break;
-
- case HTTP_MSG_PROPHASH_BODY:
- case HTTP_MSG_CHILD_PROPHASH_BODY:
- convert_to_string(cpy);
- phpstr_dtor(PHPSTR(msg));
- phpstr_from_string_ex(PHPSTR(msg), Z_STRVAL_P(cpy), Z_STRLEN_P(cpy));
- break;
-
- case HTTP_MSG_PROPHASH_HEADERS:
- case HTTP_MSG_CHILD_PROPHASH_HEADERS:
- convert_to_array(cpy);
- zend_hash_clean(&msg->hdrs);
- zend_hash_copy(&msg->hdrs, Z_ARRVAL_P(cpy), (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
- break;
-
- case HTTP_MSG_PROPHASH_PARENT_MESSAGE:
- case HTTP_MSG_CHILD_PROPHASH_PARENT_MESSAGE:
- if (Z_TYPE_P(value) == IS_OBJECT && instanceof_function(Z_OBJCE_P(value), http_message_object_ce TSRMLS_CC)) {
- if (msg->parent) {
- zval tmp;
- tmp.value.obj = obj->parent;
- Z_OBJ_DELREF(tmp);
- }
- Z_OBJ_ADDREF_P(value);
- obj->parent = value->value.obj;
- }
- break;
-
- case HTTP_MSG_PROPHASH_REQUEST_METHOD:
- case HTTP_MSG_CHILD_PROPHASH_REQUEST_METHOD:
- if (HTTP_MSG_TYPE(REQUEST, msg)) {
- convert_to_string(cpy);
- STR_SET(msg->http.info.request.method, estrndup(Z_STRVAL_P(cpy), Z_STRLEN_P(cpy)));
- }
- break;
-
- case HTTP_MSG_PROPHASH_REQUEST_URL:
- case HTTP_MSG_CHILD_PROPHASH_REQUEST_URL:
- if (HTTP_MSG_TYPE(REQUEST, msg)) {
- convert_to_string(cpy);
- STR_SET(msg->http.info.request.url, estrndup(Z_STRVAL_P(cpy), Z_STRLEN_P(cpy)));
- }
- break;
-
- case HTTP_MSG_PROPHASH_RESPONSE_CODE:
- case HTTP_MSG_CHILD_PROPHASH_RESPONSE_CODE:
- if (HTTP_MSG_TYPE(RESPONSE, msg)) {
- convert_to_long(cpy);
- msg->http.info.response.code = Z_LVAL_P(cpy);
- }
- break;
-
- case HTTP_MSG_PROPHASH_RESPONSE_STATUS:
- case HTTP_MSG_CHILD_PROPHASH_RESPONSE_STATUS:
- if (HTTP_MSG_TYPE(RESPONSE, msg)) {
- convert_to_string(cpy);
- STR_SET(msg->http.info.response.status, estrndup(Z_STRVAL_P(cpy), Z_STRLEN_P(cpy)));
- }
- break;
-
- default:
-#ifdef WONKY
- zend_get_std_object_handlers()->write_property(object, member, value TSRMLS_CC);
-#endif
- break;
}
- zval_free(&cpy);
}
static HashTable *_http_message_object_get_props(zval *object TSRMLS_DC)
case HTTP_MSG_REQUEST:
ASSOC_PROP(array, long, "responseCode", 0);
ASSOC_STRINGL(array, "responseStatus", "", 0);
- ASSOC_STRING(array, "requestMethod", msg->http.info.request.method?msg->http.info.request.method:"");
- ASSOC_STRING(array, "requestUrl", msg->http.info.request.url?msg->http.info.request.url:"");
+ ASSOC_STRING(array, "requestMethod", STR_PTR(msg->http.info.request.method));
+ ASSOC_STRING(array, "requestUrl", STR_PTR(msg->http.info.request.url));
break;
case HTTP_MSG_RESPONSE:
ASSOC_PROP(array, long, "responseCode", msg->http.info.response.code);
- ASSOC_STRING(array, "responseStatus", msg->http.info.response.status?msg->http.info.response.status:"");
+ ASSOC_STRING(array, "responseStatus", STR_PTR(msg->http.info.response.status));
ASSOC_STRINGL(array, "requestMethod", "", 0);
ASSOC_STRINGL(array, "requestUrl", "", 0);
break;
/* ### USERLAND ### */
/* {{{ proto void HttpMessage::__construct([string message])
- *
- * Instantiate a new HttpMessage object.
- *
- * Accepts an optional string parameter containing a single or several
- * consecutive HTTP messages. The constructed object will actually
- * represent the *last* message of the passed string. If there were
- * prior messages, those can be accessed by HttpMessage::getParentMessage().
- *
- * Throws HttpMalformedHeaderException.
- */
+ Create a new HttpMessage object instance. */
PHP_METHOD(HttpMessage, __construct)
{
int length = 0;
}
/* }}} */
-/* {{{ proto static HttpMessage HttpMessage::fromString(string raw_message[, string class_name = "HttpMessage"])
- *
- * Create an HttpMessage object from a string. Kind of a static constructor.
- *
- * Expects a string parameter containing a single or several consecutive
- * HTTP messages. Accepts an optional string parameter specifying the class to use.
- *
- * Returns an HttpMessage object on success or NULL on failure.
- *
- * Throws HttpMalformedHeadersException.
- */
-PHP_METHOD(HttpMessage, fromString)
+/* {{{ proto static HttpMessage HttpMessage::factory([string raw_message[, string class_name = "HttpMessage"]])
+ Create a new HttpMessage object instance. */
+PHP_METHOD(HttpMessage, factory)
{
- char *string = NULL, *class_name = NULL;
- int length = 0, class_length = 0;
+ char *string = NULL, *cn = NULL;
+ int length = 0, cl = 0;
http_message *msg = NULL;
+ zend_object_value ov;
+ http_message_object *obj = NULL;
RETVAL_NULL();
SET_EH_THROW_HTTP();
- if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|s", &string, &length, &class_name, &class_length)) {
- if ((msg = http_message_parse(string, length))) {
- zend_class_entry *ce = http_message_object_ce;
-
- if (class_name && *class_name) {
- ce = zend_fetch_class(class_name, class_length, ZEND_FETCH_CLASS_DEFAULT TSRMLS_CC);
- if (ce && !instanceof_function(ce, http_message_object_ce TSRMLS_CC)) {
- http_error_ex(HE_WARNING, HTTP_E_RUNTIME, "Class %s does not extend HttpMessage", class_name);
- ce = NULL;
- }
- }
- if (ce) {
- RETVAL_OBJVAL(http_message_object_new_ex(ce, msg, NULL), 0);
- }
+ if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|ss", &string, &length, &cn, &cl)) {
+ if (length) {
+ msg = http_message_parse(string, length);
+ }
+ if ((msg || !length) && SUCCESS == http_object_new(&ov, cn, cl, _http_message_object_new_ex, http_message_object_ce, msg, &obj)) {
+ RETVAL_OBJVAL(ov, 0);
+ }
+ if (obj && !obj->message) {
+ obj->message = http_message_new();
+ }
+ }
+ SET_EH_NORMAL();
+}
+/* }}} */
+
+/* {{{ proto static HttpMessage HttpMessage::fromEnv(int type[, string class_name = "HttpMessage"])
+ Create a new HttpMessage object from environment representing either current request or response */
+PHP_METHOD(HttpMessage, fromEnv)
+{
+ char *cn = NULL;
+ int cl = 0;
+ long type;
+ http_message_object *obj = NULL;
+ zend_object_value ov;
+
+ RETVAL_NULL();
+ SET_EH_THROW_HTTP();
+ if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l|s", &type, &cn, &cl)) {
+ if (SUCCESS == http_object_new(&ov, cn, cl, _http_message_object_new_ex, http_message_object_ce, http_message_init_env(NULL, type), &obj)) {
+ RETVAL_OBJVAL(ov, 0);
+ }
+ if (obj && !obj->message) {
+ obj->message = http_message_new();
}
}
SET_EH_NORMAL();
/* }}} */
/* {{{ proto string HttpMessage::getBody()
- *
- * Get the body of the parsed HttpMessage.
- *
- * Returns the message body as string.
- */
+ Get the body of the parsed HttpMessage. */
PHP_METHOD(HttpMessage, getBody)
{
NO_ARGS;
/* }}} */
/* {{{ proto void HttpMessage::setBody(string body)
- *
- * Set the body of the HttpMessage.
- * NOTE: Don't forget to update any headers accordingly.
- *
- * Expects a string parameter containing the new body of the message.
- */
+ Set the body of the HttpMessage. NOTE: Don't forget to update any headers accordingly. */
PHP_METHOD(HttpMessage, setBody)
{
char *body;
if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &body, &len)) {
phpstr_dtor(PHPSTR(obj->message));
- phpstr_from_string_ex(PHPSTR(obj->message), body, len);
+ phpstr_from_string_ex(PHPSTR(obj->message), body, len);
}
}
/* }}} */
/* {{{ proto string HttpMessage::getHeader(string header)
- *
- * Get message header.
- *
- * Returns the header value on success or NULL if the header does not exist.
- */
+ Get message header. */
PHP_METHOD(HttpMessage, getHeader)
{
zval *header;
}
nice_header = pretty_key(estrndup(orig_header, header_len), header_len, 1, 1);
- if ((header = http_message_header_ex(obj->message, nice_header, header_len + 1))) {
- RETVAL_ZVAL(header, 1, 0);
+ if ((header = http_message_header_ex(obj->message, nice_header, header_len + 1, 0))) {
+ RETVAL_ZVAL(header, 1, 1);
}
efree(nice_header);
}
/* }}} */
/* {{{ proto array HttpMessage::getHeaders()
- *
- * Get Message Headers.
- *
- * Returns an associative array containing the messages HTTP headers.
- */
+ Get Message Headers. */
PHP_METHOD(HttpMessage, getHeaders)
{
NO_ARGS;
if (return_value_used) {
- zval headers;
getObject(http_message_object, obj);
- INIT_ZARR(headers, &obj->message->hdrs);
array_init(return_value);
- array_copy(&headers, return_value);
+ array_copy(&obj->message->hdrs, Z_ARRVAL_P(return_value));
}
}
/* }}} */
/* {{{ proto void HttpMessage::setHeaders(array headers)
- *
- * Sets new headers.
- *
- * Expects an associative array as parameter containing the new HTTP headers,
- * which will replace *all* previous HTTP headers of the message.
- */
+ Sets new headers. */
PHP_METHOD(HttpMessage, setHeaders)
{
- zval *new_headers = NULL, old_headers;
+ zval *new_headers = NULL;
getObject(http_message_object, obj);
if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a/!", &new_headers)) {
zend_hash_clean(&obj->message->hdrs);
if (new_headers) {
- INIT_ZARR(old_headers, &obj->message->hdrs);
- array_copy(new_headers, &old_headers);
+ array_copy(Z_ARRVAL_P(new_headers), &obj->message->hdrs);
}
}
/* }}} */
/* {{{ proto void HttpMessage::addHeaders(array headers[, bool append = false])
- *
- * Add headers. If append is true, headers with the same name will be separated, else overwritten.
- *
- * Expects an associative array as parameter containing the additional HTTP headers
- * to add to the messages existing headers. If the optional bool parameter is true,
- * and a header with the same name of one to add exists already, this respective
- * header will be converted to an array containing both header values, otherwise
- * it will be overwritten with the new header value.
- */
+ Add headers. If append is true, headers with the same name will be separated, else overwritten. */
PHP_METHOD(HttpMessage, addHeaders)
{
- zval old_headers, *new_headers;
+ zval *new_headers;
zend_bool append = 0;
getObject(http_message_object, obj);
return;
}
- INIT_ZARR(old_headers, &obj->message->hdrs);
- if (append) {
- array_append(new_headers, &old_headers);
- } else {
- array_merge(new_headers, &old_headers);
- }
+ array_join(Z_ARRVAL_P(new_headers), &obj->message->hdrs, append, ARRAY_JOIN_STRONLY|ARRAY_JOIN_PRETTIFY);
}
/* }}} */
/* {{{ proto int HttpMessage::getType()
- *
- * Get Message Type. (HTTP_MSG_NONE|HTTP_MSG_REQUEST|HTTP_MSG_RESPONSE)
- *
- * Returns the HttpMessage::TYPE.
- */
+ Get Message Type. (HTTP_MSG_NONE|HTTP_MSG_REQUEST|HTTP_MSG_RESPONSE) */
PHP_METHOD(HttpMessage, getType)
{
NO_ARGS;
/* }}} */
/* {{{ proto void HttpMessage::setType(int type)
- *
- * Set Message Type. (HTTP_MSG_NONE|HTTP_MSG_REQUEST|HTTP_MSG_RESPONSE)
- *
- * Expects an int parameter, the HttpMessage::TYPE.
- */
+ Set Message Type. (HTTP_MSG_NONE|HTTP_MSG_REQUEST|HTTP_MSG_RESPONSE) */
PHP_METHOD(HttpMessage, setType)
{
long type;
}
/* }}} */
+/* {{{ proto string HttpMessage::getInfo(void)
+ Get the HTTP request/response line */
+PHP_METHOD(HttpMessage, getInfo)
+{
+ NO_ARGS;
+
+ if (return_value_used) {
+ getObject(http_message_object, obj);
+
+ switch (obj->message->type) {
+ case HTTP_MSG_REQUEST:
+ Z_STRLEN_P(return_value) = spprintf(&Z_STRVAL_P(return_value), 0, HTTP_INFO_REQUEST_FMT_ARGS(&obj->message->http, ""));
+ break;
+ case HTTP_MSG_RESPONSE:
+ Z_STRLEN_P(return_value) = spprintf(&Z_STRVAL_P(return_value), 0, HTTP_INFO_RESPONSE_FMT_ARGS(&obj->message->http, ""));
+ break;
+ default:
+ RETURN_NULL();
+ break;
+ }
+ Z_TYPE_P(return_value) = IS_STRING;
+ }
+}
+/* }}} */
+
+/* {{{ proto bool HttpMessage::setInfo(string http_info)
+ Set type and request or response info with a standard HTTP request or response line */
+PHP_METHOD(HttpMessage, setInfo)
+{
+ char *str;
+ int len;
+ http_info inf;
+
+ if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &str, &len) && SUCCESS == http_info_parse_ex(str, &inf, 0)) {
+ getObject(http_message_object, obj);
+
+ http_message_set_info(obj->message, &inf);
+ http_info_dtor(&inf);
+ RETURN_TRUE;
+ }
+ RETURN_FALSE;
+}
+/* }}} */
+
/* {{{ proto int HttpMessage::getResponseCode()
- *
- * Get the Response Code of the Message.
- *
- * Returns the HTTP response code if the message is of type
- * HttpMessage::TYPE_RESPONSE, else FALSE.
- */
+ Get the Response Code of the Message. */
PHP_METHOD(HttpMessage, getResponseCode)
{
NO_ARGS;
/* }}} */
/* {{{ proto bool HttpMessage::setResponseCode(int code)
- *
- * Set the response code of an HTTP Response Message.
- *
- * Expects an int parameter with the HTTP response code.
- *
- * Returns TRUE on success, or FALSE if the message is not of type
- * HttpMessage::TYPE_RESPONSE or the response code is out of range (100-510).
- */
+ Set the response code of an HTTP Response Message. */
PHP_METHOD(HttpMessage, setResponseCode)
{
long code;
if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &code)) {
RETURN_FALSE;
}
- if (code < 100 || code > 510) {
- http_error_ex(HE_WARNING, HTTP_E_INVALID_PARAM, "Invalid response code (100-510): %ld", code);
+ if (code < 100 || code > 599) {
+ http_error_ex(HE_WARNING, HTTP_E_INVALID_PARAM, "Invalid response code (100-599): %ld", code);
RETURN_FALSE;
}
/* }}} */
/* {{{ proto string HttpMessage::getResponseStatus()
- *
- * Get the Response Status of the message (i.e. the string following the response code).
- *
- * Returns the HTTP response status string if the message is of type
- * HttpMessage::TYPE_RESPONSE, else FALSE.
- */
+ Get the Response Status of the message (i.e. the string following the response code). */
PHP_METHOD(HttpMessage, getResponseStatus)
{
NO_ARGS;
if (return_value_used) {
getObject(http_message_object, obj);
HTTP_CHECK_MESSAGE_TYPE_RESPONSE(obj->message, RETURN_FALSE);
- RETURN_STRING(obj->message->http.info.response.status, 1);
+ if (obj->message->http.info.response.status) {
+ RETURN_STRING(obj->message->http.info.response.status, 1);
+ } else {
+ RETURN_EMPTY_STRING();
+ }
}
}
/* }}} */
/* {{{ proto bool HttpMessage::setResponseStatus(string status)
- *
- * Set the Response Status of the HTTP message (i.e. the string following the response code).
- *
- * Expects a string parameter containing the response status text.
- *
- * Returns TRUE on success or FALSE if the message is not of type
- * HttpMessage::TYPE_RESPONSE.
- */
+ Set the Response Status of the HTTP message (i.e. the string following the response code). */
PHP_METHOD(HttpMessage, setResponseStatus)
{
char *status;
if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &status, &status_len)) {
RETURN_FALSE;
}
- STR_SET(obj->message->http.info.response.status, estrdup(status));
+ STR_SET(obj->message->http.info.response.status, estrndup(status, status_len));
RETURN_TRUE;
}
/* }}} */
/* {{{ proto string HttpMessage::getRequestMethod()
- *
- * Get the Request Method of the Message.
- *
- * Returns the request method name on success, or FALSE if the message is
- * not of type HttpMessage::TYPE_REQUEST.
- */
+ Get the Request Method of the Message. */
PHP_METHOD(HttpMessage, getRequestMethod)
{
NO_ARGS;
if (return_value_used) {
getObject(http_message_object, obj);
HTTP_CHECK_MESSAGE_TYPE_REQUEST(obj->message, RETURN_FALSE);
- RETURN_STRING(obj->message->http.info.request.method, 1);
+ if (obj->message->http.info.request.method) {
+ RETURN_STRING(obj->message->http.info.request.method, 1);
+ } else {
+ RETURN_EMPTY_STRING();
+ }
}
}
/* }}} */
/* {{{ proto bool HttpMessage::setRequestMethod(string method)
- *
- * Set the Request Method of the HTTP Message.
- *
- * Expects a string parameter containing the request method name.
- *
- * Returns TRUE on success, or FALSE if the message is not of type
- * HttpMessage::TYPE_REQUEST or an invalid request method was supplied.
- */
+ Set the Request Method of the HTTP Message. */
PHP_METHOD(HttpMessage, setRequestMethod)
{
char *method;
/* }}} */
/* {{{ proto string HttpMessage::getRequestUrl()
- *
- * Get the Request URL of the Message.
- *
- * Returns the request url as string on success, or FALSE if the message
- * is not of type HttpMessage::TYPE_REQUEST.
- */
+ Get the Request URL of the Message. */
PHP_METHOD(HttpMessage, getRequestUrl)
{
NO_ARGS;
if (return_value_used) {
getObject(http_message_object, obj);
HTTP_CHECK_MESSAGE_TYPE_REQUEST(obj->message, RETURN_FALSE);
- RETURN_STRING(obj->message->http.info.request.url, 1);
+ if (obj->message->http.info.request.url) {
+ RETURN_STRING(obj->message->http.info.request.url, 1);
+ } else {
+ RETURN_EMPTY_STRING();
+ }
}
}
/* }}} */
/* {{{ proto bool HttpMessage::setRequestUrl(string url)
- *
- * Set the Request URL of the HTTP Message.
- *
- * Expects a string parameters containing the request url.
- *
- * Returns TRUE on success, or FALSE if the message is not of type
- * HttpMessage::TYPE_REQUEST or supplied URL was empty.
- */
+ Set the Request URL of the HTTP Message. */
PHP_METHOD(HttpMessage, setRequestUrl)
{
char *URI;
/* }}} */
/* {{{ proto string HttpMessage::getHttpVersion()
- *
- * Get the HTTP Protocol Version of the Message.
- *
- * Returns the HTTP protocol version as string.
- */
+ Get the HTTP Protocol Version of the Message. */
PHP_METHOD(HttpMessage, getHttpVersion)
{
NO_ARGS;
if (return_value_used) {
- char ver[4] = {0};
+ char *version;
getObject(http_message_object, obj);
- sprintf(ver, "%1.1lf", obj->message->http.version);
- RETURN_STRINGL(ver, 3, 1);
+ spprintf(&version, 0, "%1.1F", obj->message->http.version);
+ RETURN_STRING(version, 0);
}
}
/* }}} */
/* {{{ proto bool HttpMessage::setHttpVersion(string version)
- *
- * Set the HTTP Protocol version of the Message.
- *
- * Expects a string parameter containing the HTTP protocol version.
- *
- * Returns TRUE on success, or FALSE if supplied version is out of range (1.0/1.1).
- */
+ Set the HTTP Protocol version of the Message. */
PHP_METHOD(HttpMessage, setHttpVersion)
{
- char v[4];
zval *zv;
+ char *version;
getObject(http_message_object, obj);
if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z/", &zv)) {
}
convert_to_double(zv);
- sprintf(v, "%1.1lf", Z_DVAL_P(zv));
- if (strcmp(v, "1.0") && strcmp(v, "1.1")) {
- http_error_ex(HE_WARNING, HTTP_E_INVALID_PARAM, "Invalid HTTP protocol version (1.0 or 1.1): %s", v);
+ spprintf(&version, 0, "%1.1F", Z_DVAL_P(zv));
+ if (strcmp(version, "1.0") && strcmp(version, "1.1")) {
+ http_error_ex(HE_WARNING, HTTP_E_INVALID_PARAM, "Invalid HTTP protocol version (1.0 or 1.1): %s", version);
RETURN_FALSE;
}
/* }}} */
/* {{{ proto string HttpMessage::guessContentType(string magic_file[, int magic_mode = MAGIC_MIME])
- *
- * Attempts to guess the content type of supplied payload through libmagic.
- *
- * Expects a string parameter specifying the magic.mime database to use.
- * Additionally accepts an optional int parameter, being flags for libmagic.
- *
- * Returns the guessed content type on success, or FALSE on failure.
- *
- * Throws HttpRuntimeException, HttpInvalidParamException
- * if http.only_exceptions is TRUE.
- */
+ Attempts to guess the content type of supplied payload through libmagic. */
PHP_METHOD(HttpMessage, guessContentType)
{
#ifdef HTTP_HAVE_MAGIC
/* }}} */
/* {{{ proto HttpMessage HttpMessage::getParentMessage()
- *
- * Get parent Message.
- *
- * Returns the parent HttpMessage on success, or NULL if there's none.
- *
- * Throws HttpRuntimeException.
- */
+ Get parent Message. */
PHP_METHOD(HttpMessage, getParentMessage)
{
SET_EH_THROW_HTTP();
/* }}} */
/* {{{ proto bool HttpMessage::send()
- *
- * Send the Message according to its type as Response or Request.
- * This provides limited functionality compared to HttpRequest and HttpResponse.
- *
- * Returns TRUE on success, or FALSE on failure.
- */
+ Send the Message according to its type as Response or Request. */
PHP_METHOD(HttpMessage, send)
{
getObject(http_message_object, obj);
/* }}} */
/* {{{ proto string HttpMessage::toString([bool include_parent = false])
- *
- * Get the string representation of the Message.
- *
- * Accepts a bool parameter which specifies whether the returned string
- * should also contain any parent messages.
- *
- * Returns the full message as string.
- */
+ Get the string representation of the Message. */
PHP_METHOD(HttpMessage, toString)
{
if (return_value_used) {
/* }}} */
/* {{{ proto HttpRequest|HttpResponse HttpMessage::toMessageTypeObject(void)
- *
- * Creates an object regarding to the type of the message.
- *
- * Returns either an HttpRequest or HttpResponse object on success, or NULL on failure.
- *
- * Throws HttpRuntimeException, HttpMessageTypeException, HttpHeaderException.
- */
+ Creates an object regarding to the type of the message. Returns either an HttpRequest or HttpResponse object on success, or NULL on failure. */
PHP_METHOD(HttpMessage, toMessageTypeObject)
{
SET_EH_THROW_HTTP();
#ifdef HTTP_HAVE_CURL
int method;
char *url;
- zval tmp, body, *array, *headers, *host = http_message_header(obj->message, "Host");
- php_url hurl, *purl = php_url_parse(obj->message->http.info.request.url);
+ zval post, body, *array, *headers, *host = http_message_header(obj->message, "Host");
+ php_url hurl, *purl = php_url_parse(STR_PTR(obj->message->http.info.request.url));
MAKE_STD_ZVAL(array);
array_init(array);
memset(&hurl, 0, sizeof(php_url));
- hurl.host = host ? Z_STRVAL_P(host) : NULL;
+ if (host) {
+ hurl.host = Z_STRVAL_P(host);
+ zval_ptr_dtor(&host);
+ }
http_build_url(HTTP_URL_REPLACE, purl, &hurl, NULL, &url, NULL);
php_url_free(purl);
add_assoc_string(array, "url", url, 0);
- if ( (method = http_request_method_exists(1, 0, obj->message->http.info.request.method)) ||
- (method = http_request_method_register(obj->message->http.info.request.method, strlen(obj->message->http.info.request.method)))) {
+ if ( obj->message->http.info.request.method &&
+ ((method = http_request_method_exists(1, 0, obj->message->http.info.request.method)) ||
+ (method = http_request_method_register(obj->message->http.info.request.method, strlen(obj->message->http.info.request.method))))) {
add_assoc_long(array, "method", method);
}
MAKE_STD_ZVAL(headers);
array_init(headers);
- INIT_ZARR(tmp, &obj->message->hdrs);
- array_copy(&tmp, headers);
+ array_copy(&obj->message->hdrs, Z_ARRVAL_P(headers));
add_assoc_zval(array, "headers", headers);
object_init_ex(return_value, http_request_object_ce);
zend_call_method_with_1_params(&return_value, http_request_object_ce, NULL, "setoptions", NULL, array);
zval_ptr_dtor(&array);
- INIT_PZVAL(&body);
- ZVAL_STRINGL(&body, PHPSTR_VAL(obj->message), PHPSTR_LEN(obj->message), 0);
- zend_call_method_with_1_params(&return_value, http_request_object_ce, NULL, "setrawpostdata", NULL, &body);
+ if (PHPSTR_VAL(obj->message) && PHPSTR_LEN(obj->message)) {
+ phpstr_fix(PHPSTR(obj->message));
+ INIT_PZVAL(&body);
+ ZVAL_STRINGL(&body, PHPSTR_VAL(obj->message), PHPSTR_LEN(obj->message), 0);
+ if (method != HTTP_POST) {
+ zend_call_method_with_1_params(&return_value, http_request_object_ce, NULL, "setbody", NULL, &body);
+ } else {
+ INIT_PZVAL(&post);
+ array_init(&post);
+
+ zval_copy_ctor(&body);
+ sapi_module.treat_data(PARSE_STRING, Z_STRVAL(body), &post TSRMLS_CC);
+ zend_call_method_with_1_params(&return_value, http_request_object_ce, NULL, "setpostfields", NULL, &post);
+ zval_dtor(&post);
+ }
+ }
#else
http_error(HE_WARNING, HTTP_E_RUNTIME, "Cannot transform HttpMessage to HttpRequest (missing curl support)");
#endif
{
#ifndef WONKY
HashPosition pos1, pos2;
- ulong idx;
- uint key_len;
- char *key = NULL;
+ HashKey key = initHashKey(0);
zval **header, **h, *body;
if (obj->message->http.info.response.code) {
object_init_ex(return_value, http_response_object_ce);
- FOREACH_HASH_KEYLENVAL(pos1, &obj->message->hdrs, key, key_len, idx, header) {
- if (key) {
- zval zkey;
+ FOREACH_HASH_KEYVAL(pos1, &obj->message->hdrs, key, header) {
+ if (key.type == HASH_KEY_IS_STRING) {
+ zval *zkey;
- INIT_PZVAL(&zkey);
- ZVAL_STRINGL(&zkey, key, key_len, 0);
+ MAKE_STD_ZVAL(zkey);
+ ZVAL_STRINGL(zkey, key.str, key.len - 1, 1);
switch (Z_TYPE_PP(header)) {
case IS_ARRAY:
case IS_OBJECT:
FOREACH_HASH_VAL(pos2, HASH_OF(*header), h) {
ZVAL_ADDREF(*h);
- zend_call_method_with_2_params(&return_value, http_response_object_ce, NULL, "setheader", NULL, &zkey, *h);
+ zend_call_method_with_2_params(&return_value, http_response_object_ce, NULL, "setheader", NULL, zkey, *h);
zval_ptr_dtor(h);
}
break;
default:
ZVAL_ADDREF(*header);
- zend_call_method_with_2_params(&return_value, http_response_object_ce, NULL, "setheader", NULL, &zkey, *header);
+ zend_call_method_with_2_params(&return_value, http_response_object_ce, NULL, "setheader", NULL, zkey, *header);
zval_ptr_dtor(header);
break;
}
- key = NULL;
+ zval_ptr_dtor(&zkey);
}
}
/* }}} */
/* {{{ proto int HttpMessage::count()
- *
- * Implements Countable.
- *
- * Returns the number of parent messages + 1.
- */
+ Implements Countable::count(). Returns the number of parent messages + 1. */
PHP_METHOD(HttpMessage, count)
{
NO_ARGS {
/* }}} */
/* {{{ proto string HttpMessage::serialize()
- *
- * Implements Serializable.
- *
- * Returns the serialized representation of the HttpMessage.
- */
+ Implements Serializable::serialize(). Returns the serialized representation of the HttpMessage. */
PHP_METHOD(HttpMessage, serialize)
{
NO_ARGS {
/* }}} */
/* {{{ proto void HttpMessage::unserialize(string serialized)
- *
- * Implements Serializable.
- *
- * Re-constructs the HttpMessage based upon the serialized string.
- */
+ Implements Serializable::unserialize(). Re-constructs the HttpMessage based upon the serialized string. */
PHP_METHOD(HttpMessage, unserialize)
{
int length;
getObject(http_message_object, obj);
if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &serialized, &length)) {
+ http_message *msg;
+
http_message_dtor(obj->message);
- if (!http_message_parse_ex(obj->message, serialized, (size_t) length)) {
- http_error(HE_ERROR, HTTP_E_RUNTIME, "Could not unserialize HttpMessage");
+ if ((msg = http_message_parse_ex(obj->message, serialized, (size_t) length))) {
+ obj->message = msg;
+ } else {
http_message_init(obj->message);
+ http_error(HE_ERROR, HTTP_E_RUNTIME, "Could not unserialize HttpMessage");
}
}
}
/* }}} */
/* {{{ proto HttpMessage HttpMessage::detach(void)
- *
- * Returns a clone of an HttpMessage object detached from any parent messages.
- */
+ Returns a clone of an HttpMessage object detached from any parent messages. */
PHP_METHOD(HttpMessage, detach)
{
http_info info;
/* }}} */
/* {{{ proto void HttpMessage::prepend(HttpMessage message[, bool top = true])
- *
- * Prepends message(s) to the HTTP message.
- *
- * Expects an HttpMessage object as parameter.
- *
- * Throws HttpInvalidParamException if the message is located within the same message chain.
- */
+ Prepends message(s) to the HTTP message. Throws HttpInvalidParamException if the message is located within the same message chain. */
PHP_METHOD(HttpMessage, prepend)
{
zval *prepend;
/* }}} */
/* {{{ proto HttpMessage HttpMessage::reverse()
- *
- * Reorders the message chain in reverse order.
- *
- * Returns the most parent HttpMessage object.
- */
+ Reorders the message chain in reverse order. Returns the most parent HttpMessage object. */
PHP_METHOD(HttpMessage, reverse)
{
NO_ARGS {
/* }}} */
/* {{{ proto void HttpMessage::rewind(void)
- *
- * Implements Iterator.
- */
+ Implements Iterator::rewind(). */
PHP_METHOD(HttpMessage, rewind)
{
NO_ARGS {
/* }}} */
/* {{{ proto bool HttpMessage::valid(void)
- *
- * Implements Iterator.
- */
+ Implements Iterator::valid(). */
PHP_METHOD(HttpMessage, valid)
{
NO_ARGS {
/* }}} */
/* {{{ proto void HttpMessage::next(void)
- *
- * Implements Iterator.
- */
+ Implements Iterator::next(). */
PHP_METHOD(HttpMessage, next)
{
NO_ARGS {
getObject(http_message_object, obj);
- getObjectEx(http_message_object, itr, obj->iterator);
-
- if (itr && itr->parent.handle) {
- zval *old = obj->iterator;
- MAKE_STD_ZVAL(obj->iterator);
- ZVAL_OBJVAL(obj->iterator, itr->parent, 1);
- zval_ptr_dtor(&old);
- } else {
- zval_ptr_dtor(&obj->iterator);
- obj->iterator = NULL;
+ if (obj->iterator) {
+ getObjectEx(http_message_object, itr, obj->iterator);
+
+ if (itr && itr->parent.handle) {
+ zval *old = obj->iterator;
+ MAKE_STD_ZVAL(obj->iterator);
+ ZVAL_OBJVAL(obj->iterator, itr->parent, 1);
+ zval_ptr_dtor(&old);
+ } else {
+ zval_ptr_dtor(&obj->iterator);
+ obj->iterator = NULL;
+ }
}
}
}
/* }}} */
/* {{{ proto int HttpMessage::key(void)
- *
- * Implements Iterator.
- */
+ Implements Iterator::key(). */
PHP_METHOD(HttpMessage, key)
{
NO_ARGS {
/* }}} */
/* {{{ proto HttpMessage HttpMessage::current(void)
- *
- * Implements Iterator.
- */
+ Implements Iterator::current(). */
PHP_METHOD(HttpMessage, current)
{
NO_ARGS {
projects / m6w6 / ext-http / blobdiff