summaryrefslogtreecommitdiff
path: root/ext/phar
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'PHP-5.4' into PHP-5.5Xinchen Hui2013-01-0618-18/+18
|\
| * Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2013-01-0618-18/+18
| |\
| | * bump yearXinchen Hui2013-01-0618-18/+18
| | |
* | | Invoke re2c with --no-generation-date to prevent unintentional / unnecessary ↵Sebastian Bergmann2012-12-062-2/+2
| | | | | | | | | | | | changes in generated files.
* | | Merge branch 'PHP-5.4' into PHP-5.5Anatoliy Belsky2012-11-221-0/+3
|\ \ \ | |/ / | | | | | | | | | * PHP-5.4: Fixed test for bug #63297
| * | Merge branch 'PHP-5.3' into PHP-5.4Anatoliy Belsky2012-11-221-0/+3
| |\ \ | | |/ | | | | | | | | | * PHP-5.3: Fixed test for bug #63297
| | * Fixed test for bug #63297Anatoliy Belsky2012-11-221-0/+3
| | |
| | * fixed a typo in the error messageAnatoliy Belsky2012-10-251-1/+1
| | |
| | * Fixed bug #63297 Phar fails to write an openssl based signatureAnatoliy Belsky2012-10-241-6/+20
| | | | | | | | | | | | | | | | | | | | | | | | Unitialized values warnings seem to be everyday life when working with openssl. For more read http://www.openssl.org/support/faq.html#PROG13 So just fixing so the bug, no care about those warnings.
* | | Merge branch 'PHP-5.4'Anatoliy Belsky2012-10-251-6/+20
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | * PHP-5.4: merged changes for bug #63297 from 5.3 Conflicts: NEWS
| * | merged changes for bug #63297 from 5.3Anatoliy Belsky2012-10-251-6/+20
| | |
* | | Merge branch 'PHP-5.4'Xinchen Hui2012-10-106-0/+0
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2012-10-106-0/+0
| |\ \ | | |/
| | * Remove executable permission on incXinchen Hui2012-10-106-0/+0
| | |
* | | Merge branch 'PHP-5.4'Xinchen Hui2012-10-1062-0/+0
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2012-10-1062-0/+0
| |\ \ | | |/
| | * Remove executable permission on phptXinchen Hui2012-10-1062-0/+0
| | |
| | * better fixXinchen Hui2012-08-241-1/+1
| | |
| | * Fix testXinchen Hui2012-08-241-1/+1
| | |
* | | Merge branch 'PHP-5.4'Felipe Pena2012-08-215-167/+9
|\ \ \ | |/ / | | | | | | | | | * PHP-5.4: - Removed PHP 6 checks
| * | Merge branch 'PHP-5.3' into PHP-5.4Felipe Pena2012-08-215-167/+9
| |\ \ | | |/ | | | | | | | | | * PHP-5.3: - Removed PHP 6 checks
| | * - Removed PHP 6 checksFelipe Pena2012-08-215-167/+9
| | |
* | | Merge branch 'PHP-5.4'Felipe Pena2012-08-191-2/+0
|\ \ \ | |/ / | | | | | | | | | * PHP-5.4: - Value stored to var is never used
| * | Merge branch 'PHP-5.3' into PHP-5.4Felipe Pena2012-08-191-2/+0
| |\ \ | | |/ | | | | | | | | | * PHP-5.3: - Value stored to var is never used
| | * - Value stored to var is never usedFelipe Pena2012-08-191-2/+0
| | |
| | * Fix 126 tests failed of phar when --enable-zend-multibyteXinchen Hui2012-08-05126-75/+217
| | |
* | | Merge branch 'PHP-5.4'Stanislav Malyshev2012-08-051-4/+4
|\ \ \ | |/ / | | | | | | | | | * PHP-5.4: Minor spelling corrections
| * | Minor spelling correctionsBrett Bieber2012-08-051-4/+4
| | |
* | | Merge branch 'PHP-5.4'Johannes Schlüter2012-06-203-151/+0
|\ \ \ | |/ / | | | | | | | | | * PHP-5.4: Remove outdated and user-specific files
| * | Merge branch 'PHP-5.3' into PHP-5.4Johannes Schlüter2012-06-203-151/+0
| |\ \ | | |/ | | | | | | | | | * PHP-5.3: Remove outdated and user-specific files
| | * Remove outdated and user-specific filesJohannes Schlüter2012-06-203-151/+0
| | |
| | * Merge commit '15213768e6cc098ab4e53cacc3b5eb86fa85284a' into PHP-5.3Felipe Pena2012-06-071-1/+5
| | |\
| | | * - Fixed bug #62227 (Invalid phar stream path causes crash)Felipe Pena2012-06-041-1/+5
| | | |
| | * | fix unchecked emallocStanislav Malyshev2012-05-301-3/+3
| | | | | | | | | | | | | | | | (cherry picked from commit 158d8a6b088662ce9d31e0c777c6ebe90efdc854)
| | * | fix bug #61065Stanislav Malyshev2012-05-161-0/+10
| | | | | | | | | | | | | | | | (cherry picked from commit a10e778bfb7ce9caa1f91666ddf2705db7982d68)
* | | | Merge branch 'PHP-5.4'Anatoliy Belsky2012-05-291-3/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.4: (21 commits) Fixed bug #62176 Test Bug - sapi/cli/tests/bug61546.phpt fix unchecked emalloc add CVE add bug 62146 add bug #62082 sync with HEAD sync with HEAD Fixed bug #61218 (the previous patch was not enough restritive on fcgi name string checks) Fixed bug #61218 (the previous patch was not enough restritive on fcgi name string checks) Fixed bug #61218 (FPM drops connection while receiving some binary values in FastCGI requests) Fixed bug #61218 (FPM drops connection while receiving some binary valuesin FastCGI requests) Fixed bug #62033 (USR2 signal was sent even if not catch when daemonize and an error occured) - Fixed bug #62033 (USR2 signal was sent even if not catch when daemonize and an error occured) - Fixed bug #62160 (Add process.priority to set nice(2) priorities) - Fixed bug #62160 (Add process.priority to set nice(2) priorities) - add missing headers to avoid warnings - add missing headers to avoid warnings - Fixed bug #62153 (when using unix sockets, multiples FPM instances can be launched without errors) - Fixed bug #62153 (when using unix sockets, multiples FPM instances can be launched without errors) - Fixed bug #62033 (php-fpm exits with status 0 on some failures to start) ... Conflicts: NEWS
| * | | fix unchecked emallocStanislav Malyshev2012-05-281-3/+3
| | | |
* | | | 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
| | | |
* | | | Merge branch 'PHP-5.4'Stanislav Malyshev2012-05-151-0/+10
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.4: fd fix fix bug #61065 Conflicts: UPGRADING
| * | | fix bug #61065Stanislav Malyshev2012-05-151-0/+10
| | | |
* | | | Merge branch 'PHP-5.4'Anatoliy Belsky2012-05-092-1/+34
|\ \ \ \ | |/ / / | | | | | | | | | | | | * PHP-5.4: Fix bug 61901 ext\phar\tests\phar_buildfromdirectory2.phpt fails
| * | | Merge branch 'PHP-5.3' into PHP-5.4Anatoliy Belsky2012-05-092-1/+34
| |\ \ \ | | |/ / | | | | | | | | | | | | * PHP-5.3: Fix bug 61901 ext\phar\tests\phar_buildfromdirectory2.phpt fails
| | * | Fix bug 61901 ext\phar\tests\phar_buildfromdirectory2.phpt failsAnatoliy Belsky2012-05-092-1/+34
| | | | | | | | | | | | | | | | Another error message is produced by win specific code
* | | | Merge branch 'PHP-5.4'Anatoliy Belsky2012-05-072-2/+8
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | * PHP-5.4: Fix bug 61905 ext\phar\tests\zip\phar_commitwrite.phpt fails Fix bug 61903 ext\phar\tests\tar\phar_commitwrite.phpt fails
| * | | Merge branch 'PHP-5.3' into PHP-5.4Anatoliy Belsky2012-05-072-2/+8
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | * PHP-5.3: Fix bug 61905 ext\phar\tests\zip\phar_commitwrite.phpt fails Fix bug 61903 ext\phar\tests\tar\phar_commitwrite.phpt fails
| | * | Fix bug 61905 ext\phar\tests\zip\phar_commitwrite.phpt failsAnatoliy Belsky2012-05-071-1/+4
| | | |
| | * | Fix bug 61903 ext\phar\tests\tar\phar_commitwrite.phpt failsAnatoliy Belsky2012-05-071-1/+4
| | | |
* | | | Merge branch 'PHP-5.4'Anatoliy Belsky2012-05-041-2/+4
|\ \ \ \ | |/ / / | | | | | | | | | | | | * PHP-5.4: Fix bug #61906 ext\phar\tests\zip\phar_setsignaturealgo2.phpt fails
| * | | Merge branch 'PHP-5.3' into PHP-5.4Anatoliy Belsky2012-05-041-2/+4
| |\ \ \ | | |/ / | | | | | | | | | | | | * PHP-5.3: Fix bug #61906 ext\phar\tests\zip\phar_setsignaturealgo2.phpt fails
View Lorry Controller Status