X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_misc.c;h=4adab8112923c0dd2569b97f02de8c2fe2aa7310;hp=4115042312b1f328f1032b1a1bfec218880dc40c;hb=f00dec5b0217c81cf9d71d96103106fdaf2ab310;hpb=7ba90c6d9d6843549fb9227d1a7aa05033e60772 diff --git a/php_http_misc.c b/php_http_misc.c index 4115042..4adab81 100644 --- a/php_http_misc.c +++ b/php_http_misc.c @@ -6,7 +6,7 @@ | modification, are permitted provided that the conditions mentioned | | in the accompanying LICENSE file are met. | +--------------------------------------------------------------------+ - | Copyright (c) 2004-2011, Michael Wallner | + | Copyright (c) 2004-2014, Michael Wallner | +--------------------------------------------------------------------+ */ @@ -17,7 +17,7 @@ /* 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)); @@ -61,7 +61,8 @@ int php_http_match(const char *haystack_str, const char *needle_str, int flags) 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)); @@ -79,23 +80,23 @@ int php_http_match(const char *haystack_str, const char *needle_str, int flags) } } - 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; @@ -105,15 +106,16 @@ char *php_http_pretty_key(char *key, size_t key_len, zend_bool uctitle, zend_boo } wasalpha = 0; } - } + ++i; + ); } return key; } -size_t php_http_boundary(char *buf, size_t buf_len TSRMLS_DC) +size_t php_http_boundary(char *buf, size_t buf_len) { - 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() * php_combined_lcg()); } int php_http_select_str(const char *cmp, int argc, ...) @@ -142,58 +144,65 @@ int php_http_select_str(const char *cmp, int argc, ...) /* ARRAYS */ -PHP_HTTP_API unsigned php_http_array_list(zval *hash TSRMLS_DC, unsigned argc, ...) +unsigned php_http_array_list(HashTable *ht, unsigned argc, ...) { - HashTable *ht = HASH_OF(hash); - HashPosition pos; unsigned argl = 0; va_list argv; + zval *data; va_start(argv, argc); - for ( zend_hash_internal_pointer_reset_ex(ht, &pos); - 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; - } - } + ZEND_HASH_FOREACH_VAL(ht, data) { + zval **argp = (zval **) va_arg(argv, zval **); + *argp = data; + ++argl; + } ZEND_HASH_FOREACH_END(); va_end(argv); return argl; } -int php_http_array_apply_append_func(void *pDest TSRMLS_DC, int num_args, va_list args, zend_hash_key *hash_key) +void php_http_array_copy_strings(zval *zp) +{ + Z_TRY_ADDREF_P(zp); + convert_to_string_ex(zp); +} + +int php_http_array_apply_append_func(zval *value, 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; dst = va_arg(args, HashTable *); flags = va_arg(args, int); - if ((!(flags & ARRAY_JOIN_STRONLY)) || hash_key->nKeyLength) { - 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); + if ((!(flags & ARRAY_JOIN_STRONLY)) || hash_key->key) { + if ((flags & ARRAY_JOIN_PRETTIFY) && hash_key->key) { + key = php_http_pretty_key(estrndup(hash_key->key->val, hash_key->key->len), hash_key->key->len, 1, 1); + data = zend_hash_str_find(dst, key, hash_key->key->len); + } else if (hash_key->key) { + data = zend_hash_find(dst, hash_key->key); } else { - zend_hash_quick_find(dst, hash_key->arKey, hash_key->nKeyLength, hash_key->h, (void *) &data); + data = zend_hash_index_find(dst, hash_key->h); + } + + if (flags & ARRAY_JOIN_STRINGIFY) { + convert_to_string_ex(value); } + Z_ADDREF_P(value); - Z_ADDREF_P(*value); if (data) { - if (Z_TYPE_PP(data) != IS_ARRAY) { - convert_to_array(*data); + if (Z_TYPE_P(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_hash_str_update(dst, key, hash_key->key->len, value); + } else if (hash_key->key) { + zend_hash_update(dst, hash_key->key, value); } 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, value); } if (key) { @@ -204,24 +213,30 @@ int php_http_array_apply_append_func(void *pDest TSRMLS_DC, int num_args, va_lis return ZEND_HASH_APPLY_KEEP; } -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_merge_func(zval *value, int num_args, va_list args, zend_hash_key *hash_key) { int flags; char *key = NULL; HashTable *dst; - 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_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); + if ((!(flags & ARRAY_JOIN_STRONLY)) || hash_key->key) { + if (flags & ARRAY_JOIN_STRINGIFY) { + convert_to_string_ex(value); + } + + Z_TRY_ADDREF_P(value); + + if ((flags & ARRAY_JOIN_PRETTIFY) && hash_key->key) { + key = php_http_pretty_key(estrndup(hash_key->key->val, hash_key->key->len), hash_key->key->len, 1, 1); + zend_hash_str_update(dst, key, hash_key->key->len, value); efree(key); + } else if (hash_key->key) { + zend_hash_update(dst, hash_key->key, value); } 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, value); } } @@ -230,71 +245,22 @@ int php_http_array_apply_merge_func(void *pDest TSRMLS_DC, int num_args, va_list /* 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; - TSRMLS_FETCH_FROM_CTX(fcd->ts); + zval zdata; - MAKE_STD_ZVAL(zdata); - ZVAL_STRINGL(zdata, str, len, 1); - if (SUCCESS == zend_fcall_info_argn(&fcd->fci TSRMLS_CC, 2, &fcd->fcz, &zdata)) { - zend_fcall_info_call(&fcd->fci, &fcd->fcc, NULL, NULL TSRMLS_CC); + ZVAL_STRINGL(&zdata, str, len); + if (SUCCESS == zend_fcall_info_argn(&fcd->fci, 2, &fcd->fcz, &zdata)) { + zend_fcall_info_call(&fcd->fci, &fcd->fcc, NULL, NULL); zend_fcall_info_args_clear(&fcd->fci, 0); } zval_ptr_dtor(&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_get_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_get_class_entry(); - - /* FIXME wat? */ - if (0&& EG(exception_class) && instanceof_function(EG(exception_class), ce 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: