summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | Merge branch 'PHP-5.4' into PHP-5.5Johannes Schlüter2013-01-030-0/+0
| |\ \ \ \ \
| * | | | | | remove set but not used variablesRemi Collet2013-01-021-10/+2
| | | | | | |
* | | | | | | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2013-01-030-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / |/| | / / / / | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.4: 5.4.12-dev This will be PHP 5.3.22 Conflicts: configure.in main/php_version.h
| * | | | | 5.4.12-devStanislav Malyshev2013-01-033-4/+6
| |/ / / /
| * | | | Merge branch 'PHP-5.3' into PHP-5.4Johannes Schlüter2013-01-030-0/+0
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | Conflicts: configure.in main/php_version.h
| | * | | This will be PHP 5.3.22Johannes Schlüter2013-01-033-5/+7
| | | | |
* | | | | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2013-01-010-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * PHP-5.4: add bug #63762
| * | | | add bug #63762Stanislav Malyshev2013-01-011-0/+2
| | | | |
* | | | | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2013-01-010-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * PHP-5.4: add fix #43177
| * | | | add fix #43177Stanislav Malyshev2013-01-011-0/+4
| | | | |
* | | | | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2013-01-013-35/+133
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.4: Bug #43177: If an eval() has a parse error, the overall exit status and return code should not be affected. fix NEWS Conflicts: main/main.c
| * | | | Bug #43177: If an eval() has a parse error, the overall exit status and ↵Stanislav Malyshev2013-01-013-36/+134
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | return code should not be affected. Without this fix, a webpage using eval() may return code 500. That might display fine and the 500 go unnoticed, but using AJAX or wget, the 500 will cause problems.
| * | | | fix NEWSStanislav Malyshev2013-01-011-2/+2
| | | | |
* | | | | Remove passwd handler from struct when not neededPierrick Charron2013-01-012-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | CURLOPT_PASSWDFUNCTION was removed in cURL 7.15.5, the passwd field will not be used for version greater than this one
* | | | | Happy New YearXinchen Hui2013-01-01759-769/+769
| | | | |
* | | | | Merge branch 'PHP-5.4' into PHP-5.5Xinchen Hui2013-01-010-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | Happy New YearXinchen Hui2013-01-01758-824/+825
| | | | |
| * | | | Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2013-01-010-0/+0
| |\ \ \ \ | | |/ / /
| | * | | Happy New YearXinchen Hui2013-01-0196-98/+98
| | | | |
| * | | | Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2013-01-010-0/+0
| |\ \ \ \ | | |/ / /
| | * | | Happy New Year~Xinchen Hui2013-01-01657-665/+665
| | | | |
* | | | | Fixed bug #63874 (Segfaul if php_strip_whitespace has heredoc)Pierrick Charron2012-12-293-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | T_END_HEREDOC don't carry a token value anymore since commit 4cf90e06c Bugfix by Nikita for bug #60097
* | | | | Merge branch 'PHP-5.4' into PHP-5.5Lars Strojny2012-12-292-0/+13
|\ \ \ \ \ | |/ / / /
| * | | | News entry for +0/-0 filter fixLars Strojny2012-12-291-0/+2
| | | | |
| * | | | Add more tests for the new +0/-0 behaviour.Martin Jansen2012-12-291-0/+4
| | | | |
| * | | | Treat "+0" and "-0" as valid integers just like var_dump() does.Martin Jansen2012-12-292-0/+9
| | | | | | | | | | | | | | | | | | | | This fixes bug #54096.
* | | | | Add new curl optionsPierrick Charron2012-12-282-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Addes new curl options CURLOPT_TELNETOPTIONS, CURLOPT_GSSAPI_DELEGATION, CURLOPT_ACCEPTTIMEOUT_MS, CURLOPT_SSL_OPTIONS, CURLOPT_TCP_KEEPALIVE, CURLOPT_TCP_KEEPIDLE and CURLOPT_TCP_KEEPINTVL.
* | | | | Merge branch 'PHP-5.4' into PHP-5.5Pierrick Charron2012-12-271-0/+3
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * PHP-5.4: Fixed #63859 Memory leak when reusing curl-handle
| * | | | Fixed #63859 Memory leak when reusing curl-handlePierrick Charron2012-12-272-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When CURLOPT_POSTFIELDS is called more than once on the same curl handle, php/curl did not free the memory of the previous post data. This commit will fix the problem unless the curl handle was previously duplicated using the curl_copy_handle() function in which case we can not know if the post data is still in use or not by any curl handle
* | | | | Merge branch 'PHP-5.4' into PHP-5.5Pierrick Charron2012-12-260-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * PHP-5.4: Revert "Remove a useless memory write in zend_llist_del_element"
| * | | | Merge branch 'PHP-5.3' into PHP-5.4Pierrick Charron2012-12-261-1/+3
| |\ \ \ \ | | |/ / /
| | * | | Revert "Remove a useless memory write in zend_llist_del_element"Pierrick Charron2012-12-261-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit fad960a4045da86cdbd8308a165ffc47892f05b9 as required by Stas and Christopher
* | | | | Fix ext/curl tests to work on every libcurl versionsPierrick Charron2012-12-264-10/+18
| | | | | | | | | | | | | | | | | | | | Thanks Laruence :)
* | | | | Merge branch 'PHP-5.4' into PHP-5.5Pierrick Charron2012-12-251-3/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * PHP-5.4: Remove a useless memory write in zend_llist_del_element
| * | | | Merge branch 'PHP-5.3' into PHP-5.4Pierrick Charron2012-12-251-3/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * PHP-5.3: Remove a useless memory write in zend_llist_del_element
| | * | | Remove a useless memory write in zend_llist_del_elementPierrick Charron2012-12-251-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | The zend_llist_element *next pointer is not necessary and removing it will also remove a write on memory
* | | | | spellingDmitry Stogov2012-12-251-3/+3
| | | | |
* | | | | Merge branch 'PHP-5.4' into PHP-5.5Dmitry Stogov2012-12-252-5/+5
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * PHP-5.4: spelling
| * | | | spellingDmitry Stogov2012-12-252-5/+5
| | | | |
* | | | | Merge branch 'PHP-5.4' into PHP-5.5Dmitry Stogov2012-12-251-2/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * PHP-5.4: Fixed ZTS build
| * | | | Fixed ZTS buildDmitry Stogov2012-12-251-2/+2
| | | | |
* | | | | Removed deprecated fieldsDmitry Stogov2012-12-252-8/+0
| | | | |
* | | | | Merge branch 'PHP-5.4' into PHP-5.5Dmitry Stogov2012-12-2518-429/+341
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * PHP-5.4: Traits refactoring
| * | | | Traits refactoringDmitry Stogov2012-12-2518-429/+341
| | | | |
* | | | | Implement Generator::throw() methodNikita Popov2012-12-247-5/+159
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Generator::throw($exception) throws an exception into the generator. The exception is thrown at the current point of suspension within the generator. It basically behaves as if the current yield statement were replaced with a throw statement and the generator subsequently resumed.
* | | | | Update NEWSPierrick Charron2012-12-231-0/+5
| | | | |
* | | | | New curl_pause() functionPierrick Charron2012-12-232-0/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the curl_pause function (binding of curl_easy_pause). Using this function, you can explicitly mark a running connection to get paused, and you can unpause a connection that was previously paused.
* | | | | Support for curl_strerror and curl_multi_strerrorPierrick Charron2012-12-235-2/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the support for both curl_strerror and curl_multi_strerror. Those function will return a string describing the error code passed in the argument errornum
* | | | | Add curl_multi_setopt and clean curl_share_setoptPierrick Charron2012-12-236-6/+120
| | | | | | | | | | | | | | | | | | | | | | | | | curl_multi_setopt is now available and supports CURLMOPT_PIPELINING and CURLMOPT_MAXCONNECTS
* | | | | Remove duplicated function definitionPierrick Charron2012-12-231-20/+14
| | | | |
View Lorry Controller Status