summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Added support for CURLOPT_MAIL_AUTHYour Name2012-05-271-0/+5
|
* Fixed bug #61218 (the previous patch was not enough restritive on fcgi name ↵Jerome Loyet2012-05-261-6/+42
| | | | string checks)
* Fixed bug #61218 (FPM drops connection while receiving some binary values in ↵Jerome Loyet2012-05-261-40/+8
| | | | FastCGI requests)
* Fixed bug #62033 (USR2 signal was sent even if not catch when daemonize and ↵Jerome Loyet2012-05-264-2/+5
| | | | an error occured)
* - Fixed bug #62160 (Add process.priority to set nice(2) priorities)Jerome Loyet2012-05-264-0/+65
|
* - add missing headers to avoid warningsJerome Loyet2012-05-261-0/+2
|
* - Fixed bug #62153 (when using unix sockets, multiples FPM instances can be ↵Jerome Loyet2012-05-252-0/+26
| | | | launched without errors)
* - Fixed bug #62033 (php-fpm exits with status 0 on some failures to start).Jerome Loyet2012-05-259-31/+135
|
* Merge branch 'PHP-5.4'Xinchen Hui2012-05-252-4/+4
|\ | | | | | | | | * PHP-5.4: Fixed bug #62128 superfluous ";"
| * Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2012-05-252-4/+4
| |\ | | | | | | | | | | | | * PHP-5.3: Fixed bug #62128 superfluous ";"
| | * Fixed bug #62128 superfluous ";"Xinchen Hui2012-05-252-4/+4
| | |
* | | Fixed problem in IntlCalendar debug handlerGustavo André dos Santos Lopes2012-05-252-4/+2
| | | | | | | | | | | | | | | | | | *is_temp was not being set. Also deleted a redundant assignment to *is_temp in IntlTimeZone.
* | | Merge branch 'PHP-5.4'Anatoliy Belsky2012-05-253-1/+39
|\ \ \ | |/ / | | | | | | | | | | | | * PHP-5.4: Fixed bug #62149 Test Bug - ext/curl/tests/bug61948 Fixed bug #62148 mail_skipif doesn't skip imap tests on Release Build
| * | Merge branch 'PHP-5.3' into PHP-5.4Anatoliy Belsky2012-05-253-1/+39
| |\ \ | | |/ | | | | | | | | | | | | * PHP-5.3: Fixed bug #62149 Test Bug - ext/curl/tests/bug61948 Fixed bug #62148 mail_skipif doesn't skip imap tests on Release Build
| | * Fixed bug #62149 Test Bug - ext/curl/tests/bug61948Matt Ficken2012-05-252-1/+29
| | |
| | * Fixed bug #62148 mail_skipif doesn't skip imap tests on Release BuildMatt Ficken2012-05-251-0/+10
| | |
* | | Merge branch 'PHP-5.4'Anatoliy Belsky2012-05-251-1/+4
|\ \ \ | |/ / | | | | | | | | | * PHP-5.4: Fixed bug #62147 test bug - popen_pclose_basic-win32
| * | Merge branch 'PHP-5.3' into PHP-5.4Anatoliy Belsky2012-05-251-1/+4
| |\ \ | | |/ | | | | | | | | | * PHP-5.3: Fixed bug #62147 test bug - popen_pclose_basic-win32
| | * Fixed bug #62147 test bug - popen_pclose_basic-win32Matt Ficken2012-05-251-1/+4
| | |
* | | Merge branch 'PHP-5.4'Johannes Schlüter2012-05-258-28/+36
|\ \ \ | |/ / | | | | | | | | | | | | | | | * PHP-5.4: Fix bug #62146 com_dotnet cannot be built shared, tested by Anatoliy Those changes are in 5.3.15 - BFN
| * | Merge branch 'PHP-5.3' into PHP-5.4Johannes Schlüter2012-05-258-28/+36
| |\ \ | | |/ | | | | | | | | | | | | | | | * PHP-5.3: Fix bug #62146 com_dotnet cannot be built shared, tested by Anatoliy Those changes are in 5.3.15 - BFN
| | * Fix bug #62146 com_dotnet cannot be built shared, tested by AnatoliyJohannes Schlüter2012-05-259-28/+39
| | |
| | * Those changes are in 5.3.15Johannes Schlüter2012-05-251-3/+2
| | |
| | * Merge branch 'PHP-5.3' of git.php.net:php-src into PHP-5.3Felipe Pena2012-05-247-213/+260
| | |\
| | * | - BFNFelipe Pena2012-05-241-2/+5
| | | |
* | | | Merge branch 'pull-request/54'Stanislav Malyshev2012-05-247-4/+73
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * pull-request/54: Allow arbitrary expressions for empty() This change is as per RFC https://wiki.php.net/rfc/empty_isset_exprs. The change allows passing the result of function calls and other expressions to the empty() language construct. This is accomplished by simply rewriting empty(expr) to !expr. The change does not affect the suppression of errors when using empty() on variables. empty($undefinedVar) will continue not to throw errors. When an expression is used inside empty() on the other hand, errors will not be suppressed. Thus empty($undefinedVar + $somethingElse) *will* throw a notice. The change also does not make empty() into a real function, so using 'empty' as a callback is still not possible. In addition to the empty() changes the commit adds nicer error messages when isset() is used on function call results or other expressions.
| * | | | Allow arbitrary expressions for empty()Nikita Popov2012-05-137-4/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change is as per RFC https://wiki.php.net/rfc/empty_isset_exprs. The change allows passing the result of function calls and other expressions to the empty() language construct. This is accomplished by simply rewriting empty(expr) to !expr. The change does not affect the suppression of errors when using empty() on variables. empty($undefinedVar) will continue not to throw errors. When an expression is used inside empty() on the other hand, errors will not be suppressed. Thus empty($undefinedVar + $somethingElse) *will* throw a notice. The change also does not make empty() into a real function, so using 'empty' as a callback is still not possible. In addition to the empty() changes the commit adds nicer error messages when isset() is used on function call results or other expressions.
* | | | | Merge branch 'PHP-5.4'Felipe Pena2012-05-244-25/+33
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | * PHP-5.4: - Fixed magic file regex support
| * | | | Merge branch 'PHP-5.3' into PHP-5.4Felipe Pena2012-05-244-25/+33
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | * PHP-5.3: - Fixed magic file regex support
| | * | | - Fixed magic file regex supportFelipe Pena2012-05-244-25/+33
| | | | |
* | | | | Merge remote-tracking branch 'origin/PHP-5.4'Xinchen Hui2012-05-245-213/+235
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * origin/PHP-5.4: Fixed bug #62073 (Different ways of iterating over an SplMaxHeap result in different keys)
| * | | | Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2012-05-245-213/+235
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | * PHP-5.3: Fixed bug #62073 (Different ways of iterating over an SplMaxHeap result in different keys)
| | * | | Fixed bug #62073Xinchen Hui2012-05-246-217/+243
| | |\ \ \ | | | | | | | | | | | | | | | | | | (Different ways of iterating over an SplMaxHeap result in in different keys)
| | | * | | Fixed bug #62073 (Different ways of iterating over an SplMaxHeap result in ↵Reeze Xia2012-05-235-213/+237
| | | | | | | | | | | | | | | | | | | | | | | | different keys)
* | | | | | Merge branch '5.4'Gustavo André dos Santos Lopes2012-05-242-0/+25
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch '5.3' into 5.4Gustavo André dos Santos Lopes2012-05-242-0/+25
| |\ \ \ \ \ | | |/ / / /
| | * | | | Fixed bug #55610: ResourceBundle and TraversableGustavo André dos Santos Lopes2012-05-243-0/+26
| | | |/ / | | |/| |
| | * | | Update NEWSGustavo André dos Santos Lopes2012-05-241-1/+2
| | | | |
* | | | | Merge branch '5.4' with no code changes.Gustavo André dos Santos Lopes2012-05-240-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | Fixed last commit on 5.4Gustavo André dos Santos Lopes2012-05-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's no change from the intended behavior. If INTL_G(default_locale) is NULL, the default ICU locale, as given by locale_get_default() in master, will still be used by ures_open().
* | | | | Merge branch 'PHP-5.4'Anatoliy Belsky2012-05-241-2/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * PHP-5.4: Fixed bug #62140 ext\standard\tests\file\tempnam_variation7-win32.phpt fails
| * | | | Fixed bug #62140 ext\standard\tests\file\tempnam_variation7-win32.phpt failsAnatoliy Belsky2012-05-241-2/+2
| | | | |
* | | | | Merge branch '5.4'Gustavo André dos Santos Lopes2012-05-242-7/+41
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | Conflicts: UPGRADING
| * | | | Changed ResourceBundle constructor behaviorGustavo André dos Santos Lopes2012-05-244-7/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | null is now accepted for two first (mandatory arguments). Passing null as the package name causes NULL to be passed to ICU and the default ICU data to be loaded. Passing null as the locale name causes the default locale to be used.
* | | | | Merge branch 'PHP-5.4'Anatoliy Belsky2012-05-241-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * PHP-5.4: Fix bug #62139 ext\standard\tests\file\rename_variation13-win32.phpt fails
| * | | | Fix bug #62139 ext\standard\tests\file\rename_variation13-win32.phpt failsAnatoliy Belsky2012-05-241-0/+0
| | | | |
* | | | | Merge branch 'PHP-5.4'Anatoliy Belsky2012-05-240-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * PHP-5.4: Fixed bug #62138 ext\standard\tests\dir\dir_variation8-win32.phpt fails
| * | | | Fixed bug #62138 ext\standard\tests\dir\dir_variation8-win32.phpt failsAnatoliy Belsky2012-05-241-4/+4
| | | | |
* | | | | Merge branch 'PHP-5.4'Anatoliy Belsky2012-05-241-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * PHP-5.4: Fix bug #62137 ext\phar\tests\fatal_error_webphar.phpt fails
| * | | | Fix bug #62137 ext\phar\tests\fatal_error_webphar.phpt failsAnatoliy Belsky2012-05-241-1/+1
| | | | |