projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
- SPL doesn't install its headers
[m6w6/ext-http]
/
http_functions.c
diff --git
a/http_functions.c
b/http_functions.c
index 7d82438ef6e059f52465c1343dac139d46545ca0..3ec05777fc273bbdacb68533fa97545a2403547c 100644
(file)
--- a/
http_functions.c
+++ b/
http_functions.c
@@
-137,9
+137,10
@@
PHP_FUNCTION(http_build_uri)
} \
\
if (rs_array) { \
} \
\
if (rs_array) { \
+ HashPosition pos; \
zval **value; \
\
zval **value; \
\
- FOREACH_VAL(supported, value) { \
+ FOREACH_VAL(
pos,
supported, value) { \
convert_to_string_ex(value); \
add_assoc_double(rs_array, Z_STRVAL_PP(value), 1.0); \
} \
convert_to_string_ex(value); \
add_assoc_double(rs_array, Z_STRVAL_PP(value), 1.0); \
} \
@@
-438,6
+439,8
@@
PHP_FUNCTION(http_cache_last_modified)
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &last_modified) != SUCCESS) {
RETURN_FALSE;
}
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &last_modified) != SUCCESS) {
RETURN_FALSE;
}
+
+ HTTP_CHECK_HEADERS_SENT(RETURN_FALSE);
t = (long) time(NULL);
t = (long) time(NULL);
@@
-485,6
+488,8
@@
PHP_FUNCTION(http_cache_etag)
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &etag, &etag_len) != SUCCESS) {
RETURN_FALSE;
}
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &etag, &etag_len) != SUCCESS) {
RETURN_FALSE;
}
+
+ HTTP_CHECK_HEADERS_SENT(RETURN_FALSE);
RETURN_SUCCESS(http_cache_etag(etag, etag_len, HTTP_DEFAULT_CACHECONTROL, lenof(HTTP_DEFAULT_CACHECONTROL)));
}
RETURN_SUCCESS(http_cache_etag(etag, etag_len, HTTP_DEFAULT_CACHECONTROL, lenof(HTTP_DEFAULT_CACHECONTROL)));
}
@@
-1391,7
+1396,7
@@
PHP_FUNCTION(http_build_query)
}
formstr = phpstr_new();
}
formstr = phpstr_new();
- if (SUCCESS != http_urlencode_hash_recursive(HASH_OF(formdata), formstr, arg_sep, prefix, prefix_len)) {
+ if (SUCCESS != http_urlencode_hash_recursive(HASH_OF(formdata), formstr, arg_sep,
arg_sep_len,
prefix, prefix_len)) {
phpstr_free(&formstr);
RETURN_FALSE;
}
phpstr_free(&formstr);
RETURN_FALSE;
}