| modification, are permitted provided that the conditions mentioned |
| in the accompanying LICENSE file are met. |
+--------------------------------------------------------------------+
- | Copyright (c) 2004-2011, Michael Wallner <mike@php.net> |
+ | Copyright (c) 2004-2014, Michael Wallner <mike@php.net> |
+--------------------------------------------------------------------+
*/
/* SLEEP */
-PHP_HTTP_API void php_http_sleep(double s)
+void php_http_sleep(double s)
{
#if defined(PHP_WIN32)
Sleep((DWORD) PHP_HTTP_MSEC(s));
result = !strcasecmp(haystack_str, needle_str);
}
} else {
- char *found, *haystack = estrdup(haystack_str), *needle = estrdup(needle_str);
+ const char *found;
+ char *haystack = estrdup(haystack_str), *needle = estrdup(needle_str);
if (flags & PHP_HTTP_MATCH_CASE) {
found = zend_memnstr(haystack, needle, strlen(needle), haystack+strlen(haystack));
}
}
- STR_FREE(haystack);
- STR_FREE(needle);
+ PTR_FREE(haystack);
+ PTR_FREE(needle);
}
return result;
}
-char *php_http_pretty_key(char *key, size_t key_len, zend_bool uctitle, zend_bool xhyphen)
+char *php_http_pretty_key(register char *key, size_t key_len, zend_bool uctitle, zend_bool xhyphen)
{
- size_t i;
+ size_t i = 1;
int wasalpha;
if (key && key_len) {
if ((wasalpha = PHP_HTTP_IS_CTYPE(alpha, key[0]))) {
key[0] = (char) (uctitle ? PHP_HTTP_TO_CTYPE(upper, key[0]) : PHP_HTTP_TO_CTYPE(lower, key[0]));
}
- for (i = 1; i < key_len; i++) {
+ PHP_HTTP_DUFF(key_len,
if (PHP_HTTP_IS_CTYPE(alpha, key[i])) {
key[i] = (char) (((!wasalpha) && uctitle) ? PHP_HTTP_TO_CTYPE(upper, key[i]) : PHP_HTTP_TO_CTYPE(lower, key[i]));
wasalpha = 1;
}
wasalpha = 0;
}
- }
+ ++i;
+ );
}
return key;
}
size_t php_http_boundary(char *buf, size_t buf_len TSRMLS_DC)
{
- return snprintf(buf, buf_len, "%15.15F", PHP_HTTP_G->env.request.time * php_combined_lcg(TSRMLS_C));
+ return snprintf(buf, buf_len, "%15.15F", sapi_get_request_time(TSRMLS_C) * php_combined_lcg(TSRMLS_C));
}
int php_http_select_str(const char *cmp, int argc, ...)
/* ARRAYS */
+unsigned php_http_array_list(HashTable *ht TSRMLS_DC, unsigned argc, ...)
+{
+ HashPosition pos;
+ unsigned argl = 0;
+ va_list argv;
+
+ va_start(argv, argc);
+ for ( zend_hash_internal_pointer_reset_ex(ht, &pos);
+ SUCCESS == zend_hash_has_more_elements_ex(ht, &pos) && (argl < argc);
+ zend_hash_move_forward_ex(ht, &pos))
+ {
+ zval **data, ***argp = (zval ***) va_arg(argv, zval ***);
+
+ if (SUCCESS == zend_hash_get_current_data_ex(ht, (void *) &data, &pos)) {
+ *argp = data;
+ ++argl;
+ }
+ }
+ va_end(argv);
+
+ return argl;
+}
+
+void php_http_array_copy_strings(void *zpp)
+{
+ zval **zvpp = ((zval **) zpp);
+
+ *zvpp = php_http_zsep(1, IS_STRING, *zvpp);
+}
+
int php_http_array_apply_append_func(void *pDest TSRMLS_DC, int num_args, va_list args, zend_hash_key *hash_key)
{
int flags;
char *key = NULL;
HashTable *dst;
- zval **data = NULL, **value = (zval **) pDest;
+ zval **data = NULL, *value = *((zval **) pDest);
dst = va_arg(args, HashTable *);
flags = va_arg(args, int);
if ((flags & ARRAY_JOIN_PRETTIFY) && hash_key->nKeyLength) {
key = php_http_pretty_key(estrndup(hash_key->arKey, hash_key->nKeyLength - 1), hash_key->nKeyLength - 1, 1, 1);
zend_hash_find(dst, key, hash_key->nKeyLength, (void *) &data);
- } else {
+ } else if (hash_key->nKeyLength) {
zend_hash_quick_find(dst, hash_key->arKey, hash_key->nKeyLength, hash_key->h, (void *) &data);
+ } else {
+ zend_hash_index_find(dst, hash_key->h, (void *) &data);
+ }
+
+ if (flags & ARRAY_JOIN_STRINGIFY) {
+ value = php_http_zsep(1, IS_STRING, value);
+ } else {
+ Z_ADDREF_P(value);
}
- Z_ADDREF_P(*value);
if (data) {
if (Z_TYPE_PP(data) != IS_ARRAY) {
convert_to_array(*data);
}
- add_next_index_zval(*data, *value);
+ add_next_index_zval(*data, value);
} else if (key) {
- zend_symtable_update(dst, key, hash_key->nKeyLength, value, sizeof(zval *), NULL);
+ zend_symtable_update(dst, key, hash_key->nKeyLength, &value, sizeof(zval *), NULL);
+ } else if (hash_key->nKeyLength) {
+ zend_hash_quick_add(dst, hash_key->arKey, hash_key->nKeyLength, hash_key->h, &value, sizeof(zval *), NULL);
} else {
- zend_hash_quick_add(dst, hash_key->arKey, hash_key->nKeyLength, hash_key->h, value, sizeof(zval *), NULL);
+ zend_hash_index_update(dst, hash_key->h, (void *) &value, sizeof(zval *), NULL);
}
if (key) {
int flags;
char *key = NULL;
HashTable *dst;
- zval **value = (zval **) pDest;
+ zval *value = *((zval **) pDest);
dst = va_arg(args, HashTable *);
flags = va_arg(args, int);
if ((!(flags & ARRAY_JOIN_STRONLY)) || hash_key->nKeyLength) {
- Z_ADDREF_P(*value);
+ if (flags & ARRAY_JOIN_STRINGIFY) {
+ value = php_http_zsep(1, IS_STRING, value);
+ } else {
+ Z_ADDREF_P(value);
+ }
+
if ((flags & ARRAY_JOIN_PRETTIFY) && hash_key->nKeyLength) {
key = php_http_pretty_key(estrndup(hash_key->arKey, hash_key->nKeyLength - 1), hash_key->nKeyLength - 1, 1, 1);
- zend_hash_update(dst, key, hash_key->nKeyLength, (void *) value, sizeof(zval *), NULL);
+ zend_hash_update(dst, key, hash_key->nKeyLength, (void *) &value, sizeof(zval *), NULL);
efree(key);
+ } else if (hash_key->nKeyLength) {
+ zend_hash_quick_update(dst, hash_key->arKey, hash_key->nKeyLength, hash_key->h, (void *) &value, sizeof(zval *), NULL);
} else {
- zend_hash_quick_update(dst, hash_key->arKey, hash_key->nKeyLength, hash_key->h, (void *) value, sizeof(zval *), NULL);
+ zend_hash_index_update(dst, hash_key->h, (void *) &value, sizeof(zval *), NULL);
}
}
/* PASS CALLBACK */
-PHP_HTTP_API size_t php_http_pass_wrapper(php_http_pass_callback_arg_t *cb, const char *str, size_t len)
-{
- TSRMLS_FETCH();
- return cb->cb_zts(cb->cb_arg, str, len TSRMLS_CC);
-}
-
-PHP_HTTP_API size_t php_http_pass_fcall_callback(void *cb_arg, const char *str, size_t len)
+size_t php_http_pass_fcall_callback(void *cb_arg, const char *str, size_t len)
{
php_http_pass_fcall_arg_t *fcd = cb_arg;
zval *zdata;
return len;
}
-/* ERROR */
-
-static inline int scope_error_handling(long type TSRMLS_DC)
-{
- if ((type == E_THROW) || (EG(error_handling) == EH_THROW)) {
- return EH_THROW;
- }
-
- if (EG(This) && instanceof_function(Z_OBJCE_P(EG(This)), php_http_object_class_entry TSRMLS_CC)) {
- return php_http_object_get_error_handling(EG(This) TSRMLS_CC);
- }
-
- return EH_NORMAL;
-}
-
-void php_http_error(long type TSRMLS_DC, long code, const char *format, ...)
-{
- va_list args;
-
- va_start(args, format);
- switch (scope_error_handling(type TSRMLS_CC)) {
- case EH_THROW: {
- char *message;
- zend_class_entry *ce = php_http_exception_class_entry;
- if (0&& EG(exception_class) && instanceof_function(EG(exception_class), php_http_exception_class_entry TSRMLS_CC)) {
- ce = EG(exception_class);
- }
-
- vspprintf(&message, 0, format, args);
- zend_throw_exception(ce, message, code TSRMLS_CC);
- efree(message);
- break;
- }
- case EH_NORMAL:
- php_verror(NULL, "", type, format, args TSRMLS_CC);
- break;
- case EH_SUPPRESS:
- break;
- }
- va_end(args);
-}
+/* ZEND */
/*
* Local variables:
projects / m6w6 / ext-http / blobdiff