Stanislav Malyshev
02e4d7a290
Merge branch 'pull-request/341'
...
* pull-request/341: (23 commits)
typofixes
2013-06-10 14:30:59 -07:00
Pierre Joye
40d5458eff
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
entry for #64214
other fix for #64214 , unmodified file may not have old fp set, causing other possible crashes
2013-05-17 11:50:52 +02:00
Pierre Joye
aff65a0346
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
entry for #64214
other fix for #64214 , unmodified file may not have old fp set, causing other possible crashes
2013-05-17 11:49:33 +02:00
Pierre Joye
3eb1745643
other fix for #64214 , unmodified file may not have old fp set, causing other possible crashes
2013-05-17 11:45:13 +02:00
Pierre Joye
42a186e22d
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
more check for php_stream_fopen_tmpfile failure
2013-05-14 16:46:32 +02:00
Pierre Joye
7ec2e5314e
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
more check for php_stream_fopen_tmpfile failure
2013-05-14 16:45:56 +02:00
Pierre Joye
ba1af29805
more check for php_stream_fopen_tmpfile failure
2013-05-14 16:45:11 +02:00
Pierre Joye
362402d748
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
php_stream_fopen_tmpfile may file, causing any following stream usage to crash
2013-05-14 09:21:30 +02:00
Pierre Joye
f37c54ab27
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
php_stream_fopen_tmpfile may file, causing any following stream usage to crash
2013-05-14 09:21:17 +02:00
Pierre Joye
533e636a62
php_stream_fopen_tmpfile may file, causing any following stream usage to crash
2013-05-14 09:20:53 +02:00
Nikita Popov
c2893ab592
Missed two occurances of Revision:
2013-03-23 21:09:20 +01:00
Nikita Popov
01583bdc36
phar phpinfo uses Id instead of Revision
2013-03-23 20:11:06 +01:00
Dmitry Stogov
e9641141aa
Made test compatible with O+
2013-03-16 16:11:00 +04:00
Nikita Popov
fcc6611de9
Add support for non-scalar Iterator keys in foreach
...
RFC: https://wiki.php.net/rfc/foreach-non-scalar-keys
2013-03-12 17:27:31 +01:00
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
