X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_headers.c;h=51a6997838eb802589bc22266f20e2c1115f32b7;hp=a2e59de13f6872a7379389161ebf17cf0022c16e;hb=7ba90c6d9d6843549fb9227d1a7aa05033e60772;hpb=abbb42df325117e48521ab7f71b37c5338d20252

diff --git a/php_http_headers.c b/php_http_headers.c
index a2e59de..51a6997 100644
--- a/php_http_headers.c
+++ b/php_http_headers.c
@@ -10,9 +10,7 @@
     +--------------------------------------------------------------------+
 */
 
-#include "php_http.h"
-
-#include <Zend/zend_interfaces.h>
+#include "php_http_api.h"
 
 PHP_HTTP_API STATUS php_http_headers_parse(const char *header, size_t length, HashTable *headers, php_http_info_callback_t callback_func, void **callback_data TSRMLS_DC)
 {
@@ -28,8 +26,6 @@ PHP_HTTP_API STATUS php_http_headers_parse(const char *header, size_t length, Ha
 	return SUCCESS;
 }
 
-zend_class_entry *php_http_header_class_entry;
-
 #define PHP_HTTP_BEGIN_ARGS(method, req_args) 	PHP_HTTP_BEGIN_ARGS_EX(HttpHeader, method, 0, req_args)
 #define PHP_HTTP_EMPTY_ARGS(method)				PHP_HTTP_EMPTY_ARGS_EX(HttpHeader, method, 0)
 #define PHP_HTTP_HEADER_ME(method, v)			PHP_ME(HttpHeader, method, PHP_HTTP_ARGS(HttpHeader, method), v)
@@ -39,7 +35,7 @@ PHP_HTTP_BEGIN_ARGS(__construct, 0)
 	PHP_HTTP_ARG_VAL(value, 0)
 PHP_HTTP_END_ARGS;
 
-PHP_HTTP_EMPTY_ARGS(toString);
+PHP_HTTP_EMPTY_ARGS(serialize);
 PHP_HTTP_BEGIN_ARGS(unserialize, 1)
 	PHP_HTTP_ARG_VAL(serialized, 0)
 PHP_HTTP_END_ARGS;
@@ -49,11 +45,18 @@ PHP_HTTP_BEGIN_ARGS(match, 1)
 	PHP_HTTP_ARG_VAL(flags, 0)
 PHP_HTTP_END_ARGS;
 
-zend_function_entry php_http_header_method_entry[] = {
+static zend_class_entry *php_http_header_class_entry;
+
+zend_class_entry *php_http_header_get_class_entry(void)
+{
+	return php_http_header_class_entry;
+}
+
+static zend_function_entry php_http_header_method_entry[] = {
 	PHP_HTTP_HEADER_ME(__construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
-	PHP_HTTP_HEADER_ME(toString, ZEND_ACC_PUBLIC)
-	ZEND_MALIAS(HttpHeader, __toString, toString, PHP_HTTP_ARGS(HttpHeader, toString), ZEND_ACC_PUBLIC)
-	ZEND_MALIAS(HttpHeader, serialize, toString, PHP_HTTP_ARGS(HttpHeader, toString), ZEND_ACC_PUBLIC)
+	PHP_HTTP_HEADER_ME(serialize, ZEND_ACC_PUBLIC)
+	ZEND_MALIAS(HttpHeader, __toString, serialize, PHP_HTTP_ARGS(HttpHeader, serialize), ZEND_ACC_PUBLIC)
+	ZEND_MALIAS(HttpHeader, toString, serialize, PHP_HTTP_ARGS(HttpHeader, serialize), ZEND_ACC_PUBLIC)
 	PHP_HTTP_HEADER_ME(unserialize, ZEND_ACC_PUBLIC)
 	PHP_HTTP_HEADER_ME(match, ZEND_ACC_PUBLIC)
 	EMPTY_FUNCTION_ENTRY
@@ -64,7 +67,7 @@ PHP_METHOD(HttpHeader, __construct)
 	char *name_str = NULL, *value_str = NULL;
 	int name_len = 0, value_len = 0;
 
-	with_error_handling(EH_THROW, php_http_exception_class_entry) {
+	with_error_handling(EH_THROW, php_http_exception_get_class_entry()) {
 		if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s!s!", &name_str, &name_len, &value_str, &value_len)) {
 			if (name_str && name_len) {
 				char *pretty_str = estrndup(name_str, name_len);
@@ -78,7 +81,7 @@ PHP_METHOD(HttpHeader, __construct)
 	} end_error_handling();
 }
 
-PHP_METHOD(HttpHeader, toString)
+PHP_METHOD(HttpHeader, serialize)
 {
 	php_http_buffer_t buf;
 	zval *zname, *zvalue;
@@ -118,7 +121,7 @@ PHP_METHOD(HttpHeader, unserialize)
 				zend_hash_internal_pointer_reset(&ht);
 				switch (zend_hash_get_current_key_ex(&ht, &str, &len, &idx, 0, NULL)) {
 					case HASH_KEY_IS_STRING:
-						zend_update_property_stringl(php_http_header_class_entry, getThis(), ZEND_STRL("name"), str, len TSRMLS_CC);
+						zend_update_property_stringl(php_http_header_class_entry, getThis(), ZEND_STRL("name"), str, len - 1 TSRMLS_CC);
 						break;
 					case HASH_KEY_IS_LONG:
 						zend_update_property_long(php_http_header_class_entry, getThis(), ZEND_STRL("name"), idx TSRMLS_CC);
@@ -149,12 +152,13 @@ PHP_METHOD(HttpHeader, match)
 	}
 
 	zvalue = php_http_ztyp(IS_STRING, zend_read_property(php_http_header_class_entry, getThis(), ZEND_STRL("value"), 0 TSRMLS_CC));
-	RETURN_BOOL(php_http_match(Z_STRVAL_P(zvalue), val_str, flags))
+	RETVAL_BOOL(php_http_match(Z_STRVAL_P(zvalue), val_str, flags));
+	zval_ptr_dtor(&zvalue);
 }
 
 PHP_MINIT_FUNCTION(http_header)
 {
-	PHP_HTTP_REGISTER_CLASS(http, Header, http_header, php_http_object_class_entry, 0);
+	PHP_HTTP_REGISTER_CLASS(http, Header, http_header, php_http_object_get_class_entry(), 0);
 	zend_class_implements(php_http_header_class_entry TSRMLS_CC, 1, zend_ce_serializable);
 	zend_declare_class_constant_long(php_http_header_class_entry, ZEND_STRL("MATCH_LOOSE"), PHP_HTTP_MATCH_LOOSE TSRMLS_CC);
 	zend_declare_class_constant_long(php_http_header_class_entry, ZEND_STRL("MATCH_CASE"), PHP_HTTP_MATCH_CASE TSRMLS_CC);
@@ -166,6 +170,7 @@ PHP_MINIT_FUNCTION(http_header)
 
 	return SUCCESS;
 }
+
 /*
  * Local variables:
  * tab-width: 4