X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=http_message_object.c;h=c984e960fa00a34e2da1a78f282c55784d1e8443;hb=2c0c193bdcfaa2e3c6b336da078f371e96fcec52;hp=56b1a1e9c9566514b091a6aaf6fb619f7d27b439;hpb=1374172d6c717de67faf91519b100b5348329aee;p=m6w6%2Fext-http

diff --git a/http_message_object.c b/http_message_object.c
index 56b1a1e..c984e96 100644
--- a/http_message_object.c
+++ b/http_message_object.c
@@ -33,7 +33,7 @@
 #include "php_http_request_api.h"
 #include "php_http_request_object.h"
 
-#if HTTP_HAVE_EXT(SPL) && !defined(WONKY)
+#if defined(HTTP_HAVE_SPL) && !defined(WONKY)
 /* SPL doesn't install its headers */
 extern PHPAPI zend_class_entry *spl_ce_Countable;
 #endif
@@ -55,6 +55,10 @@ HTTP_BEGIN_ARGS(setBody, 1)
 	HTTP_ARG_VAL(body, 0)
 HTTP_END_ARGS;
 
+HTTP_BEGIN_ARGS(getHeader, 1)
+	HTTP_ARG_VAL(header, 0)
+HTTP_END_ARGS;
+
 HTTP_EMPTY_ARGS(getHeaders);
 HTTP_BEGIN_ARGS(setHeaders, 1)
 	HTTP_ARG_VAL(headers, 0)
@@ -140,6 +144,7 @@ zend_function_entry http_message_object_fe[] = {
 	HTTP_MESSAGE_ME(__construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	HTTP_MESSAGE_ME(getBody, ZEND_ACC_PUBLIC)
 	HTTP_MESSAGE_ME(setBody, ZEND_ACC_PUBLIC)
+	HTTP_MESSAGE_ME(getHeader, ZEND_ACC_PUBLIC)
 	HTTP_MESSAGE_ME(getHeaders, ZEND_ACC_PUBLIC)
 	HTTP_MESSAGE_ME(setHeaders, ZEND_ACC_PUBLIC)
 	HTTP_MESSAGE_ME(addHeaders, ZEND_ACC_PUBLIC)
@@ -192,7 +197,7 @@ PHP_MINIT_FUNCTION(http_message_object)
 	HTTP_REGISTER_CLASS_EX(HttpMessage, http_message_object, NULL, 0);
 	
 #ifndef WONKY
-#	if HTTP_HAVE_EXT(SPL)
+#	ifdef HTTP_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, 2, zend_ce_serializable, zend_ce_iterator);
@@ -345,7 +350,8 @@ zend_object_value _http_message_object_new_ex(zend_class_entry *ce, http_message
 	}
 
 	ALLOC_HASHTABLE(OBJ_PROP(o));
-	zend_hash_init(OBJ_PROP(o), 0, NULL, ZVAL_PTR_DTOR, 0);
+	zend_hash_init(OBJ_PROP(o), zend_hash_num_elements(&ce->default_properties), NULL, ZVAL_PTR_DTOR, 0);
+	zend_hash_copy(OBJ_PROP(o), &ce->default_properties, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
 
 	ov.handle = putObject(http_message_object, o);
 	ov.handlers = &http_message_object_handlers;
@@ -355,18 +361,20 @@ zend_object_value _http_message_object_new_ex(zend_class_entry *ce, http_message
 
 zend_object_value _http_message_object_clone_obj(zval *this_ptr TSRMLS_DC)
 {
-	getObject(http_message_object, obj);
-	return http_message_object_new_ex(Z_OBJCE_P(this_ptr), http_message_dup(obj->message), NULL);
+	zend_object_value new_ov;
+	http_message_object *new_obj = NULL;
+	getObject(http_message_object, old_obj);
+	
+	new_ov = http_message_object_new_ex(old_obj->zo.ce, http_message_dup(old_obj->message), &new_obj);
+	zend_objects_clone_members(&new_obj->zo, new_ov, &old_obj->zo, Z_OBJ_HANDLE_P(this_ptr) TSRMLS_CC);
+	
+	return new_ov;
 }
 
 void _http_message_object_free(zend_object *object TSRMLS_DC)
 {
 	http_message_object *o = (http_message_object *) object;
 
-	if (OBJ_PROP(o)) {
-		zend_hash_destroy(OBJ_PROP(o));
-		FREE_HASHTABLE(OBJ_PROP(o));
-	}
 	if (o->message) {
 		http_message_dtor(o->message);
 		efree(o->message);
@@ -379,7 +387,7 @@ void _http_message_object_free(zend_object *object TSRMLS_DC)
 		p.value.obj = o->parent;
 		zend_objects_store_del_ref(&p TSRMLS_CC);
 	}
-	efree(o);
+	freeObject(o);
 }
 
 static zval *_http_message_object_read_prop(zval *object, zval *member, int type TSRMLS_DC)
@@ -629,13 +637,13 @@ 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);
-			ASSOC_STRING(array, "requestUrl", msg->http.info.request.url);
+			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:"");
 			break;
 
 		case HTTP_MSG_RESPONSE:
 			ASSOC_PROP(array, long, "responseCode", msg->http.info.response.code);
-			ASSOC_STRING(array, "responseStatus", msg->http.info.response.status);
+			ASSOC_STRING(array, "responseStatus", msg->http.info.response.status?msg->http.info.response.status:"");
 			ASSOC_STRINGL(array, "requestMethod", "", 0);
 			ASSOC_STRINGL(array, "requestUrl", "", 0);
 			break;
@@ -783,6 +791,31 @@ PHP_METHOD(HttpMessage, setBody)
 }
 /* }}} */
 
+/* {{{ proto string HttpMessage::getHeader(string header)
+ *
+ * Get message header.
+ *
+ * Returns the header value on success or NULL if the header does not exist.
+ */
+PHP_METHOD(HttpMessage, getHeader)
+{
+	zval *header;
+	char *orig_header, *nice_header;
+	int header_len;
+	getObject(http_message_object, obj);
+	
+	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &orig_header, &header_len)) {
+		RETURN_FALSE;
+	}
+	
+	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);
+	}
+	efree(nice_header);
+}
+/* }}} */
+
 /* {{{ proto array HttpMessage::getHeaders()
  *
  * Get Message Headers.