projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
checking if we really need this
[m6w6/ext-http]
/
src
/
php_http_encoding.c
diff --git
a/src/php_http_encoding.c
b/src/php_http_encoding.c
index 7fbe7c7a51d49859cbcce173de3bea6083963f91..83d17947790c106abfc8702f3ac975d8aa5b15ba 100644
(file)
--- a/
src/php_http_encoding.c
+++ b/
src/php_http_encoding.c
@@
-64,7
+64,7
@@
const char *php_http_encoding_dechunk(const char *encoded, size_t encoded_len, c
/* reached the end */
if (!chunk_len) {
/* move over '0' chunked encoding terminator and any new lines */
/* reached the end */
if (!chunk_len) {
/* move over '0' chunked encoding terminator and any new lines */
-
do
{
+
while(1)
{
switch (*e_ptr) {
case '0':
case '\r':
switch (*e_ptr) {
case '0':
case '\r':
@@
-72,7
+72,8
@@
const char *php_http_encoding_dechunk(const char *encoded, size_t encoded_len, c
++e_ptr;
continue;
}
++e_ptr;
continue;
}
- } while (0);
+ break;
+ }
break;
}
break;
}
@@
-222,7
+223,7
@@
retry_raw_inflate:
}
inflateEnd(&Z);
}
inflateEnd(&Z);
- if (decoded_len && *decoded) {
+ if (
*
decoded_len && *decoded) {
efree(*decoded);
}
}
efree(*decoded);
}
}
@@
-261,10
+262,9
@@
php_http_encoding_stream_t *php_http_encoding_stream_init(php_http_encoding_stre
php_http_encoding_stream_t *php_http_encoding_stream_copy(php_http_encoding_stream_t *from, php_http_encoding_stream_t *to)
{
if (from->ops->copy) {
php_http_encoding_stream_t *php_http_encoding_stream_copy(php_http_encoding_stream_t *from, php_http_encoding_stream_t *to)
{
if (from->ops->copy) {
- int freeme;
php_http_encoding_stream_t *ns;
php_http_encoding_stream_t *ns;
- if (
(freeme = !to)
) {
+ if (
!to
) {
to = pemalloc(sizeof(*to), (from->flags & PHP_HTTP_ENCODING_STREAM_PERSISTENT));
}
memset(to, 0, sizeof(*to));
to = pemalloc(sizeof(*to), (from->flags & PHP_HTTP_ENCODING_STREAM_PERSISTENT));
}
memset(to, 0, sizeof(*to));
@@
-277,10
+277,6
@@
php_http_encoding_stream_t *php_http_encoding_stream_copy(php_http_encoding_stre
} else {
return to;
}
} else {
return to;
}
-
- if (freeme) {
- pefree(to, (to->flags & PHP_HTTP_ENCODING_STREAM_PERSISTENT));
- }
}
return NULL;
}
return NULL;