#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
-#include "php.h"
+
+#include "php_http.h"
#ifdef ZEND_ENGINE_2
-#include "php_http.h"
#include "php_http_api.h"
-#include "php_http_std_defs.h"
+#include "php_http_message_api.h"
#include "php_http_message_object.h"
#include "php_http_exception_object.h"
-#include "phpstr/phpstr.h"
-#include "missing.h"
-
-ZEND_EXTERN_MODULE_GLOBALS(http);
+#ifndef WONKY
+# include "zend_interfaces.h"
+# if defined(HAVE_SPL)
+/* SPL doesn't install its headers */
+extern PHPAPI zend_class_entry *spl_ce_Countable;
+# endif
+#endif
#define HTTP_BEGIN_ARGS(method, ret_ref, req_args) HTTP_BEGIN_ARGS_EX(HttpMessage, method, ret_ref, req_args)
#define HTTP_EMPTY_ARGS(method, ret_ref) HTTP_EMPTY_ARGS_EX(HttpMessage, method, ret_ref)
HTTP_ARG_VAL(include_parent, 0)
HTTP_END_ARGS;
+HTTP_EMPTY_ARGS(count, 0);
+
+HTTP_EMPTY_ARGS(serialize, 0);
+HTTP_BEGIN_ARGS(unserialize, 0, 1)
+ HTTP_ARG_VAL(serialized, 0)
+HTTP_END_ARGS;
+
#define http_message_object_declare_default_properties() _http_message_object_declare_default_properties(TSRMLS_C)
static inline void _http_message_object_declare_default_properties(TSRMLS_D);
#define http_message_object_read_prop _http_message_object_read_prop
HTTP_MESSAGE_ME(send, ZEND_ACC_PUBLIC)
HTTP_MESSAGE_ME(toString, ZEND_ACC_PUBLIC)
+ /* implements Countable */
+ HTTP_MESSAGE_ME(count, ZEND_ACC_PUBLIC)
+
+ /* implements Serializable */
+ HTTP_MESSAGE_ME(serialize, ZEND_ACC_PUBLIC)
+ HTTP_MESSAGE_ME(unserialize, 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)
PHP_MINIT_FUNCTION(http_message_object)
{
HTTP_REGISTER_CLASS_EX(HttpMessage, http_message_object, NULL, 0);
+#ifndef WONKY
+# ifdef HAVE_SPL
+ zend_class_implements(http_message_object_ce TSRMLS_CC, 2, spl_ce_Countable, zend_ce_serializable);
+# else
+ zend_class_implements(http_message_object_ce TSRMLS_CC, 1, zend_ce_serializable);
+# endif
+#endif
HTTP_LONG_CONSTANT("HTTP_MSG_NONE", HTTP_MSG_NONE);
HTTP_LONG_CONSTANT("HTTP_MSG_REQUEST", HTTP_MSG_REQUEST);
if (msg->parent) {
o->parent = http_message_object_new_ex(ce, msg->parent, NULL);
}
- } else {
- o->message = http_message_init(NULL);
}
ALLOC_HASHTABLE(OBJ_PROP(o));
#endif
if (type == BP_VAR_W) {
- return_value = &EG(uninitialized_zval);
- return_value->refcount = 1;
- return_value->is_ref = 1;
- } else {
- ALLOC_ZVAL(return_value);
- return_value->refcount = 0;
- return_value->is_ref = 0;
+ 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)
case HTTP_MSG_PROPHASH_BODY:
case HTTP_MSG_CHILD_PROPHASH_BODY:
phpstr_fix(PHPSTR(msg));
- RETVAL_PHPSTR(PHPSTR(msg), 0, !return_value->is_ref);
+ RETVAL_PHPSTR(PHPSTR(msg), 0, 1);
break;
case HTTP_MSG_PROPHASH_HEADERS:
case HTTP_MSG_CHILD_PROPHASH_HEADERS:
- if (return_value->is_ref) {
- Z_TYPE_P(return_value) = IS_ARRAY;
- Z_ARRVAL_P(return_value) = &msg->hdrs;
- } else {
- array_init(return_value);
- zend_hash_copy(Z_ARRVAL_P(return_value), &msg->hdrs, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
- }
+ 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_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, !return_value->is_ref);
+ RETVAL_STRING(msg->http.info.request.method, 1);
} else {
RETVAL_NULL();
}
case HTTP_MSG_PROPHASH_REQUEST_URI:
case HTTP_MSG_CHILD_PROPHASH_REQUEST_URI:
if (HTTP_MSG_TYPE(REQUEST, msg) && msg->http.info.request.URI) {
- RETVAL_STRING(msg->http.info.request.URI, !return_value->is_ref);
+ RETVAL_STRING(msg->http.info.request.URI, 1);
} else {
RETVAL_NULL();
}
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, !return_value->is_ref);
+ RETVAL_STRING(msg->http.info.response.status, 1);
} else {
RETVAL_NULL();
}
{
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
return;
}
#endif
-
+
+ ALLOC_ZVAL(cpy);
+ *cpy = *value;
+ zval_copy_ctor(cpy);
+ INIT_PZVAL(cpy);
+
#ifdef WONKY
switch (h)
#else
{
case HTTP_MSG_PROPHASH_TYPE:
case HTTP_MSG_CHILD_PROPHASH_TYPE:
- convert_to_long_ex(&value);
- http_message_set_type(msg, Z_LVAL_P(value));
+ 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_ex(&value);
- msg->http.version = Z_DVAL_P(value);
+ 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_ex(&value);
+ convert_to_string(cpy);
phpstr_dtor(PHPSTR(msg));
- phpstr_from_string_ex(PHPSTR(msg), Z_STRVAL_P(value), Z_STRLEN_P(value));
+ 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_ex(&value);
+ convert_to_array(cpy);
zend_hash_clean(&msg->hdrs);
- zend_hash_copy(&msg->hdrs, Z_ARRVAL_P(value), (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
+ 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_PROPHASH_REQUEST_METHOD:
case HTTP_MSG_CHILD_PROPHASH_REQUEST_METHOD:
if (HTTP_MSG_TYPE(REQUEST, msg)) {
- convert_to_string_ex(&value);
- STR_SET(msg->http.info.request.method, estrndup(Z_STRVAL_P(value), Z_STRLEN_P(value)));
+ 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_URI:
case HTTP_MSG_CHILD_PROPHASH_REQUEST_URI:
if (HTTP_MSG_TYPE(REQUEST, msg)) {
- convert_to_string_ex(&value);
- STR_SET(msg->http.info.request.URI, estrndup(Z_STRVAL_P(value), Z_STRLEN_P(value)));
+ convert_to_string(cpy);
+ STR_SET(msg->http.info.request.URI, 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_ex(&value);
- msg->http.info.response.code = Z_LVAL_P(value);
+ 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_ex(&value);
- STR_SET(msg->http.info.response.status, estrndup(Z_STRVAL_P(value), Z_STRLEN_P(value)));
+ convert_to_string(cpy);
+ STR_SET(msg->http.info.response.status, estrndup(Z_STRVAL_P(cpy), Z_STRLEN_P(cpy)));
}
break;
#endif
break;
}
+ zval_ptr_dtor(&cpy);
}
static HashTable *_http_message_object_get_props(zval *object TSRMLS_DC)
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)+4, val); \
+ 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))
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)+4, val, len, 1); \
+ add_assoc_stringl_ex(&array, m_prop_name, sizeof(name)+3, val, len, 1); \
efree(m_prop_name); \
}
*/
PHP_METHOD(HttpMessage, __construct)
{
- char *message = NULL;
int length = 0;
+ char *message = NULL;
+
getObject(http_message_object, obj);
-
+
SET_EH_THROW_HTTP();
if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &message, &length) && message && length) {
- if (obj->message = http_message_parse(message, length)) {
+ http_message *msg = obj->message;
+
+ http_message_dtor(msg);
+ if ((obj->message = http_message_parse_ex(msg, message, length))) {
if (obj->message->parent) {
obj->parent = http_message_object_new_ex(Z_OBJCE_P(getThis()), obj->message->parent, NULL);
}
+ } else {
+ obj->message = http_message_init(msg);
}
- } else if (!obj->message) {
+ }
+ if (!obj->message) {
obj->message = http_message_new();
}
SET_EH_NORMAL();
SET_EH_THROW_HTTP();
if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &string, &length)) {
- if (msg = http_message_parse(string, length)) {
- Z_TYPE_P(return_value) = IS_OBJECT;
- return_value->value.obj = http_message_object_new_ex(http_message_object_ce, msg, NULL);
+ if ((msg = http_message_parse(string, length))) {
+ ZVAL_OBJVAL(return_value, http_message_object_new_ex(http_message_object_ce, msg, NULL));
}
}
SET_EH_NORMAL();
}
/* }}} */
+/* {{{ proto int HttpMessage::count()
+ *
+ * Implements Countable.
+ *
+ * Returns the number of parent messages + 1.
+ */
+PHP_METHOD(HttpMessage, count)
+{
+ NO_ARGS {
+ long i;
+ http_message *msg;
+ getObject(http_message_object, obj);
+
+ for (i = 0, msg = obj->message; msg; msg = msg->parent, ++i);
+ RETURN_LONG(i);
+ }
+}
+/* }}} */
+
+/* {{{ proto string HttpMessage::serialize()
+ *
+ * Implements Serializable.
+ *
+ * Returns the serialized representation of the HttpMessage.
+ */
+PHP_METHOD(HttpMessage, serialize)
+{
+ NO_ARGS {
+ char *string;
+ size_t length;
+ getObject(http_message_object, obj);
+
+ http_message_serialize(obj->message, &string, &length);
+ RETURN_STRINGL(string, length, 0);
+ }
+}
+/* }}} */
+
+/* {{{ proto void HttpMessage::unserialize(string serialized)
+ *
+ * Implements Serializable.
+ *
+ * Re-constructs the HttpMessage based upon the serialized string.
+ */
+PHP_METHOD(HttpMessage, unserialize)
+{
+ int length;
+ char *serialized;
+ getObject(http_message_object, obj);
+
+ if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &serialized, &length)) {
+ 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");
+ http_message_init(obj->message);
+ }
+ }
+}
+/* }}} */
+
#endif /* ZEND_ENGINE_2 */
/*
projects / m6w6 / ext-http / blobdiff