com php-src: Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport: ext/mysql i/mysqli_priv.h
ext/standard/php_fopen_wrapper.c main/SAPI.c

Commit: ede2963963ba8ef88f9ab4df7e7ba0f26413d2bc Author: Anatol Belski <ab@php.net> Wed, 7 May 2014 15:00:18 +0200 Parents: bc92917e7325cea46f2f563933957b72efc1cf61 f63ca453e0b8b31fb2dd029327d5435e9650aa4d Branches: str_size_and_int64_56_backport Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ede2963963ba8ef88f9ab4df7e7ba0f26413d2bc Log: Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport * origin/PHP-5.6: Fixed test (it requires ext/hash) Fixed tests (they might fail from time to time because of session GC) NEWS XFAIL-- for bug #67198 remove useless indirection fix bug #67198 (php://input regression) rename a constant - old name to new name test for bug #67198 Fix author name on the #63228 patch. Conflicts: ext/standard/php_fopen_wrapper.c Bugs: https://bugs.php.net/67198 https://bugs.php.net/63228 Changed paths: MM ext/mysqli/mysqli_priv.h MM ext/standard/php_fopen_wrapper.c MM main/SAPI.c Diff: diff --cc ext/standard/php_fopen_wrapper.c index 583ccdc,7e21e95..9d6b4ea --- a/ext/standard/php_fopen_wrapper.c +++ b/ext/standard/php_fopen_wrapper.c @@@ -64,8 -64,8 +64,8 @@@ php_stream_ops php_stream_output_ops = }; typedef struct php_stream_input { /* {{{ */ - php_stream **body_ptr; + php_stream *body; - off_t position; + zend_off_t position; } php_stream_input_t; /* }}} */