projects
/
m6w6
/
ext-http
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
|
github
raw
|
patch
|
inline
| side by side (parent:
26a10b8
)
* use the separator where applicable
author
Michael Wallner
<mike@php.net>
Sat, 21 May 2011 15:35:41 +0000
(15:35 +0000)
committer
Michael Wallner
<mike@php.net>
Sat, 21 May 2011 15:35:41 +0000
(15:35 +0000)
php_http_message_body.c
patch
|
blob
|
history
diff --git
a/php_http_message_body.c
b/php_http_message_body.c
index 783e76d42a3580ce4283f505a3331d6510ea0d99..f80cb460e9124d2638d4285cdc3b57990507b37c 100644
(file)
--- a/
php_http_message_body.c
+++ b/
php_http_message_body.c
@@
-93,7
+93,7
@@
PHP_HTTP_API void php_http_message_body_free(php_http_message_body_t **body)
}
}
}
}
-PHP_HTTP_API php_stream_statbuf *php_http_message_body_stat(php_http_message_body_t *body)
+PHP_HTTP_API
const
php_stream_statbuf *php_http_message_body_stat(php_http_message_body_t *body)
{
TSRMLS_FETCH_FROM_CTX(body->ts);
php_stream_stat(php_http_message_body_stream(body), &body->ssb);
{
TSRMLS_FETCH_FROM_CTX(body->ts);
php_stream_stat(php_http_message_body_stream(body), &body->ssb);
@@
-159,6
+159,7
@@
PHP_HTTP_API void php_http_message_body_to_callback(php_http_message_body_t *bod
{
TSRMLS_FETCH_FROM_CTX(body->ts);
php_stream *s = php_http_message_body_stream(body);
{
TSRMLS_FETCH_FROM_CTX(body->ts);
php_stream *s = php_http_message_body_stream(body);
+ char *buf = emalloc(0x1000);
php_stream_seek(s, offset, SEEK_SET);
php_stream_seek(s, offset, SEEK_SET);
@@
-166,8
+167,7
@@
PHP_HTTP_API void php_http_message_body_to_callback(php_http_message_body_t *bod
forlen = -1;
}
while (!php_stream_eof(s)) {
forlen = -1;
}
while (!php_stream_eof(s)) {
- char buf[0x1000];
- size_t read = php_stream_read(s, buf, MIN(forlen, sizeof(buf)));
+ size_t read = php_stream_read(s, buf, MIN(forlen, 0x1000));
if (read) {
cb(cb_arg, buf, read);
if (read) {
cb(cb_arg, buf, read);
@@
-181,6
+181,7
@@
PHP_HTTP_API void php_http_message_body_to_callback(php_http_message_body_t *bod
break;
}
}
break;
}
}
+ efree(buf);
}
PHP_HTTP_API size_t php_http_message_body_append(php_http_message_body_t *body, const char *buf, size_t len)
}
PHP_HTTP_API size_t php_http_message_body_append(php_http_message_body_t *body, const char *buf, size_t len)
@@
-327,7
+328,7
@@
static STATUS add_recursive_fields(php_http_message_body_t *body, const char *na
--HASH_OF(value)->nApplyCount;
}
} else {
--HASH_OF(value)->nApplyCount;
}
} else {
- zval *cpy = php_http_z
se
p(IS_STRING, value);
+ zval *cpy = php_http_z
ty
p(IS_STRING, value);
php_http_message_body_add_field(body, name, Z_STRVAL_P(cpy), Z_STRLEN_P(cpy));
zval_ptr_dtor(&cpy);
}
php_http_message_body_add_field(body, name, Z_STRVAL_P(cpy), Z_STRLEN_P(cpy));
zval_ptr_dtor(&cpy);
}
@@
-344,7
+345,7
@@
static STATUS add_recursive_files(php_http_message_body_t *body, const char *nam
&& (SUCCESS == zend_hash_find(HASH_OF(value), ZEND_STRS("file"), (void *) &zfile))
&& (SUCCESS == zend_hash_find(HASH_OF(value), ZEND_STRS("type"), (void *) &ztype))
) {
&& (SUCCESS == zend_hash_find(HASH_OF(value), ZEND_STRS("file"), (void *) &zfile))
&& (SUCCESS == zend_hash_find(HASH_OF(value), ZEND_STRS("type"), (void *) &ztype))
) {
- zval *zfc = php_http_z
sep(IS_STRING, *zfile), *znc = php_http_zsep(IS_STRING, *zname), *ztc = php_http_zse
p(IS_STRING, *ztype);
+ zval *zfc = php_http_z
typ(IS_STRING, *zfile), *znc = php_http_ztyp(IS_STRING, *zname), *ztc = php_http_zty
p(IS_STRING, *ztype);
char *str = format_key(HASH_KEY_IS_STRING, Z_STRVAL_P(znc), 0, name);
STATUS ret = php_http_message_body_add_file(body, str, Z_STRVAL_P(zfc), Z_STRVAL_P(ztc));
char *str = format_key(HASH_KEY_IS_STRING, Z_STRVAL_P(znc), 0, name);
STATUS ret = php_http_message_body_add_file(body, str, Z_STRVAL_P(zfc), Z_STRVAL_P(ztc));
@@
-492,7
+493,7
@@
PHP_METHOD(HttpMessageBody, __construct)
zval *zstream = NULL;
php_stream *stream;
zval *zstream = NULL;
php_stream *stream;
- with_error_handling(EH_THROW,
PHP_HTTP_EX_CE(runtime)
) {
+ with_error_handling(EH_THROW,
php_http_exception_class_entry
) {
if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|r!", &zstream)) {
if (zstream) {
php_stream_from_zval(stream, &zstream);
if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|r!", &zstream)) {
if (zstream) {
php_stream_from_zval(stream, &zstream);