diff options
Diffstat (limited to 'main')
| -rw-r--r-- | main/php_version.h | 4 | ||||
| -rwxr-xr-x | main/streams/streams.c | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/main/php_version.h b/main/php_version.h index 651a744262..3d13b2abe6 100644 --- a/main/php_version.h +++ b/main/php_version.h @@ -2,6 +2,6 @@ /* edit configure.in to change version number */ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 0 -#define PHP_RELEASE_VERSION 1 +#define PHP_RELEASE_VERSION 0 #define PHP_EXTRA_VERSION "-dev" -#define PHP_VERSION "5.0.1-dev" +#define PHP_VERSION "5.0.0-dev" diff --git a/main/streams/streams.c b/main/streams/streams.c index fc3d893e09..86f78847dd 100755 --- a/main/streams/streams.c +++ b/main/streams/streams.c @@ -1231,8 +1231,6 @@ PHPAPI size_t _php_stream_copy_to_mem(php_stream *src, char **buf, size_t maxlen *buf = perealloc_rel_orig(*buf, max_len + step, persistent); max_len += step; ptr = *buf + len; - } else { - ptr += ret; } } if (len) { @@ -1376,7 +1374,7 @@ int php_init_stream_wrappers(int module_number TSRMLS_DC) int php_shutdown_stream_wrappers(int module_number TSRMLS_DC) { zend_hash_destroy(&url_stream_wrappers_hash); - zend_hash_destroy(php_get_stream_filters_hash_global()); + zend_hash_destroy(php_get_stream_filters_hash()); zend_hash_destroy(php_stream_xport_get_hash()); return SUCCESS; } |