# 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)
-#define HTTP_MESSAGE_ME(method, visibility) PHP_ME(HttpMessage, method, HTTP_ARGS(HttpMessage, method), visibility)
+#define HTTP_BEGIN_ARGS(method, req_args) HTTP_BEGIN_ARGS_EX(HttpMessage, method, 0, req_args)
+#define HTTP_EMPTY_ARGS(method) HTTP_EMPTY_ARGS_EX(HttpMessage, method, 0)
+#define HTTP_MESSAGE_ME(method, visibility) PHP_ME(HttpMessage, method, HTTP_ARGS(HttpMessage, method), visibility)
-HTTP_BEGIN_ARGS(__construct, 0, 0)
+HTTP_BEGIN_ARGS(__construct, 0)
HTTP_ARG_VAL(message, 0)
HTTP_END_ARGS;
-HTTP_BEGIN_ARGS(fromString, 1, 1)
+HTTP_BEGIN_ARGS(fromString, 1)
HTTP_ARG_VAL(message, 0)
HTTP_END_ARGS;
-HTTP_EMPTY_ARGS(getBody, 0);
-HTTP_BEGIN_ARGS(setBody, 0, 1)
+HTTP_EMPTY_ARGS(getBody);
+HTTP_BEGIN_ARGS(setBody, 1)
HTTP_ARG_VAL(body, 0)
HTTP_END_ARGS;
-HTTP_EMPTY_ARGS(getHeaders, 0);
-HTTP_BEGIN_ARGS(setHeaders, 0, 1)
+HTTP_EMPTY_ARGS(getHeaders);
+HTTP_BEGIN_ARGS(setHeaders, 1)
HTTP_ARG_VAL(headers, 0)
HTTP_END_ARGS;
-HTTP_BEGIN_ARGS(addHeaders, 0, 1)
+HTTP_BEGIN_ARGS(addHeaders, 1)
HTTP_ARG_VAL(headers, 0)
HTTP_ARG_VAL(append, 0)
HTTP_END_ARGS;
-HTTP_EMPTY_ARGS(getType, 0);
-HTTP_BEGIN_ARGS(setType, 0, 1)
+HTTP_EMPTY_ARGS(getType);
+HTTP_BEGIN_ARGS(setType, 1)
HTTP_ARG_VAL(type, 0)
HTTP_END_ARGS;
-HTTP_EMPTY_ARGS(getResponseCode, 0);
-HTTP_BEGIN_ARGS(setResponseCode, 0, 1)
+HTTP_EMPTY_ARGS(getResponseCode);
+HTTP_BEGIN_ARGS(setResponseCode, 1)
HTTP_ARG_VAL(response_code, 0)
HTTP_END_ARGS;
-HTTP_EMPTY_ARGS(getResponseStatus, 0);
-HTTP_BEGIN_ARGS(setResponseStatus, 0, 1)
+HTTP_EMPTY_ARGS(getResponseStatus);
+HTTP_BEGIN_ARGS(setResponseStatus, 1)
HTTP_ARG_VAL(response_status, 0)
HTTP_END_ARGS;
-HTTP_EMPTY_ARGS(getRequestMethod, 0);
-HTTP_BEGIN_ARGS(setRequestMethod, 0, 1)
+HTTP_EMPTY_ARGS(getRequestMethod);
+HTTP_BEGIN_ARGS(setRequestMethod, 1)
HTTP_ARG_VAL(request_method, 0)
HTTP_END_ARGS;
-HTTP_EMPTY_ARGS(getRequestUrl, 0);
-HTTP_BEGIN_ARGS(setRequestUrl, 0, 1)
+HTTP_EMPTY_ARGS(getRequestUrl);
+HTTP_BEGIN_ARGS(setRequestUrl, 1)
HTTP_ARG_VAL(url, 0)
HTTP_END_ARGS;
-HTTP_EMPTY_ARGS(getHttpVersion, 0);
-HTTP_BEGIN_ARGS(setHttpVersion, 0, 1)
+HTTP_EMPTY_ARGS(getHttpVersion);
+HTTP_BEGIN_ARGS(setHttpVersion, 1)
HTTP_ARG_VAL(http_version, 0)
HTTP_END_ARGS;
-HTTP_EMPTY_ARGS(getParentMessage, 0);
-HTTP_EMPTY_ARGS(send, 0);
-HTTP_BEGIN_ARGS(toString, 0, 0)
+HTTP_EMPTY_ARGS(getParentMessage);
+HTTP_EMPTY_ARGS(send);
+HTTP_BEGIN_ARGS(toString, 0)
HTTP_ARG_VAL(include_parent, 0)
HTTP_END_ARGS;
-HTTP_EMPTY_ARGS(toMessageTypeObject, 0);
+HTTP_EMPTY_ARGS(toMessageTypeObject);
-HTTP_EMPTY_ARGS(count, 0);
+HTTP_EMPTY_ARGS(count);
-HTTP_EMPTY_ARGS(serialize, 0);
-HTTP_BEGIN_ARGS(unserialize, 0, 1)
+HTTP_EMPTY_ARGS(serialize);
+HTTP_BEGIN_ARGS(unserialize, 1)
HTTP_ARG_VAL(serialized, 0)
HTTP_END_ARGS;
-HTTP_EMPTY_ARGS(rewind, 0);
-HTTP_EMPTY_ARGS(valid, 0);
-HTTP_EMPTY_ARGS(key, 0);
-HTTP_EMPTY_ARGS(current, 0);
-HTTP_EMPTY_ARGS(next, 0);
+HTTP_EMPTY_ARGS(rewind);
+HTTP_EMPTY_ARGS(valid);
+HTTP_EMPTY_ARGS(key);
+HTTP_EMPTY_ARGS(current);
+HTTP_EMPTY_ARGS(next);
-HTTP_EMPTY_ARGS(detach, 0);
-HTTP_BEGIN_ARGS(prepend, 0, 1)
+HTTP_EMPTY_ARGS(detach);
+HTTP_BEGIN_ARGS(prepend, 1)
HTTP_ARG_OBJ(HttpMessage, message, 0)
HTTP_END_ARGS;
+HTTP_EMPTY_ARGS(reverse);
-#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
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
#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
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(detach, ZEND_ACC_PUBLIC)
HTTP_MESSAGE_ME(prepend, ZEND_ACC_PUBLIC)
+ HTTP_MESSAGE_ME(reverse, ZEND_ACC_PUBLIC)
EMPTY_FUNCTION_ENTRY
};
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, 3, spl_ce_Countable, zend_ce_serializable, zend_ce_iterator);
#else
zend_class_implements(http_message_object_ce TSRMLS_CC, 1, zend_ce_iterator);
#endif
-
- HTTP_LONG_CONSTANT("HTTP_MSG_NONE", HTTP_MSG_NONE);
- HTTP_LONG_CONSTANT("HTTP_MSG_REQUEST", HTTP_MSG_REQUEST);
- HTTP_LONG_CONSTANT("HTTP_MSG_RESPONSE", HTTP_MSG_RESPONSE);
-
+
http_message_object_handlers.clone_obj = _http_message_object_clone_obj;
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);
+
+#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);
+#endif
+
+ HTTP_LONG_CONSTANT("HTTP_MSG_NONE", HTTP_MSG_NONE);
+ HTTP_LONG_CONSTANT("HTTP_MSG_REQUEST", HTTP_MSG_REQUEST);
+ HTTP_LONG_CONSTANT("HTTP_MSG_RESPONSE", HTTP_MSG_RESPONSE);
+
return SUCCESS;
}
+void _http_message_object_reverse(zval *this_ptr, zval *return_value TSRMLS_DC)
+{
+ int i;
+ getObject(http_message_object, obj);
+
+ /* count */
+ http_message_count(i, obj->message);
+
+ if (i > 1) {
+ zval o;
+ zend_object_value *ovalues = NULL;
+ http_message_object **objects = NULL;
+ int last = i - 1;
+
+ objects = ecalloc(i, sizeof(http_message_object *));
+ ovalues = ecalloc(i, sizeof(zend_object_value));
+
+ /* we are the first message */
+ objects[0] = obj;
+ 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);
+ }
+
+ /* reorder parents */
+ for (last = --i; i; --i) {
+ 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?) */
+ Z_OBJ_ADDREF_P(getThis());
+ RETVAL_OBJVAL(ovalues[last], 1);
+
+ efree(objects);
+ efree(ovalues);
+ } else {
+ RETURN_ZVAL(getThis(), 1, 0);
+ }
+}
+
+void _http_message_object_prepend_ex(zval *this_ptr, zval *prepend, zend_bool top TSRMLS_DC)
+{
+ zval m;
+ http_message *save_parent_msg;
+ zend_object_value save_parent_obj;
+ getObject(http_message_object, obj);
+ getObjectEx(http_message_object, prepend_obj, prepend);
+
+ INIT_PZVAL(&m);
+ m.type = IS_OBJECT;
+
+ if (!top) {
+ save_parent_obj = obj->parent;
+ save_parent_msg = obj->message->parent;
+ } else {
+ /* iterate to the most parent object */
+ while (obj->parent.handle) {
+ m.value.obj = obj->parent;
+ obj = zend_object_store_get_object(&m TSRMLS_CC);
+ }
+ }
+
+ /* prepend */
+ obj->parent = prepend->value.obj;
+ obj->message->parent = prepend_obj->message;
+
+ /* add ref */
+ zend_objects_store_add_ref(prepend TSRMLS_CC);
+ while (prepend_obj->parent.handle) {
+ m.value.obj = prepend_obj->parent;
+ zend_objects_store_add_ref(&m TSRMLS_CC);
+ prepend_obj = zend_object_store_get_object(&m TSRMLS_CC);
+ }
+
+ if (!top) {
+ prepend_obj->parent = save_parent_obj;
+ prepend_obj->message->parent = save_parent_msg;
+ }
+}
+
zend_object_value _http_message_object_new(zend_class_entry *ce TSRMLS_DC)
{
return http_message_object_new_ex(ce, NULL, NULL);
return http_message_object_new_ex(Z_OBJCE_P(this_ptr), http_message_dup(obj->message), NULL);
}
-static inline void _http_message_object_declare_default_properties(TSRMLS_D)
-{
- zend_class_entry *ce = http_message_object_ce;
-
-#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);
-#endif
-
- 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);
-}
-
void _http_message_object_free(zend_object *object TSRMLS_DC)
{
http_message_object *o = (http_message_object *) object;
*
* Create an HttpMessage object from a string. Kind of a static constructor.
*
- * Expects a string parameter containing a sinlge or several consecutive
- * HTTP messages. Accepts an optionsl string parameter specifying the class to use.
+ * 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.
*
*
* Set Message Type. (HTTP_MSG_NONE|HTTP_MSG_REQUEST|HTTP_MSG_RESPONSE)
*
- * Exptects an int parameter, the HttpMessage::TYPE.
+ * Expects an int parameter, the HttpMessage::TYPE.
*/
PHP_METHOD(HttpMessage, setType)
{
* Get parent Message.
*
* Returns the parent HttpMessage on success, or NULL if there's none.
+ *
+ * Throws HttpMessageException.
*/
PHP_METHOD(HttpMessage, getParentMessage)
{
- NO_ARGS;
-
- IF_RETVAL_USED {
+ SET_EH_THROW_HTTP();
+ NO_ARGS {
getObject(http_message_object, obj);
if (obj->message->parent) {
RETVAL_OBJVAL(obj->parent, 1);
} else {
- RETVAL_NULL();
+ http_error(HE_WARNING, HTTP_E_RUNTIME, "HttpMessage does not have a parent message");
}
}
+ SET_EH_NORMAL();
}
/* }}} */
{
NO_ARGS {
long i;
- http_message *msg;
getObject(http_message_object, obj);
- for (i = 0, msg = obj->message; msg; msg = msg->parent, ++i);
+ http_message_count(i, obj->message);
RETURN_LONG(i);
}
}
zend_bool top = 1;
if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O|b", &prepend, http_message_object_ce, &top)) {
- zval m;
- http_message *save_parent_msg;
- zend_object_value save_parent_obj;
- getObject(http_message_object, obj);
- getObjectEx(http_message_object, prepend_obj, prepend);
-
- INIT_PZVAL(&m);
- m.type = IS_OBJECT;
-
- if (!top) {
- save_parent_obj = obj->parent;
- save_parent_msg = obj->message->parent;
- } else {
- /* iterate to the most parent object */
- while (obj->parent.handle) {
- m.value.obj = obj->parent;
- obj = zend_object_store_get_object(&m TSRMLS_CC);
- }
- }
-
- /* prepend */
- obj->parent = prepend->value.obj;
- obj->message->parent = prepend_obj->message;
-
- /* add ref */
- zend_objects_store_add_ref(prepend TSRMLS_CC);
- while (prepend_obj->parent.handle) {
- m.value.obj = prepend_obj->parent;
- zend_objects_store_add_ref(&m TSRMLS_CC);
- prepend_obj = zend_object_store_get_object(&m TSRMLS_CC);
- }
-
- if (!top) {
- prepend_obj->parent = save_parent_obj;
- prepend_obj->message->parent = save_parent_msg;
- }
+ http_message_object_prepend_ex(getThis(), prepend, top);
+ }
+}
+/* }}} */
+
+/* {{{ proto HttpMessage HttpMessage::reverse()
+ *
+ * Reorders the message chain in reverse order.
+ *
+ * Returns the most parent HttpMessage object.
+ */
+PHP_METHOD(HttpMessage, reverse)
+{
+ NO_ARGS {
+ http_message_object_reverse(getThis(), return_value);
}
}
/* }}} */
projects / m6w6 / ext-http / blobdiff