X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=http_message_object.c;h=8af5805076f966d5f4e34429f32176ed7f8b982a;hb=650dad8564d53bd3fb6c9867fa81e0abf17f6f7b;hp=7069e6aa50f3c058e1f3623938062ddd5eefafb7;hpb=f43d1c3e5b33a747150a521755cd97ef6e69db0c;p=m6w6%2Fext-http

diff --git a/http_message_object.c b/http_message_object.c
index 7069e6a..8af5805 100644
--- a/http_message_object.c
+++ b/http_message_object.c
@@ -1133,10 +1133,10 @@ PHP_METHOD(HttpMessage, setHttpVersion)
 /* {{{ proto HttpMessage HttpMessage::getParentMessage()
  *
  * Get parent Message.
- * 
+ *
  * Returns the parent HttpMessage on success, or NULL if there's none.
  *
- * Throws HttpMessageException.
+ * Throws HttpRuntimeException.
  */
 PHP_METHOD(HttpMessage, getParentMessage)
 {
@@ -1412,11 +1412,13 @@ PHP_METHOD(HttpMessage, detach)
 }
 /* }}} */
 
-/* {{{ proto void HttpMessage::prepend(HttpMessage message)
+/* {{{ 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.
  */
 PHP_METHOD(HttpMessage, prepend)
 {
@@ -1424,6 +1426,20 @@ PHP_METHOD(HttpMessage, prepend)
 	zend_bool top = 1;
 	
 	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O|b", &prepend, http_message_object_ce, &top)) {
+		http_message *msg[2];
+		getObject(http_message_object, obj);
+		getObjectEx(http_message_object, prepend_obj, prepend);
+		
+		/* safety check */
+		for (msg[0] = obj->message; msg[0]; msg[0] = msg[0]->parent) {
+			for (msg[1] = prepend_obj->message; msg[1]; msg[1] = msg[1]->parent) {
+				if (msg[0] == msg[1]) {
+					http_error(HE_THROW, HTTP_E_INVALID_PARAM, "Cannot prepend a message located within the same message chain");
+					return;
+				}
+			}
+		}
+		
 		http_message_object_prepend_ex(getThis(), prepend, top);
 	}
 }