X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=php_http_misc.h;h=2ee38e1f07e2e4eb18ea529eef9f95737f7aae6b;hb=b9b940d68c0569107bf1afefeca2a1e5f1efab04;hp=70dc090ab62aaf6f5e8b96d15f632b0d41da1748;hpb=4b368d86db1aae978d41a8ec0350f3ba340739d8;p=m6w6%2Fext-http

diff --git a/php_http_misc.h b/php_http_misc.h
index 70dc090..2ee38e1 100644
--- a/php_http_misc.h
+++ b/php_http_misc.h
@@ -137,10 +137,10 @@ static inline const char *php_http_locate_bin_eol(const char *bin, size_t len, i
 {
 	const char *eol;
 
-	for (eol = bin; eol - bin < len; ++eol) {
+	for (eol = bin; eol - bin <= len; ++eol) {
 		if (*eol == '\r' || *eol == '\n') {
 			if (eol_len) {
-				*eol_len = eol ? ((eol[0] == '\r' && eol[1] == '\n') ? 2 : 1) : 0;
+				*eol_len = ((eol[0] == '\r' && eol[1] == '\n') ? 2 : 1);
 			}
 			return eol;
 		}
@@ -151,6 +151,21 @@ static inline const char *php_http_locate_bin_eol(const char *bin, size_t len, i
 
 /* ZEND */
 
+#if PHP_VERSION_ID < 50400
+#	define object_properties_init(o, ce) zend_hash_copy(((zend_object *) o)->properties, &(ce->default_properties), (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval*))
+#	define PHP_HTTP_ZEND_LITERAL_DC 
+#	define PHP_HTTP_ZEND_LITERAL_CC
+#	define PHP_HTTP_ZEND_LITERAL_CCN
+#	define ZVAL_COPY_VALUE(zv, arr) do { \
+		(zv)->value = (arr)->value; \
+		Z_TYPE_P(zv) = Z_TYPE_P(arr); \
+	} while (0)
+#else
+#	define PHP_HTTP_ZEND_LITERAL_DC , const zend_literal *literal_key
+#	define PHP_HTTP_ZEND_LITERAL_CC , (literal_key)
+#	define PHP_HTTP_ZEND_LITERAL_CCN , NULL
+#endif
+
 #define INIT_PZVAL_ARRAY(zv, ht) \
 	{ \
 		INIT_PZVAL((zv)); \
@@ -387,6 +402,8 @@ static inline STATUS php_http_ini_entry(const char *name_str, size_t name_len, c
 
 /* ARRAYS */
 
+PHP_HTTP_API unsigned php_http_array_list(zval *hash TSRMLS_DC, unsigned argc, ...);
+
 typedef struct php_http_array_hashkey {
 	char *str;
 	uint len;