clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-03 15:56:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
75,059 Commits 494 Branches 1,367 Tags 813 MiB
4d606cf01e
Commit Graph

224 Commits

Author SHA1 Message Date
Stanislav Malyshev
02e4d7a290 Merge branch 'pull-request/341' 
* pull-request/341: (23 commits)
  typofixes
 2013-06-10 14:30:59 -07: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
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
Xinchen Hui
610c7fbe7b Remove executable permission on phpt 2012-10-10 10:27:49 +08:00
Xinchen Hui
e081c55fb5 Merge branch 'PHP-5.3' into PHP-5.4 2012-10-10 10:31:31 +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
Xinchen Hui
228c288686 Fix 126 tests failed of phar when --enable-zend-multibyte 2012-08-05 12:40:59 +08: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
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