| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
Fixed ext/standard/tests/streams/bug61115.phpt
|
| |
|
| |
|
| |
|
| |
|
| |
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
During merge I had to revert:
Nikita's patch for php_splice() (it probably needs to be applyed again)
Bob Weinand's patches related to constant expression handling (we need to review them carefully)
I also reverted all our attempts to support sapi/phpdbg (we didn't test it anyway)
Conflicts:
Zend/zend.h
Zend/zend_API.c
Zend/zend_ast.c
Zend/zend_compile.c
Zend/zend_compile.h
Zend/zend_constants.c
Zend/zend_exceptions.c
Zend/zend_execute.c
Zend/zend_execute.h
Zend/zend_execute_API.c
Zend/zend_hash.c
Zend/zend_highlight.c
Zend/zend_language_parser.y
Zend/zend_language_scanner.c
Zend/zend_language_scanner_defs.h
Zend/zend_variables.c
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
ext/date/php_date.c
ext/dom/documenttype.c
ext/hash/hash.c
ext/iconv/iconv.c
ext/mbstring/tests/zend_multibyte-10.phpt
ext/mbstring/tests/zend_multibyte-11.phpt
ext/mbstring/tests/zend_multibyte-12.phpt
ext/mysql/php_mysql.c
ext/mysqli/mysqli.c
ext/mysqlnd/mysqlnd_reverse_api.c
ext/mysqlnd/php_mysqlnd.c
ext/opcache/ZendAccelerator.c
ext/opcache/zend_accelerator_util_funcs.c
ext/opcache/zend_persist.c
ext/opcache/zend_persist_calc.c
ext/pcre/php_pcre.c
ext/pdo/pdo_dbh.c
ext/pdo/pdo_stmt.c
ext/pdo_pgsql/pgsql_driver.c
ext/pgsql/pgsql.c
ext/reflection/php_reflection.c
ext/session/session.c
ext/spl/spl_array.c
ext/spl/spl_observer.c
ext/standard/array.c
ext/standard/basic_functions.c
ext/standard/html.c
ext/standard/mail.c
ext/standard/php_array.h
ext/standard/proc_open.c
ext/standard/streamsfuncs.c
ext/standard/user_filters.c
ext/standard/var_unserializer.c
ext/standard/var_unserializer.re
main/php_variables.c
sapi/phpdbg/phpdbg.c
sapi/phpdbg/phpdbg_bp.c
sapi/phpdbg/phpdbg_frame.c
sapi/phpdbg/phpdbg_help.c
sapi/phpdbg/phpdbg_list.c
sapi/phpdbg/phpdbg_print.c
sapi/phpdbg/phpdbg_prompt.c
|
| |\
| | |
| | |
| | |
| | | |
* PHP-5.6:
Fix bug #65701: Do not use cache for file file copy
|
| | |\
| | | |
| | | |
| | | |
| | | | |
* PHP-5.5:
Fix bug #65701: Do not use cache for file file copy
|
| | | |\
| | | | |
| | | | |
| | | | |
| | | | | |
* PHP-5.4:
Fix bug #65701: Do not use cache for file file copy
|
| | | | | |
|
| |\ \ \ \
| | |/ / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* PHP-5.6:
NEWS
NEWS
Fix Bug #66736 fpassthru broken
|
| | |\ \ \
| | | |/ /
| | | | |
| | | | |
| | | | |
| | | | | |
* PHP-5.5:
NEWS
Fix Bug #66736 fpassthru broken
|
| | | |\ \
| | | | |/
| | | | |
| | | | |
| | | | | |
* PHP-5.4:
Fix Bug #66736 fpassthru broken
|
| | | | | |
|
| |\ \ \ \
| | |/ / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* PHP-5.6:
NEWS
NEWS
Fixed bug #61019 (Out of memory on command stream_get_contents)
|
| | |\ \ \
| | | |/ /
| | | | |
| | | | |
| | | | |
| | | | | |
* PHP-5.5:
NEWS
Fixed bug #61019 (Out of memory on command stream_get_contents)
|
| | | |\ \
| | | | |/
| | | | |
| | | | |
| | | | | |
* PHP-5.4:
Fixed bug #61019 (Out of memory on command stream_get_contents)
|
| | | | | |
|
| | | | | |
|
| | | | | |
|
| | | | | |
|
| | | | | |
|
| | | | | |
|
| | | | | |
|
| | | | | |
|
| | | | | |
|
| | | | | |
|
| | | | | |
|
| | | | | |
|
| | | | | |
|
|/ / / / |
|
|\ \ \ \
| |/ / / |
|
| | | | |
|
|/ / /
| | |
| | |
| | | |
# For mysqlnd: Relevant PHP_API_VERSION are put in place for cross version compatibility
|
|/ /
| |
| |
| |
| | |
(`char *` to `const char *` for parameters and few return values)
In a few places int len moved to size_t len.
|
|\ \
| |/
| |
| |
| | |
* PHP-5.4:
fix possible resource leak and make sure there's something to qsort()
|
| | |
|
|\ \
| |/
| |
| |
| | |
* PHP-5.4:
keep previous test to avoid any behavior change
|
| | |
|
|\ \
| |/
| |
| |
| |
| | |
* PHP-5.4:
fix comment
Fixed Bug #64565 copy doesn't report failure on partial copy
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
_php_stream_copy_to_stream_ex, when mmap is possible, doesn't check
if actually written bytes match read bytes.
Fix this (paranoid check) to be consistent with non mmap mode
Seems hard to add a unit test, as this rely on a full filesystem.
|
| | |
|
| | |
|
|\ \
| |/
| |
| |
| | |
* PHP-5.4:
Fix bug #63240 on stream_get_line()
|
| |\
| | |
| | |
| | |
| | | |
* PHP-5.3:
Fix bug #63240 on stream_get_line()
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
stream_get_line() could contain the delimiter string if that string
had more than one character. The bug manifested itself when a read on
the stream ended with part of the delimiter string and the read after
would start with the rest of the delimiter string; provided that
the data of first read did not complete the max length result of the
call to stream_get_line() with the partial delimiter used in that max
length return. In that case, the delimiter will still appear in
the result, divided in two subsequent return values. That is not a bug.
See <http://www.mail-archive.com/internals@lists.php.net/msg61325.html>
|
|\ \ \
| |/ / |
|
| |\ \
| | |/ |
|