summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* NEWSRemi Collet2013-12-191-0/+3
|
* Merge branch 'PHP-5.4' into PHP-5.5Remi Collet2013-12-191-1/+1
|\ | | | | | | | | * PHP-5.4: Fixed Bug #66321 (ZipArchive::open() ze_obj->filename_len not real)
| * Fixed Bug #66321 (ZipArchive::open() ze_obj->filename_len not real)Remi Collet2013-12-192-1/+4
| |
* | Merge branch 'PHP-5.4' into PHP-5.5Michael Wallner2013-12-191-3/+5
|\ \ | |/ | | | | | | * PHP-5.4: Update NEWS handling section of README.GIT-RULES
| * Update NEWS handling section of README.GIT-RULESMichael Wallner2013-12-191-3/+5
| | | | | | | | See http://marc.info/?t=138124004400005&r=1&w=2
* | Fixed reavlidate_path=1 behavior to avoid caching of symlinks values.Dmitry Stogov2013-12-183-3/+69
| |
* | Merge branch 'PHP-5.4' into PHP-5.5Anatol Belski2013-12-171-1/+1
|\ \ | |/ | | | | | | * PHP-5.4: fixed possibly uninitialized value usage
| * fixed possibly uninitialized value usageAnatol Belski2013-12-171-1/+1
| |
* | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2013-12-162-1/+9
|\ \ | |/ | | | | | | * PHP-5.4: Fix bug #65873 - Integer overflow in exif_read_data()
| * Fix bug #65873 - Integer overflow in exif_read_data()Stanislav Malyshev2013-12-162-1/+9
| |
* | Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5Dmitry Stogov2013-12-1617-122/+140
|\ \ | | | | | | | | | | | | | | | | | | | | | * 'PHP-5.5' of git.php.net:php-src: Fix tests expecting specific resource IDs fixed parameter order for zend_throw_exception_ex call Fix doc (svn -> git) Updated release process
| * \ Merge branch 'PHP-5.5' of https://git.php.net/push/php-src into PHP-5.5Xinchen Hui2013-12-153-78/+81
| |\ \
| | * \ Merge branch 'PHP-5.4' into PHP-5.5Anatol Belski2013-12-142-3/+3
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | * PHP-5.4: fixed parameter order for zend_throw_exception_ex call Fix doc (svn -> git)
| | | * fixed parameter order for zend_throw_exception_ex callAnatol Belski2013-12-141-1/+1
| | | |
| | | * Fix doc (svn -> git)DQNEO2013-12-131-2/+2
| | | |
| | * | Merge branch 'PHP-5.4' into PHP-5.5Julien Pauli2013-12-131-75/+78
| | |\ \ | | | |/ | | | | | | | | | | | | * PHP-5.4: Updated release process
| | | * Merge branch 'PHP-5.3' into PHP-5.4Julien Pauli2013-12-131-68/+78
| | | |\ | | | | | | | | | | | | | | | | | | | | * PHP-5.3: Updated release process
| | | | * Updated release processJulien Pauli2013-12-131-77/+79
| | | | |
| * | | | Fix tests expecting specific resource IDsEric Stenson2013-12-1514-44/+59
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When Wincache or APC are installed, the resource IDs are not the same. This is because Wincache takes a few resource objects for itself. As a result, these tests become false positives. On Windows boxes, the microtime precision is not granular enough to reliably register a difference if two calls to uniqid() are made concurrently. This is a fix to the uniqid() test to avoid the false positive when run on Windows machines. Also, added a test to exercise the 'more_entropy' variant of uniqid().
* | | | Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5Dmitry Stogov2013-12-133-6/+78
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | * 'PHP-5.5' of git.php.net:php-src: Use zend_error_noreturn here Add Tests for #65784 in 5.5 Disallowed JMP into a finally block. Update NEWS for 5.5.7 release
| * | | Use zend_error_noreturn hereXinchen Hui2013-12-131-1/+1
| | | |
| * | | Add Tests for #65784 in 5.5Xinchen Hui2013-12-131-0/+62
| | | |
| * | | Disallowed JMP into a finally block.Xinchen Hui2013-12-132-5/+11
| | | |
| * | | Update NEWS for 5.5.7 releaseJulien Pauli2013-12-121-1/+5
| | | |
* | | | Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5Dmitry Stogov2013-12-121-0/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | * 'PHP-5.5' of git.php.net:php-src: fix test
| * | | Merge branch 'PHP-5.4' into PHP-5.5Michael Wallner2013-12-121-0/+2
| |\ \ \ | | |/ / | | | | | | | | | | | | * PHP-5.4: fix test
| | * | fix testMichael Wallner2013-12-121-0/+2
| | | |
* | | | Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5Dmitry Stogov2013-12-123-3/+6
|\ \ \ \ | |/ / / | | | | | | | | | | | | * 'PHP-5.5' of git.php.net:php-src: Fixed bug #65486 mysqli_poll() is broken on Win x64
| * | | Fixed bug #65486 mysqli_poll() is broken on Win x64Anatol Belski2013-12-123-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While this issue is visible in mysqli_poll() functions, the cause lays deeper in the stream to socket casting API. On Win x64 the SOCKET datatype is a 64 or 32 bit unsigned, while on Linux/Unix-like it's 32 bit signed integer. The game of casting 32 bit var to/from 64 bit pointer back and forth is the best way to break it. Further more, while socket and file descriptors are always integers on Linux, those are different things using different APIs on Windows. Even though using integer instead of SOCKET might work on Windows, this issue might need to be revamped more carefully later. By this time this patch is tested well with phpt and apps and shows no regressions, neither in mysqli_poll() nor in any other parts.
* | | | Fixed testsDmitry Stogov2013-12-121-2/+3
| | | |
* | | | Fixed ext/soap/tests/bugs/bug54911.phptDmitry Stogov2013-12-121-0/+1
|/ / /
* | | Merge branch 'PHP-5.4' into PHP-5.5Adam Harvey2013-12-072-16/+15
|\ \ \ | |/ / | | | | | | | | | * PHP-5.4: Switch to using freetype-config for freetype detection.
| * | Switch to using freetype-config for freetype detection.Adam Harvey2013-12-072-16/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes GD compilation against libfreetype 2.5.1 and later after they made the rather interesting decision to change their include directory layout in a point release. The original suggestion in the bug was to use pkg-config, but my inclination is to use freetype-config instead: we should be able to get the same configuration information without actually needing pkg-config installed, since pkg-config is by no means guaranteed to exist on many Unices and distros, whereas freetype-config should always be present if a libfreetype build environment is installed. Let's try it out and see what happens. Fixes bug #64405 (Use freetype-config for determining freetype2 dir(s)).
* | | added missing prototypeAnatol Belski2013-12-111-0/+2
| | |
* | | Merge branch 'PHP-5.4' into PHP-5.5Anatol Belski2013-12-111-1/+1
|\ \ \ | |/ / | | | | | | | | | * PHP-5.4: fix dir separator in cve-2013-6420 test
| * | Merge branch 'PHP-5.3' into PHP-5.4Anatol Belski2013-12-111-1/+1
| |\ \ | | |/ | | | | | | | | | * PHP-5.3: fix dir separator in cve-2013-6420 test
| | * fix dir separator in cve-2013-6420 testAnatol Belski2013-12-111-1/+1
| | |
* | | Merge branch 'PHP-5.4' into PHP-5.5Ard Biesheuvel2013-12-111-2/+7
|\ \ \ | |/ /
| * | Zend: fix overflow handling bug in non-x86 fast_add_function()Ard Biesheuvel2013-12-111-2/+7
| | | | | | | | | | | | | | | | | | The 'result' argument of fast_add_function() may alias with either of its operands (or both). Take care not to write to 'result' before reading op1 and op2.
* | | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2013-12-103-4/+61
|\ \ \ | |/ / | | | | | | | | | | | | * PHP-5.4: 5.3.29-dev Fix CVE-2013-6420 - memory corruption in openssl_x509_parse
| * | Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4Stanislav Malyshev2013-12-104-59/+100
| |\ \ | | | | | | | | | | | | | | | | * 'PHP-5.4' of git.php.net:php-src: Fixed Bug #66218 zend_register_functions breaks reflection
| * \ \ Merge branch 'PHP-5.3' into PHP-5.4Stanislav Malyshev2013-12-104-5/+66
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.3: 5.3.29-dev Fix CVE-2013-6420 - memory corruption in openssl_x509_parse Conflicts: configure.in main/php_version.h
| | * | 5.3.29-devStanislav Malyshev2013-12-103-4/+6
| | | |
| | * | Fix CVE-2013-6420 - memory corruption in openssl_x509_parseStanislav Malyshev2013-12-104-5/+64
| | | |
| | * | Merge branch 'PHP-5.3' of https://git.php.net/repository/php-src into PHP-5.3Christopher Jones2013-08-191-0/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | * 'PHP-5.3' of https://git.php.net/repository/php-src: fix using wrong buffer pointer
* | | | | NEWSRemi Collet2013-12-101-0/+1
| | | | |
* | | | | Merge branch 'PHP-5.4' into PHP-5.5Remi Collet2013-12-104-59/+100
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | * PHP-5.4: Fixed Bug #66218 zend_register_functions breaks reflection
| * | | | Fixed Bug #66218 zend_register_functions breaks reflectionRemi Collet2013-12-105-59/+101
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Functions registered using zend_register_functions instead of zend_module_entry.functions are not seen on reflection. Ex: additional_functions from api_module_entry. Ex: in CLI, dl, cli_set_process_title and cli_get_process_title Note: - also affects functions overrided in extension (should be be reported in extension, where overrided, not in original extension) - also allow extension to call zend_register_functions for various list (instead of having a single bug list)
* | | | Fixed bug #66112 (Use after free condition in SOAP extension). (martin dot ↵Dmitry Stogov2013-12-104-94/+184
| | | | | | | | | | | | | | | | koegler at brz dot gv dot at)
* | | | Revered func_get_args() changes, because they were not completly transparent ↵Dmitry Stogov2013-12-101-10/+5
| | | | | | | | | | | | | | | | and broke some tricky PHP code that worked because of luck before php-5.5.6 (see Bug #66107). The changes are going to be kept in PHP-5.6.
View Lorry Controller Status