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
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
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
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
Stanislav Malyshev
158d8a6b08
fix unchecked emalloc
2012-05-28 18:54:15 -07: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
a10e778bfb
fix bug #61065
2012-05-15 22:34:34 -07: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
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
Anatoliy Belsky
ce59121c5f
Fix bug 61903 ext\phar\tests\tar\phar_commitwrite.phpt fails
2012-05-07 15:37:29 +02:00
Anatoliy Belsky
f5936cceeb
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix bug #61906 ext\phar\tests\zip\phar_setsignaturealgo2.phpt fails
2012-05-04 11:42:05 +02:00
Anatoliy Belsky
8a10259642
Fix bug #61906 ext\phar\tests\zip\phar_setsignaturealgo2.phpt fails
2012-05-04 11:40:49 +02:00
Anatoliy Belsky
16fdf86ea3
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix bug #61904 ext\phar\tests\tar\phar_setsignaturealgo2.phpt
2012-05-04 11:32:12 +02:00
Anatoliy Belsky
6c12252790
Fix bug #61904 ext\phar\tests\tar\phar_setsignaturealgo2.phpt
2012-05-04 11:29:49 +02:00
Anatoliy Belsky
cdce62b724
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix bug 61902 ext\phar\tests\phar_setsignaturealgo2.phpt falis
2012-05-02 21:41:33 +02:00
Anatoliy Belsky
69ed09a31c
Fix bug 61902 ext\phar\tests\phar_setsignaturealgo2.phpt falis
...
openssl needs explicit openssl.cnf on windows
2012-05-02 21:38:32 +02:00
Anatoliy Belsky
d406f2b034
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix bug #61468 ext/phar/tests/phar_oo_005.phpt fails
2012-03-28 12:56:17 +02:00
Anatoliy Belsky
0b20329aaf
Fix bug #61468 ext/phar/tests/phar_oo_005.phpt fails
2012-03-28 12:54:19 +02:00
Stanislav Malyshev
d51c1e0a4c
fix tests
2012-03-25 13:49:19 -07:00
David Soria Parra
c918ca57a7
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Replace $Revision$ with $Id$ in keyword expansion enable files
Enable $Id$ expansion for files with the $Revision$ keyword
Conflicts:
ext/mysqlnd/mysqlnd.h
2012-03-20 17:58:58 +01:00
David Soria Parra
f7b10abae9
Replace $Revision$ with $Id$ in keyword expansion enable files
2012-03-20 17:53:47 +01:00
Nikita Popov
d256caf781
Merge: Fix bug #61184 Phar::webPhar() generates headers with trailing NUL bytes
2012-03-02 08:21:54 +00:00
Nikita Popov
daa190f8fd
Fix headers generated by phar
...
sapi_header_line.line_len is the length without null terminator, so one has to
take sizeof - 1. This fixes some test failures as the NUL bytes were causing
warnings.
Needs to be merged to 5.4.
2012-02-18 13:39:13 +00:00
Felipe Pena
e4ca0ed09f
- Year++
2012-01-01 13:15:04 +00:00
Felipe Pena
4e19825281
- Year++
2012-01-01 13:15:04 +00:00
Christopher Jones
77b821d3c5
Fix skipif
2011-12-08 20:43:23 +00:00
Christopher Jones
726b31cfc9
Fix skipif
2011-12-08 20:43:23 +00:00
Pierre Joye
4e172842a2
- force LF
2011-12-06 13:42:08 +00:00
Pierre Joye
c46e5a1b7d
- add windows version of this test
2011-12-06 13:35:41 +00:00
Pierre Joye
c55364eb05
- add windows version of this test
2011-12-06 13:35:41 +00:00
Pierre Joye
0c4915d580
- add windows version of this test
2011-12-06 13:34:45 +00:00
Pierre Joye
65f0630552
- add windows version of this test
2011-12-06 13:34:45 +00:00
Pierre Joye
4a91e36366
- force LF
2011-12-06 13:16:40 +00:00
Pierre Joye
bbeaed1cca
- force LF
2011-12-06 13:16:40 +00:00
Pierre Joye
d2fad53032
- force LF
2011-12-06 13:07:08 +00:00
Pierre Joye
74cf85e19d
- force LF
2011-12-06 13:07:08 +00:00
Pierre Joye
72004f29c2
- restore correct window_size
2011-11-20 10:10:43 +00:00
Pierre Joye
f330c8ab4e
- restore correct window_size
2011-11-20 10:10:43 +00:00
Pierre Joye
1e8fc920e1
- fix build, ansi c requires constant value, no expresion, even constant var
2011-11-19 23:09:12 +00:00
Pierre Joye
eeba0b5681
- fix build, ansi c requires constant value, no expresion, even constant var
2011-11-19 23:09:12 +00:00
