/* CR LF */
#define PHP_HTTP_CRLF "\r\n"
-/* default cache control */
-#define PHP_HTTP_DEFAULT_CACHECONTROL "private, must-revalidate, max-age=0"
-
/* max URL length */
#define PHP_HTTP_URL_MAXLEN 4096
-/* max request method length */
-#define PHP_HTTP_REQUEST_METHOD_MAXLEN 31
-
/* def URL arg separator */
#define PHP_HTTP_URL_ARGSEP "&"
/* send buffer size */
#define PHP_HTTP_SENDBUF_SIZE 40960
-/* CURL buffer size */
-#define PHP_HTTP_CURLBUF_SIZE 16384
-
/* SLEEP */
#define PHP_HTTP_DIFFSEC (0.001)
#define PHP_HTTP_MATCH_FULL 0x20
#define PHP_HTTP_MATCH_STRICT (PHP_HTTP_MATCH_CASE|PHP_HTTP_MATCH_FULL)
-extern int php_http_match(const char *haystack, const char *needle, int flags);
-extern char *php_http_pretty_key(char *key, size_t key_len, zend_bool uctitle, zend_bool xhyphen);
-extern size_t php_http_boundary(char *buf, size_t len TSRMLS_DC);
-extern int php_http_select_str(const char *cmp, int argc, ...);
+int php_http_match(const char *haystack, const char *needle, int flags);
+char *php_http_pretty_key(char *key, size_t key_len, zend_bool uctitle, zend_bool xhyphen);
+size_t php_http_boundary(char *buf, size_t len TSRMLS_DC);
+int php_http_select_str(const char *cmp, int argc, ...);
static inline const char *php_http_locate_str(const char *h, size_t h_len, const char *n, size_t n_len)
{
return NULL;
}
-static inline const char *php_http_locate_body(const char *message)
-{
- const char *body = NULL, *msg = message;
-
- while (*msg) {
- if (*msg == '\n') {
- if (*(msg+1) == '\n') {
- body = msg + 2;
- break;
- } else if (*(msg+1) == '\r' && *(msg+2) == '\n') {
- body = msg + 3;
- break;
- }
- }
- ++msg;
- }
- return body;
-}
-
static inline const char *php_http_locate_eol(const char *line, int *eol_len)
{
const char *eol = strpbrk(line, "\r\n");
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;
}
/* 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)); \
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);
}
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;
+}
+
+STATUS php_http_method_call(zval *object, const char *method_str, size_t method_len, int argc, zval **argv[], zval **retval_ptr TSRMLS_DC);
/* return bool (v == SUCCESS) */
#define RETVAL_SUCCESS(v) RETVAL_BOOL(SUCCESS == (v))
INIT_NS_CLASS_ENTRY(ce, #ns, #classname, php_ ##name## _method_entry); \
php_ ##name## _class_entry = zend_register_internal_class_ex(&ce, parent, NULL TSRMLS_CC); \
php_ ##name## _class_entry->ce_flags |= flags; \
+ php_http_register_class(php_ ##name## _get_class_entry); \
}
#define PHP_HTTP_REGISTER_INTERFACE(ns, ifacename, name, flags) \
INIT_NS_CLASS_ENTRY(ce, #ns, #ifacename, php_ ##name## _method_entry); \
php_ ##name## _class_entry = zend_register_internal_interface(&ce TSRMLS_CC); \
php_ ##name## _class_entry->ce_flags |= flags; \
+ php_http_register_class(php_ ##name## _get_class_entry); \
}
#define PHP_HTTP_REGISTER_EXCEPTION(classname, cename, parent) \
cename = zend_register_internal_class_ex(&ce, parent, NULL TSRMLS_CC); \
}
-#define ACC_PROP_PRIVATE(ce, flags) ((flags & ZEND_ACC_PRIVATE) && (EG(scope) && ce == EG(scope))
-#define ACC_PROP_PROTECTED(ce, flags) ((flags & ZEND_ACC_PROTECTED) && (zend_check_protected(ce, EG(scope))))
-#define ACC_PROP_PUBLIC(flags) (flags & ZEND_ACC_PUBLIC)
-#define ACC_PROP(ce, flags) (ACC_PROP_PUBLIC(flags) || ACC_PROP_PRIVATE(ce, flags) || ACC_PROP_PROTECTED(ce, flags))
-
-#ifdef PHP_HTTP_HAVE_CURL
-# define PHP_HTTP_DECLARE_ARG_PASS_INFO() \
- ZEND_BEGIN_ARG_INFO(http_arg_pass_ref_2, 0) \
- ZEND_ARG_PASS_INFO(0) \
- ZEND_ARG_PASS_INFO(1) \
- ZEND_END_ARG_INFO(); \
- \
- ZEND_BEGIN_ARG_INFO(http_arg_pass_ref_3, 0) \
- ZEND_ARG_PASS_INFO(0) \
- ZEND_ARG_PASS_INFO(0) \
- ZEND_ARG_PASS_INFO(1) \
- ZEND_END_ARG_INFO(); \
- \
- ZEND_BEGIN_ARG_INFO(http_arg_pass_ref_4, 0) \
- ZEND_ARG_PASS_INFO(0) \
- ZEND_ARG_PASS_INFO(0) \
- ZEND_ARG_PASS_INFO(0) \
- ZEND_ARG_PASS_INFO(1) \
- ZEND_END_ARG_INFO(); \
- \
- ZEND_BEGIN_ARG_INFO(http_arg_pass_ref_5, 0) \
- ZEND_ARG_PASS_INFO(0) \
- ZEND_ARG_PASS_INFO(0) \
- ZEND_ARG_PASS_INFO(0) \
- ZEND_ARG_PASS_INFO(0) \
- ZEND_ARG_PASS_INFO(1) \
- ZEND_END_ARG_INFO();
-
-#else
-# define PHP_HTTP_DECLARE_ARG_PASS_INFO() \
- ZEND_BEGIN_ARG_INFO(http_arg_pass_ref_2, 0) \
- ZEND_ARG_PASS_INFO(0) \
- ZEND_ARG_PASS_INFO(1) \
- ZEND_END_ARG_INFO(); \
-\
- ZEND_BEGIN_ARG_INFO(http_arg_pass_ref_3, 0) \
- ZEND_ARG_PASS_INFO(0) \
- ZEND_ARG_PASS_INFO(0) \
- ZEND_ARG_PASS_INFO(1) \
- ZEND_END_ARG_INFO(); \
-\
- ZEND_BEGIN_ARG_INFO(http_arg_pass_ref_4, 0) \
- ZEND_ARG_PASS_INFO(0) \
- ZEND_ARG_PASS_INFO(0) \
- ZEND_ARG_PASS_INFO(0) \
- ZEND_ARG_PASS_INFO(1) \
- ZEND_END_ARG_INFO();
-#endif /* PHP_HTTP_HAVE_CURL */
-
/* ARRAYS */
+PHP_HTTP_API unsigned php_http_array_list(HashTable *ht TSRMLS_DC, unsigned argc, ...);
typedef struct php_http_array_hashkey {
char *str;
} 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); \
#define ARRAY_JOIN_PRETTIFY 2
#define array_join(src, dst, append, flags) zend_hash_apply_with_arguments(src TSRMLS_CC, (append)?php_http_array_apply_append_func:php_http_array_apply_merge_func, 2, dst, (int)flags)
-extern int php_http_array_apply_append_func(void *pDest TSRMLS_DC, int num_args, va_list args, zend_hash_key *hash_key);
-extern int php_http_array_apply_merge_func(void *pDest TSRMLS_DC, int num_args, va_list args, zend_hash_key *hash_key);
+int php_http_array_apply_append_func(void *pDest TSRMLS_DC, int num_args, va_list args, zend_hash_key *hash_key);
+int php_http_array_apply_merge_func(void *pDest TSRMLS_DC, int num_args, va_list args, zend_hash_key *hash_key);
/* PASS CALLBACK */
typedef size_t (*php_http_pass_callback_t)(void *cb_arg, const char *str, size_t len);
typedef size_t (*php_http_pass_php_http_buffer_callback_t)(void *cb_arg, php_http_buffer_t *str);
-
-typedef struct php_http_pass_callback_arg {
- size_t (*cb_zts)(void *cb_arg, const char *str, size_t len TSRMLS_DC);
- void *cb_arg;
-} php_http_pass_callback_arg_t;
-
-PHP_HTTP_API size_t php_http_pass_wrapper(php_http_pass_callback_arg_t *cb_arg, const char *str, size_t len);
+typedef size_t (*php_http_pass_format_callback_t)(void *cb_arg, const char *fmt, ...);
typedef struct php_http_pass_fcall_arg {
zval *fcz;
projects / m6w6 / ext-http / blobdiff