Dmitry Stogov
8b7222e22f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
PHAR should modify entry timestamp when it's modified
2013-02-21 16:08:07 +04:00
Dmitry Stogov
b5d267aa95
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
PHAR should modify entry timestamp when it's modified
2013-02-21 15:57:26 +04:00
Dmitry Stogov
7b113d789d
PHAR should modify entry timestamp when it's modified
2013-02-21 15:55:20 +04:00
Xinchen Hui
cbb5d42b9b
Merge branch 'PHP-5.4' into PHP-5.5
2013-01-06 10:23:21 +08:00
Xinchen Hui
c2f8e90504
Merge branch 'PHP-5.3' into PHP-5.4
2013-01-06 10:20:00 +08:00
Xinchen Hui
bc11e6fdbb
bump year
2013-01-06 10:19:09 +08:00
Sebastian Bergmann
eab14993fe
Invoke re2c with --no-generation-date to prevent unintentional / unnecessary changes in generated files.
2012-12-06 09:28:35 +01:00
Anatoliy Belsky
bc910a7ce4
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed test for bug #63297
2012-11-22 19:05:31 +01:00
Anatoliy Belsky
dc862f4fd4
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed test for bug #63297
2012-11-22 19:04:49 +01:00
Anatoliy Belsky
1702024073
Fixed test for bug #63297
2012-11-22 19:01:09 +01:00
Anatoliy Belsky
f962260081
merged changes for bug #63297 from 5.3
2012-10-25 09:40:21 +02:00
Anatoliy Belsky
6e23cfeba4
fixed a typo in the error message
2012-10-25 09:26:44 +02:00
Anatoliy Belsky
a88379e03d
Fixed bug #63297 Phar fails to write an openssl based signature
...
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.
2012-10-24 13:38:44 +02:00
Anatoliy Belsky
f734c0a7ca
Merge branch 'PHP-5.4'
...
* PHP-5.4:
merged changes for bug #63297 from 5.3
Conflicts:
NEWS
2012-10-25 09:42:18 +02:00
Xinchen Hui
69a4301f6c
Merge branch 'PHP-5.3' into PHP-5.4
2012-10-10 10:45:07 +08:00
Xinchen Hui
1b9e0de2cc
Remove executable permission on inc
2012-10-10 10:44:34 +08:00
Xinchen Hui
e081c55fb5
Merge branch 'PHP-5.3' into PHP-5.4
2012-10-10 10:31:31 +08:00
Xinchen Hui
610c7fbe7b
Remove executable permission on phpt
2012-10-10 10:27:49 +08:00
Xinchen Hui
4e5e8c9da0
Merge branch 'PHP-5.4'
2012-10-10 10:45:34 +08:00
Xinchen Hui
4b152e5470
Merge branch 'PHP-5.4'
2012-10-10 10:32:38 +08:00
Xinchen Hui
55d680e968
better fix
2012-08-24 18:21:49 +08:00
Xinchen Hui
7bedd275eb
Fix test
2012-08-24 18:18:38 +08:00
Felipe Pena
8830cd5be4
Merge branch 'PHP-5.4'
...
* PHP-5.4:
- Removed PHP 6 checks
2012-08-21 20:16:12 -03:00
Felipe Pena
b0dbf71466
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
- Removed PHP 6 checks
2012-08-21 20:15:48 -03:00
Felipe Pena
85fa4d7747
- Removed PHP 6 checks
2012-08-21 20:15:34 -03:00
Felipe Pena
cd18e20101
Merge branch 'PHP-5.4'
...
* PHP-5.4:
- Value stored to var is never used
2012-08-19 15:09:20 -03:00
Felipe Pena
13768f8650
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
- Value stored to var is never used
2012-08-19 15:09:18 -03:00
Felipe Pena
f4054afe40
- Value stored to var is never used
2012-08-19 15:09:14 -03:00
Stanislav Malyshev
e7ca5bb3a1
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Minor spelling corrections
2012-08-05 20:43:53 -07:00
Brett Bieber
82bc8821f9
Minor spelling corrections
2012-08-05 20:43:22 -07:00
Xinchen Hui
228c288686
Fix 126 tests failed of phar when --enable-zend-multibyte
2012-08-05 12:40:59 +08:00
Johannes Schlüter
6e6e98b9e3
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Remove outdated and user-specific files
2012-06-20 19:48:17 +02:00
Johannes Schlüter
041dd77135
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Remove outdated and user-specific files
2012-06-20 19:47:44 +02:00
Johannes Schlüter
d93892de7a
Remove outdated and user-specific files
2012-06-20 19:46:32 +02:00
Felipe Pena
018a9b321f
Merge commit '15213768e6cc098ab4e53cacc3b5eb86fa85284a' into PHP-5.3
2012-06-07 14:18:34 -03:00
Felipe Pena
15213768e6
- Fixed bug #62227 (Invalid phar stream path causes crash)
2012-06-04 20:07:14 -03:00
Stanislav Malyshev
fa05f038cb
fix unchecked emalloc
...
(cherry picked from commit 158d8a6b08
)
2012-05-30 21:37:28 +02:00
Anatoliy Belsky
dffbc98239
Merge branch 'PHP-5.4'
...
* 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
2012-05-29 12:25:25 +02:00
Stanislav Malyshev
158d8a6b08
fix unchecked emalloc
2012-05-28 18:54:15 -07:00
Anatoliy Belsky
0b297a17e8
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fix bug #62137 ext\phar\tests\fatal_error_webphar.phpt fails
2012-05-24 12:06:53 +02:00
Anatoliy Belsky
b5511dcfd7
Fix bug #62137 ext\phar\tests\fatal_error_webphar.phpt fails
2012-05-24 12:04:38 +02:00
Stanislav Malyshev
4eb802bb14
fix bug #61065
...
(cherry picked from commit a10e778bfb
)
2012-05-16 16:30:29 +02:00
Stanislav Malyshev
6a0212ea88
Merge branch 'PHP-5.4'
...
* PHP-5.4:
fd fix
fix bug #61065
Conflicts:
UPGRADING
2012-05-15 22:39:17 -07:00
Stanislav Malyshev
a10e778bfb
fix bug #61065
2012-05-15 22:34:34 -07:00
Anatoliy Belsky
e3f2c76989
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fix bug 61901 ext\phar\tests\phar_buildfromdirectory2.phpt fails
2012-05-09 13:06:47 +02:00
Anatoliy Belsky
f76d7be876
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix bug 61901 ext\phar\tests\phar_buildfromdirectory2.phpt fails
2012-05-09 13:04:32 +02:00
Anatoliy Belsky
7fb16d5bd9
Fix bug 61901 ext\phar\tests\phar_buildfromdirectory2.phpt fails
...
Another error message is produced by win specific code
2012-05-09 13:02:33 +02:00
Anatoliy Belsky
2c505ecc57
Merge branch 'PHP-5.4'
...
* 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
2012-05-07 15:40:48 +02:00
Anatoliy Belsky
09664063a8
Merge branch 'PHP-5.3' into PHP-5.4
...
* 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
2012-05-07 15:40:16 +02:00
Anatoliy Belsky
2068419ae5
Fix bug 61905 ext\phar\tests\zip\phar_commitwrite.phpt fails
2012-05-07 15:39:07 +02:00