\
if (rs_array) { \
HashPosition pos; \
- zval **value; \
+ zval **value_ptr; \
\
- FOREACH_VAL(pos, supported, value) { \
- convert_to_string_ex(value); \
- add_assoc_double(rs_array, Z_STRVAL_PP(value), 1.0); \
+ FOREACH_VAL(pos, supported, value_ptr) { \
+ zval *value = http_zsep(IS_STRING, *value_ptr); \
+ add_assoc_double(rs_array, Z_STRVAL_P(value), 1.0); \
+ zval_ptr_dtor(&value); \
} \
} \
} \
Send HTTP status code. */
PHP_FUNCTION(http_send_status)
{
- int status = 0;
+ long status = 0;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &status) != SUCCESS) {
RETURN_FALSE;
if (allowed_extras_array) {
allowed_extras = ecalloc(zend_hash_num_elements(Z_ARRVAL_P(allowed_extras_array)) + 1, sizeof(char *));
FOREACH_VAL(pos, allowed_extras_array, entry) {
- ZVAL_ADDREF(*entry);
- convert_to_string_ex(entry);
- allowed_extras[i++] = estrndup(Z_STRVAL_PP(entry), Z_STRLEN_PP(entry));
- zval_ptr_dtor(entry);
+ zval *data = http_zsep(IS_STRING, *entry);
+ allowed_extras[i++] = estrndup(Z_STRVAL_P(data), Z_STRLEN_P(data));
+ zval_ptr_dtor(&data);
}
}
RETURN_FALSE;
}
- params = ecalloc(1, sizeof(zval));
+ MAKE_STD_ZVAL(params);
array_init(params);
if (SUCCESS != http_parse_params(param, flags, Z_ARRVAL_P(params))) {
- zval_dtor(params);
- FREE_ZVAL(params);
+ zval_ptr_dtor(¶ms);
RETURN_FALSE;
}
+
object_init(return_value);
add_property_zval(return_value, "params", params);
+#ifdef ZEND_ENGINE_2
+ zval_ptr_dtor(¶ms);
+#endif
}
/* }}} */
zval **bodyonly; \
\
/* check if only the body should be returned */ \
- if (options && (SUCCESS == zend_hash_find(Z_ARRVAL_P(options), "bodyonly", sizeof("bodyonly"), (void *) &bodyonly)) && zval_is_true(*bodyonly)) { \
+ if (options && (SUCCESS == zend_hash_find(Z_ARRVAL_P(options), "bodyonly", sizeof("bodyonly"), (void *) &bodyonly)) && i_zend_is_true(*bodyonly)) { \
http_message *msg = http_message_parse(PHPSTR_VAL(&request.conv.response), PHPSTR_LEN(&request.conv.response)); \
\
if (msg) { \