summaryrefslogtreecommitdiff
path: root/ext
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'PHP-5.6'Stanislav Malyshev2015-06-094-9/+394
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.6: add NEWS Fixed bug #68776 fix test update NEWS Fix bug #69646 OS command injection vulnerability in escapeshellarg Fix #69719 - more checks for nulls in paths fix test description Fixed Buf #68812 Unchecked return value. Conflicts: ext/dom/document.c ext/gd/gd.c ext/standard/exec.c
| * Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2015-06-092-0/+373
| |\ | | | | | | | | | | | | * PHP-5.5: Fixed bug #68776
| | * Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2015-06-092-0/+373
| | |\ | | | | | | | | | | | | | | | | * PHP-5.4: Fixed bug #68776
| | | * Fixed bug #68776Yasuo Ohgaki2015-06-092-0/+373
| | | |
| * | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2015-06-091-2/+2
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | * PHP-5.5: fix test update NEWS
| | * | Merge branch 'PHp-5.4' into PHP-5.5Stanislav Malyshev2015-06-091-2/+2
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | * PHp-5.4: fix test update NEWS
| | | * fix testStanislav Malyshev2015-06-091-2/+2
| | | |
| * | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2015-06-093-11/+31
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.5: Fix bug #69646 OS command injection vulnerability in escapeshellarg Fix #69719 - more checks for nulls in paths fix test description Fixed Buf #68812 Unchecked return value.
| | * | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2015-06-093-11/+31
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.4: Fix bug #69646 OS command injection vulnerability in escapeshellarg Fix #69719 - more checks for nulls in paths fix test description Fixed Buf #68812 Unchecked return value. Conflicts: ext/dom/document.c ext/gd/gd.c
| | | * Fix bug #69646 OS command injection vulnerability in escapeshellargStanislav Malyshev2015-06-091-0/+8
| | | |
| | | * Fix #69719 - more checks for nulls in pathsStanislav Malyshev2015-06-092-13/+25
| | | |
| | | * fix test descriptionRemi Collet2015-06-091-1/+1
| | | |
| | | * Upgrade bundled sqlite to 3.8.10.2Lior Kaplan2015-06-083-25800/+54438
| | | | | | | | | | | | | | | | Includes fixes for CVE-2015-3414, CVE-2015-3415, CVE-2015-3416 done in 3.8.9
* | | | Fixed bug #69646 (OS command injection vulnerability in escapeshellarg)Stanislav Malyshev2015-06-091-0/+8
| | | |
* | | | fix hard-coded path in testFerenc Kovacs2015-06-091-1/+1
| | | |
* | | | Merge branch 'PHP-5.6'Remi Collet2015-06-091-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | * PHP-5.6: fix test description Fixed Buf #68812 Unchecked return value. Fixed Buf #68812 Unchecked return value.
| * | | Merge branch 'PHP-5.5' into PHP-5.6Remi Collet2015-06-091-1/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | * PHP-5.5: fix test description Fixed Buf #68812 Unchecked return value.
| | * | fix test descriptionRemi Collet2015-06-091-1/+1
| | | |
* | | | Merge branch 'PHP-5.6'Lior Kaplan2015-06-082-2207/+4818
|\ \ \ \ | |/ / / | | | | | | | | | | | | * PHP-5.6: Upgrade bundled sqlite to 3.8.10.2
| * | | Merge branch 'PHP-5.5' into PHP-5.6Lior Kaplan2015-06-082-2207/+4818
| |\ \ \ | | |/ / | | | | | | | | | | | | * PHP-5.5: Upgrade bundled sqlite to 3.8.10.2
| | * | Upgrade bundled sqlite to 3.8.10.2Lior Kaplan2015-06-082-2207/+4818
| | | | | | | | | | | | | | | | Includes fixes for CVE-2015-3414, CVE-2015-3415, CVE-2015-3416 done in 3.8.9
* | | | Merge branch 'PHP-5.6'Anatol Belski2015-06-081-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * PHP-5.6: fixed test related to fix for bug #67805
| * | | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2015-06-081-1/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | * PHP-5.5: fixed test related to fix for bug #67805
| | * | fixed test related to fix for bug #67805Anatol Belski2015-06-081-1/+1
| | | |
| * | | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2015-06-082-1/+16
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | * PHP-5.5: updated NEWS Fix bug #67805 - SplFileObject setMaxLineLength.
| | * | Fix bug #67805 - SplFileObject setMaxLineLength.Willian Gustavo Veiga2015-06-082-1/+16
| | | |
* | | | Fix bug #67805 - SplFileObject setMaxLineLength.Willian Gustavo Veiga2015-06-082-1/+16
| | | |
* | | | fix dir separator in testAnatol Belski2015-06-081-3/+3
| | | |
* | | | added LIBXML_BIGLINES constantChristoph M. Becker2015-06-081-0/+3
| | | |
* | | | added tests for bug #54138Christoph M. Becker2015-06-083-0/+72
| | | |
* | | | replaced / in filename with DIRECTORY_SEPARATOR according to performance ↵Christoph M. Becker2015-06-081-1/+1
| | | | | | | | | | | | | | | | warning on DOMDocument::load man page
* | | | added SKIPIF conditional to check for DOM availabilityChristoph M. Becker2015-06-081-0/+1
| | | |
* | | | added XFAIL test for bug #69753Christoph M. Becker2015-06-082-0/+22
| | | |
* | | | Reflection support for type hints and return typesMatteo Beccati2015-06-086-113/+312
| | | |
* | | | Merge remote-tracking branch 'pollita/reflection.typehint'Sara Golemon2015-06-083-7/+207
| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ext/reflection/php_reflection.c ext/reflection/tests/ReflectionExtension_getClasses_basic.phpt
* | | | fixed language dependent Windows socket testsChristoph M. Becker2015-06-082-3/+3
| | | |
* | | | Improve json parser codeJakub Zelenka2015-06-072-38/+147
| | | |
* | | | Use better zend_hash_* functionsDmitry Stogov2015-06-052-3/+3
| | | |
* | | | Merge branch 'PHP-5.6'Xinchen Hui2015-06-041-0/+4
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-5.5' into PHP-5.6Xinchen Hui2015-06-041-0/+4
| |\ \ \ | | |/ /
| | * | Fixed invalid read druing apache reloadXinchen Hui2015-06-041-0/+4
| | | |
* | | | introduced DllMain for the main php DLLAnatol Belski2015-06-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The particular need on this is because of the current situation with determining the background functionality for the gettimeofday. DllMain allows to initialize stuff before the DLL can be actually used. Thus, we use different time API on win7 and win8 and later, so the function pointer needs to be initialized before anything in the DLL could even demand it. The change also opens the door for the further optimizations, as now we're able to do the very basic initializations for the whole DLL before it could ever start to live. Fe on this way the TLS initialization could be done, when utilizing the DLL_THREAD_ATTACH/DETACH case. Whether it's really usable in portable way should be synced with other platforms. Be aware that it's dangerous as it possibly causes dead locks. So to use with care. One willing to add items to DllMain should better read the documentation twice and even then try to defer the necessary action.
* | | | fix testStanislav Malyshev2015-06-011-1/+6
| | | |
* | | | Merge branch 'pull-request/1310'Stanislav Malyshev2015-06-011-3/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * pull-request/1310: Fix GD tests #69698
| * | | | Fix GD tests #69698Metalaka2015-05-291-3/+1
| | | | | | | | | | | | | | | May be take a look to [travis/compile.sh](https://github.com/php/php-src/blob/4b9299d155316e4e49d87d3941eab1ca95b2462a/travis/compile.sh#L60)
* | | | | Merge branch 'PHP-5.6'Stanislav Malyshev2015-06-012-1/+18
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.6: Fix bug #69737 - Segfault when SplMinHeap::compare produces fatal error Conflicts: ext/spl/spl_heap.c
| * | | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2015-06-012-1/+18
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | * PHP-5.5: Fix bug #69737 - Segfault when SplMinHeap::compare produces fatal error
| | * | | Fix bug #69737 - Segfault when SplMinHeap::compare produces fatal errorStanislav Malyshev2015-06-012-1/+18
| | | | |
* | | | | Merge branch 'PHP-5.6'Stanislav Malyshev2015-05-311-2/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * PHP-5.6: improve fix for Bug #69545
| * | | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2015-05-311-2/+0
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * PHP-5.5: improve fix for Bug #69545
View Lorry Controller Status