summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 5.4.12php-5.4.12PHP-5.4.12Stanislav Malyshev2013-02-183-12/+10
|
* Proper bit reset codephp-5.4.12RC2Dmitry Stogov2013-02-131-2/+2
|
* fix patch for 5.4Stanislav Malyshev2013-02-121-5/+1
|
* add CVEsStanislav Malyshev2013-02-111-2/+3
|
* 5.4.12 rc2Stanislav Malyshev2013-02-103-3/+9
|
* Disabled external entities loadingDmitry Stogov2013-02-101-0/+2
|
* Check if soap.wsdl_cache_dir confirms to open_basedirDmitry Stogov2013-02-101-1/+35
|
* 5.4.12 RC1php-5.4.12RC1Stanislav Malyshev2013-01-293-4/+4
|
* update NEWSStanislav Malyshev2013-01-291-0/+1
|
* Merge branch 'PHP-5.3' into PHP-5.4Johannes Schlüter2013-01-291-2/+2
|\
| * Merge branch 'PHP-5.3' of git.php.net:/php-src into PHP-5.3Johannes Schlüter2013-01-296-70/+123
| |\
| | * NEWS for bug #64023 (see aa0adce)Gustavo Lopes2013-01-231-0/+3
| | |
| * | Fix bug #64099 (Wrong TSRM usage in zend_register_class_alias)Johannes Schlüter2013-01-292-2/+3
| | |
* | | Merge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4Johannes Schlüter2013-01-2914-115/+298
|\ \ \
| * | | Fix bug #62524, only follow redirects in file streams for 3xx HTTP statusesStanislav Malyshev2013-01-292-2/+6
| | | |
| * | | Fix missing parameterAndras Elso2013-01-271-1/+1
| | | |
| * | | fix testsStanislav Malyshev2013-01-231-3/+3
| | | |
| * | | Merge branch 'bug64023' into PHP-5.4Gustavo Lopes2013-01-224-75/+39
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | * bug64023: Fix bug #64023 (__toString() & SplFileInfo) Conflicts: Zend/zend_vm_def.h Zend/zend_vm_execute.h
| | * | Fix bug #64023 (__toString() & SplFileInfo)Gustavo Lopes2013-01-224-70/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Defining a __toString() method was having no effect when concatenating the object. This was because the cast_object() handler would ignore __toString(). Using echo() directly would actually use __toString(), but this was a bug: the ECHO handler would try zend_std_cast_object_tostring() before cast_object(), but cast_object() should have priority as zend_std_cast_object_tostring() assumes an object with a zend_class_entry.
| * | | Merge fix of #62836 to ?.re, and regenerate ?.cXinchen Hui2013-01-212-31/+37
| | | |
| * | | Merge branch 'PHP-5.3' into PHP-5.4Stanislav Malyshev2013-01-183-1/+87
| |\ \ \ | | |/ / | | | | | | | | | | | | * PHP-5.3: fix bug #63462 (Magic methods called twice for unset protected properties)
| | * | fix bug #63462 (Magic methods called twice for unset protected properties)Stanislav Malyshev2013-01-183-0/+86
| | | |
| * | | NEWS for bug #64011. See 77ee200Gustavo Lopes2013-01-181-0/+2
| | | |
| * | | Fix bug #64011 (get_html_translation_table())Gustavo Lopes2013-01-182-2/+123
| | | | | | | | | | | | | | | | | | | | | | | | get_html_translation_table() with encoding ISO-8859-1 and HTMLENTITIES was broken. Only entities for characters U+0000 to U+0040 were being included in the result.
* | | | Merge branch 'PHP-5.3' into PHP-5.4Johannes Schlüter2013-01-160-0/+0
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Fix NEWS after 5.3.21Johannes Schlüter2013-01-161-11/+13
| |/
* | Fix NewsChristopher Jones2013-01-151-3/+5
| |
* | Merge branch 'PHP-5.3' into PHP-5.4Adam Harvey2013-01-162-1/+4
|\ \ | |/ | | | | | | * PHP-5.3: Update the arguments in the prototype of fpm_socket_unix_test_connect().
| * Update the arguments in the prototype of fpm_socket_unix_test_connect().Adam Harvey2013-01-162-1/+4
| | | | | | | | Fixes bug #63999 (php with fpm fails to build on Solaris 10 or 11).
* | fixed buildAnatoliy Belsky2013-01-151-1/+5
| |
* | NEWS for bug #63893Gustavo Lopes2013-01-151-0/+2
| |
* | Merge remote-tracking branch 'remotes/cataphract/strtr_wu94_54' into PHP-5.4Gustavo Lopes2013-01-151-87/+360
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/cataphract/strtr_wu94_54: Fixed inconsequential bug in strtr() Remove _GNU_SOURCE, add local heap sort The compiler can figure this out Remove unused block strtr() with 2nd param array - optimization Refactoring, bugs & leaks Optimize strtr w/ 2nd arg array
| * | Fixed inconsequential bug in strtr()Gustavo Lopes2013-01-151-2/+2
| | |
| * | Remove _GNU_SOURCE, add local heap sortGustavo Lopes2013-01-141-7/+62
| | |
| * | The compiler can figure this outGustavo Lopes2013-01-141-1/+1
| | |
| * | Remove unused blockGustavo Lopes2013-01-141-5/+0
| | |
| * | strtr() with 2nd param array - optimizationGustavo Lopes2013-01-141-6/+5
| | | | | | | | | | | | | | | About a 1.25x speedup in my test script by writing the result string only when a match is found and at the end instead of on each iteration.
| * | Refactoring, bugs & leaksGustavo Lopes2013-01-141-52/+97
| | |
| * | Optimize strtr w/ 2nd arg arrayGustavo Lopes2013-01-141-86/+265
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug #63893: poor efficiency of strtr() using array with keys of very different length. The implementation is basically all new, which carries some risk with it. The algorithm is described in "A Fast Algorithm For Multi-Pattern Searching" (1994) by Sun Wu and Udi Manber.
* | | Revert "Apply the fputcsv test fix to SplFileObject_fputcsv.phpt. Mea culpa."Adam Harvey2013-01-151-5/+5
| | | | | | | | | | | | This reverts commit 0510701474e8d99b5b30139b5599e44f9b555a5a.
* | | Merge branch 'PHP-5.3' into PHP-5.4Adam Harvey2013-01-154-29/+11
|\ \ \ | | |/ | |/| | | | | | | * PHP-5.3: Revert "Update fputcsv() to escape all characters equally."
| * | Revert "Update fputcsv() to escape all characters equally."Adam Harvey2013-01-154-29/+13
| | | | | | | | | | | | | | | | | | On second thoughts, while the behaviour _is_ broken, this isn't the right fix. This reverts commit 9b5cb0e8059b1e8bec096067491ed8d75f878938.
* | | fix NEWSStanislav Malyshev2013-01-151-5/+9
| | |
* | | Apply the fputcsv test fix to SplFileObject_fputcsv.phpt. Mea culpa.Adam Harvey2013-01-151-5/+5
| | |
* | | Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4Xinchen Hui2013-01-153-11/+27
|\ \ \
| * \ \ Merge branch 'PHP-5.3' into PHP-5.4Adam Harvey2013-01-154-11/+29
| |\ \ \ | | |/ / | | | | | | | | | | | | * PHP-5.3: Update fputcsv() to escape all characters equally.
| | * | Update fputcsv() to escape all characters equally.Adam Harvey2013-01-154-13/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At present, backslashes have special case handling within fputcsv(): when one is encountered within a field that's being escaped, escaping stops until the next instance of the enclosure character is hit. This can result in malformed CSV. Fixes bug #43225 (fputcsv incorrectly handles cells ending in \ followed by ").
* | | | Fixed bug #57702 (Multi-row BLOB fetches)Xinchen Hui2013-01-153-3/+168
|/ / /
* | | Bug #52958: Segfault in PDO_OCI on cleanup after running a long testsuite.Lars Strojny2013-01-142-2/+6
| | |
* | | Support BITMAPV5HEADER in getimagesize(): ↵Lars Strojny2013-01-145-8/+26
| | | | | | | | | | | | https://en.wikipedia.org/wiki/BMP_file_format#DIB_header_.28bitmap_information_header.29
View Lorry Controller Status