php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-28 02:33:17 +02:00
Code Issues Packages Projects Releases Wiki Activity
70,444 Commits 549 Branches 1,485 Tags
134089372b94de2e3e8c2a1aba4cbc415c803d67
Commit Graph

209 Commits

Author SHA1 Message Date
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
Anatoliy Belsky ce59121c5f Fix bug 61903 ext\phar\tests\tar\phar_commitwrite.phpt fails 2012-05-07 15:37:29 +02:00
Anatoliy Belsky 56ac0e71bb Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bug #61906 ext\phar\tests\zip\phar_setsignaturealgo2.phpt fails
 2012-05-04 11:42:28 +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 7388c085bf Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bug #61904 ext\phar\tests\tar\phar_setsignaturealgo2.phpt
  Bump to next version

Conflicts:
	configure.in
	main/php_version.h
 2012-05-04 11:38:43 +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 62de1cfe33 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bug 61902 ext\phar\tests\phar_setsignaturealgo2.phpt falis
 2012-05-02 21:42:57 +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 2ceafc7e33 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bug #61468 ext/phar/tests/phar_oo_005.phpt fails
 2012-03-28 13:19:45 +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 d780b4e4b3 Merge branch 'PHP-5.4' 
* PHP-5.4:
  fix tests
 2012-03-25 13:50:33 -07:00
Stanislav Malyshev d51c1e0a4c fix tests 2012-03-25 13:49:19 -07:00
Christopher Jones 77b821d3c5 Fix skipif 2011-12-08 20:43:23 +00:00
Christopher Jones 20f0acae85 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 8d73eb77ed - add windows version of this test 2011-12-06 13:34:45 +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
Stanislav Malyshev 9fe3a605c6 fix bug #60164 (Stubs of a specific length break phar_open_from_fp scanning for __HALT_COMPILER) 2011-11-19 04:59:56 +00:00
Stanislav Malyshev 449907fb76 fix bug #60164 (Stubs of a specific length break phar_open_from_fp scanning for __HALT_COMPILER) 2011-11-19 04:59:56 +00:00
Stanislav Malyshev 22cbdd5cc5 fix bug #60164 (Stubs of a specific length break phar_open_from_fp scanning for __HALT_COMPILER) 2011-11-19 04:59:56 +00:00
Felipe Pena 28d1bc37e2 - Fixed bug #60261 (phar dos null pointer) 2011-11-11 21:39:11 +00:00
Felipe Pena c1e510aea8 - Fixed bug #60261 (phar dos null pointer) 2011-11-11 21:39:11 +00:00
Felipe Pena 72a133f155 - Fixed bug #60261 (phar dos null pointer) 2011-11-11 21:39:11 +00:00
Ferenc Kovacs 7888715e73 the mandatory __construct() for SPL classes was reverted in r318566 2011-11-05 16:49:56 +00:00
Ferenc Kovacs 80d1553746 the mandatory __construct() for SPL classes was reverted in r318566 2011-11-05 16:49:56 +00:00
Xinchen Hui 3fd08b3bd4 Fix tests due to bison depened message format 2011-09-25 03:35:57 +00:00
Xinchen Hui 6d2a0bd6cc Fix tests due to bison depened message format 2011-09-25 03:35:57 +00:00
Christopher Jones ef83bd744c Fix skipif for non zlib builds re message http://lxr.php.net/opengrok/xref/PHP_TRUNK/ext/phar/phar_object.c#351 2011-09-15 17:23:29 +00:00
Christopher Jones 3e55ec1e93 Fix skipif for non zlib builds re message http://lxr.php.net/opengrok/xref/PHP_TRUNK/ext/phar/phar_object.c#351 2011-09-15 17:23:29 +00:00
Christopher Jones a0526b9452 Fix skipif for non zlib builds re message http://lxr.php.net/opengrok/xref/PHP_TRUNK/ext/phar/phar_object.c#351 2011-09-15 17:23:29 +00:00
Stanislav Malyshev 666d301ee3 Fix error message 2011-09-10 05:36:14 +00:00
Stanislav Malyshev 2a6a890c46 Fix error message 2011-09-10 05:36:14 +00:00
Ulf Wendel 78b2f1c488 Fixing SKIPIF fatal error. 6.0 is history, thus SKIPIF might need further updates? 2011-09-06 16:30:53 +00:00