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

diff --git a/php_http_misc.h b/php_http_misc.h
index 16a7be8..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)); \
@@ -175,7 +190,8 @@ static inline zval *php_http_ztyp(int type, zval *z)
 	return z;
 }
 
-static inline zval *php_http_zsep(zend_bool add_ref, int type, zval *z) {
+static inline zval *php_http_zsep(zend_bool add_ref, int type, zval *z)
+{
 	if (add_ref) {
 		Z_ADDREF_P(z);
 	}
@@ -195,6 +211,22 @@ static inline zval *php_http_zsep(zend_bool add_ref, int type, zval *z) {
 	return z;
 }
 
+static inline STATUS php_http_ini_entry(const char *name_str, size_t name_len, const char **value_str, size_t *value_len, zend_bool orig TSRMLS_DC)
+{
+	zend_ini_entry *ini_entry;
+
+	if (SUCCESS == zend_hash_find(EG(ini_directives), name_str, name_len + 1, (void *) &ini_entry)) {
+		if (orig && ini_entry->modified) {
+			*value_str = ini_entry->orig_value;
+			*value_len = (size_t) ini_entry->orig_value_length;
+		} else {
+			*value_str = ini_entry->value;
+			*value_len = (size_t) ini_entry->value_length;
+		}
+		return SUCCESS;
+	}
+	return FAILURE;
+}
 
 /* return bool (v == SUCCESS) */
 #define RETVAL_SUCCESS(v) RETVAL_BOOL(SUCCESS == (v))
@@ -370,6 +402,8 @@ static inline zval *php_http_zsep(zend_bool add_ref, int type, zval *z) {
 
 /* 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;
@@ -379,6 +413,20 @@ typedef struct php_http_array_hashkey {
 } php_http_array_hashkey_t;
 #define php_http_array_hashkey_init(dup) {NULL, 0, 0, (dup), 0}
 
+static inline void php_http_array_hashkey_stringify(php_http_array_hashkey_t *key)
+{
+	if (key->type != HASH_KEY_IS_STRING) {
+		key->len = spprintf(&key->str, 0, "%lu", key->num) + 1;
+	}
+}
+
+static inline void php_http_array_hashkey_stringfree(php_http_array_hashkey_t *key)
+{
+	if (key->type != HASH_KEY_IS_STRING || key->dup) {
+		STR_FREE(key->str);
+	}
+}
+
 #define FOREACH_VAL(pos, array, val) FOREACH_HASH_VAL(pos, HASH_OF(array), val)
 #define FOREACH_HASH_VAL(pos, hash, val) \
 	for (	zend_hash_internal_pointer_reset_ex(hash, &pos); \