Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | unify stdint type usage | Michael Wallner | 2013-08-06 | 18 | -266/+17 |
* | Check for NULL ptr from get_stream() before passing it on to php_stream_cast() | Kalle Sommer Nielsen | 2013-08-05 | 1 | -2/+6 |
* | Merge branch 'PHP-5.5' | Yasuo Ohgaki | 2013-08-05 | 15 | -62/+184 |
|\ | |||||
| * | Merge branch 'PHP-5.4' into PHP-5.5 | Yasuo Ohgaki | 2013-08-05 | 15 | -62/+184 |
| |\ | |||||
| | * | Fixed bug #62978. pg_select()/etc may allow SQL injection when table name is ... | Yasuo Ohgaki | 2013-08-05 | 15 | -62/+184 |
* | | | Merge branch 'PHP-5.5' | Stanislav Malyshev | 2013-08-04 | 39 | -95/+264 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'pr368' into PHP-5.5 | Stanislav Malyshev | 2013-08-04 | 39 | -95/+264 |
| |\ \ | |||||
| | * | | fix crash, enable session_id and fix test | Stanislav Malyshev | 2013-08-04 | 3 | -6/+2 |
| | * | | Strict session. Detect session id collision | Yasuo Ohgaki | 2013-08-04 | 2 | -2/+28 |
| | * | | Strict session | Yasuo Ohgaki | 2013-08-04 | 38 | -93/+240 |
* | | | | Merge branch 'PHP-5.5' | Stanislav Malyshev | 2013-08-04 | 6 | -57/+107 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2013-08-04 | 6 | -57/+107 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | First fixes for a 64bit compatible ftp extension | Andreas Streichardt | 2013-08-04 | 6 | -57/+107 |
* | | | | Fixed bug #63258 (seg fault with PDO and dblib using DBSETOPT(H->link, DBQUOT... | Stanislav Malyshev | 2013-08-04 | 1 | -1/+1 |
* | | | | Merge branch 'PHP-5.5' | Stanislav Malyshev | 2013-08-04 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | fix compiler warning, use longs for hashes | Stanislav Malyshev | 2013-08-04 | 1 | -1/+1 |
| | |/ | |/| | |||||
* | | | Merge branch 'PHP-5.5' | Stanislav Malyshev | 2013-08-04 | 33 | -33/+33 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2013-08-04 | 33 | -33/+33 |
| |\ \ | | |/ | |||||
| | * | non living code related typo fixes | Veres Lajos | 2013-08-04 | 33 | -33/+33 |
* | | | Merge commit '626d96a' | Rasmus Lerdorf | 2013-08-03 | 1 | -2/+0 |
|\ \ \ | |/ / | |||||
| * | | This doesn't fail in 5.5 anymore | Rasmus Lerdorf | 2013-08-03 | 1 | -2/+0 |
| * | | Merge commit 'a03f094' into PHP-5.5 | Rasmus Lerdorf | 2013-08-02 | 2 | -2/+2 |
| |\ \ | | |/ | |||||
| * | | Merge commit 'd60e168' into PHP-5.5 | Rasmus Lerdorf | 2013-08-02 | 1 | -1/+1 |
| |\ \ | |||||
| * \ \ | Merge commit 'ea75b1b' into PHP-5.5 | Rasmus Lerdorf | 2013-08-02 | 1 | -0/+1 |
| |\ \ \ | |||||
| * \ \ \ | Merge commit 'e55f08a' into PHP-5.5 | Rasmus Lerdorf | 2013-08-02 | 1 | -0/+2 |
| |\ \ \ \ | |||||
* | | | | | | Fix phar phpinfo test after markup changes | Nikita Popov | 2013-08-03 | 1 | -15/+15 |
* | | | | | | Merge commit 'a03f094' | Rasmus Lerdorf | 2013-08-02 | 2 | -2/+2 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | We shouldn't load any local ini files for these tests | Rasmus Lerdorf | 2013-08-02 | 2 | -2/+2 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge commit 'd60e168' | Rasmus Lerdorf | 2013-08-02 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | pcre_quote? No such thing. How did this ever pass? | Rasmus Lerdorf | 2013-08-02 | 1 | -1/+1 |
| | |_|/ | |/| | | |||||
* | | | | Merge commit 'ea75b1b' | Rasmus Lerdorf | 2013-08-02 | 1 | -0/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | This test needs local infile enabled | Rasmus Lerdorf | 2013-08-02 | 1 | -0/+1 |
| | |/ | |/| | |||||
* | | | Merge commit 'e55f08a' | Rasmus Lerdorf | 2013-08-02 | 1 | -0/+2 |
|\ \ \ | |/ / | |||||
| * | | This test will only work if gc is enabled | Rasmus Lerdorf | 2013-08-02 | 1 | -0/+2 |
* | | | Merge branch 'PHP-5.5' | Xinchen Hui | 2013-08-02 | 1 | -3/+11 |
|\ \ \ | | |/ | |/| | |||||
| * | | Fixed tests (inet_pton behaves differently on Darwin) | Xinchen Hui | 2013-08-02 | 1 | -3/+11 |
* | | | Merge branch 'PHP-5.5' | Yasuo Ohgaki | 2013-08-02 | 1 | -0/+17 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-5.4' into PHP-5.5 | Yasuo Ohgaki | 2013-08-02 | 1 | -0/+17 |
| |\ \ | | |/ | |||||
| | * | Add user contributed test. Bug #61748 | Yasuo Ohgaki | 2013-08-02 | 1 | -0/+17 |
* | | | Merge branch 'PHP-5.5' | Christopher Jones | 2013-08-01 | 2 | -2/+2 |
|\ \ \ | |/ / | |||||
| * | | Revert "Allow 'make distclean' to clean up the 'generated' phar.inc" | Christopher Jones | 2013-08-01 | 2 | -2/+2 |
* | | | Merge branch 'PHP-5.5' | Christopher Jones | 2013-07-31 | 2 | -2/+2 |
|\ \ \ | |/ / | |||||
| * | | Allow 'make distclean' to clean up the 'generated' phar.inc | Christopher Jones | 2013-07-31 | 2 | -2/+2 |
* | | | Merge branch 'pull-request/399' | Sara Golemon | 2013-07-31 | 23 | -76/+80 |
|\ \ \ | |||||
| * | | | Constify streams API and a few other calls down the rabbit hole. | Andrey Hristov | 2013-07-30 | 23 | -76/+80 |
* | | | | Merge branch 'PHP-5.5' | Dmitry Stogov | 2013-07-31 | 1 | -5/+49 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Merge branch 'PHP-5.4' into PHP-5.5 | Dmitry Stogov | 2013-07-31 | 1 | -5/+49 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Improved fix for bug #44686 (SOAP-ERROR: Parsing WSDL) | Dmitry Stogov | 2013-07-31 | 1 | -5/+49 |
* | | | | Merge branch 'PHP-5.5' | Dmitry Stogov | 2013-07-31 | 2 | -38/+83 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch 'PHP-5.4' into PHP-5.5 | Dmitry Stogov | 2013-07-31 | 2 | -38/+83 |
| |\ \ \ | | |/ / |