mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-30 21:35:36 +08:00
Code Issues Packages Projects Releases Wiki Activity
75,229 Commits 500 Branches 1,381 Tags 821 MiB
3182660c04
Commit Graph

472 Commits

Author SHA1 Message Date
Xinchen Hui
47c9027772 Bump year 2014-01-03 11:06:16 +08:00
Ferenc Kovacs
91108818e1 Merge branch 'PHP-5.4' into PHP-5.5 
Conflicts:
	ext/spl/tests/SplFileObject_rewind_error001.phpt
 2013-11-06 10:46:34 +01:00
ptarjan
9c1e1bbc05 fix many parallel test issues 
While running these on HHVM I've run into a lot of parallelism issues.
I'm backporting all the fixes I had to do in
https://github.com/facebook/hiphop-php/blob/master/hphp/tools/import_zend_test.py#L650
to php core.

Most of these changes were just filenames that were shared between
tests, but I did more surgery on the fixed ports. I can apreciate port
31337 as much as the next nerd, but random ports are better for tests.
 2013-11-06 10:31:47 +01:00
Michael Wallner
b33824bfea Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix bug #65391
  Update NEWS
 2013-08-09 11:21:50 +02:00
Michael Wallner
ac28283beb fix bug #65391 
Unable to send vary header user-agent when
ob_start('ob_gzhandler') is called
 2013-08-09 11:14:04 +02:00
Christopher Jones
c6d977dd39 Fix long-standing visual pain point: the misalignment of './configure help' text. 
Whitespace changes and a couple of grammar fixes.
 2013-08-06 11:06:09 -07:00
Stanislav Malyshev
af5e2eaf8d Merge branch 'pull-request/320' 
* pull-request/320:
  this is test 5 not 6
  fix race condition
  more shared names that create race conditions
  change to a unique filename
  more shared filenames
  yet another shared filename
  don't share a filename to stop race conditions
  fix race condition for 2-4 and normalize names for others
  fix race condition when running tests in parallel
  clean up after test
  Fix #64572: Clean up after the test
  Fix #64572: Clean up after the test
 2013-06-17 01:06:20 -07:00
Stanislav Malyshev
6b896fa57f Merge branch 'pull-request/320' 
* pull-request/320:
  this is test 5 not 6
  fix race condition
  more shared names that create race conditions
  change to a unique filename
  more shared filenames
  yet another shared filename
  don't share a filename to stop race conditions
  fix race condition for 2-4 and normalize names for others
  fix race condition when running tests in parallel
  clean up after test
  Fix #64572: Clean up after the test
  Fix #64572: Clean up after the test
 2013-06-17 01:06:01 -07:00
Stanislav Malyshev
84e35fb2e0 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  typo fixes (argument)
  typo fixes (accommodate, parameter)
 2013-06-10 13:36:41 -07:00
Veres Lajos
04145dc2aa typo fixes (argument) 2013-06-10 13:36:17 -07:00
Anatol Belski
8d41f6dab6 Removed fork of ext/zlib/tests/bug_52944.phpt 
The real issue is a bug in asm zlib build, reported here
https://github.com/madler/zlib/issues/41 . Non ASM builds
behave more predictable.
 2013-04-24 14:31:59 +02:00
Remi Collet
b3a8609837 remove set but not used variables 2013-01-02 16:48:46 +01:00
Xinchen Hui
a666285bc2 Happy New Year 2013-01-01 16:37:09 +08:00
Xinchen Hui
0a7395e009 Happy New Year 2013-01-01 16:28:54 +08:00
Anatoliy Belsky
b815676494 Merge branch 'PHP-5.4' 
* PHP-5.4:
  fixed test for bug #52944 also for darwin
 2012-09-09 23:03:47 +02:00
Reeze Xia
57bebfcbdc fixed test for bug #52944 also for darwin 2012-09-09 23:02:50 +02:00
Anatoliy Belsky
4b206126ac Merge branch 'PHP-5.4' 
* PHP-5.4:
  forked two tests for windows
 2012-09-03 13:48:02 +02:00
Anatoliy Belsky
ff0aa24054 forked two tests for windows 
* bug55544.phpt - VT vs. EXT at the start of the data block,
but the data can still be decoded correctly
* bug_52944.phpt works with the corrupted data and has some
different out

Most likely the ASM optimization under windows is responsible
for this behaviour.
 2012-09-03 13:37:34 +02:00
Xinchen Hui
dd9d64b21e Merge branch 'PHP-5.4' 2012-07-24 14:46:25 +08:00
Xinchen Hui
9fe8c58130 binary compatibility 2012-07-24 14:45:13 +08:00
Xinchen Hui
4c1e2bbd6f Re-fix bug #55544 2012-07-24 14:43:53 +08:00
Xinchen Hui
6126ac44b5 correct the author name introduced in bb685512 2012-07-24 13:39:46 +08:00
Xinchen Hui
38fb89f91d Merge branch 'PHP-5.4' 2012-07-24 13:39:02 +08:00
Xinchen Hui
c20b2ab0bd folders 2012-07-24 13:37:44 +08:00
Xinchen Hui
64cbdc606c Merge branch 'PHP-5.4' 2012-07-21 02:58:16 +08:00
Xinchen Hui
a6f1533789 Fixed bug #55544 (ob_gzhandler always conflicts with zlib.output_compression) 2012-07-21 02:57:36 +08:00
Anatoliy Belsky
92bf6391aa Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fixed bug #61677 ext\zlib\tests\bug_52944.phpt fails
 2012-07-13 11:46:49 +02:00
Anatoliy Belsky
d9d21b2037 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed bug #61677 ext\zlib\tests\bug_52944.phpt fails
 2012-07-13 11:46:14 +02:00
Anatoliy Belsky
02b8362ec2 Fixed bug #61677 ext\zlib\tests\bug_52944.phpt fails 
The test is known to fail on windows with zlib version < 1.2.7 (current dep is 1.2.5),
with 1.2.7 it works. As it's primarily a zlib 1.2.5 issue on windows, skip it for now.
 2012-07-13 11:39:57 +02:00
Anatoliy Belsky
5087778f42 Merge branch 'PHP-5.4' 
* PHP-5.4:
  split gzgetc_basic.phpt for zlib 1.2.7
 2012-06-19 14:13:53 +02:00
Anatoliy Belsky
0a65b661e4 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  split gzgetc_basic.phpt for zlib 1.2.7
 2012-06-19 14:12:54 +02:00
Anatoliy Belsky
a8948d0808 split gzgetc_basic.phpt for zlib 1.2.7 2012-06-19 14:08:34 +02:00
Michael Wallner
2d11e55b94 cleanup merge 2012-05-15 09:44:01 +02:00
Michael Wallner
0ad53bfd7d fix bug #60761 zlib.output_compression fails on refresh 2012-05-15 09:33:47 +02:00
Michael Wallner
a9836496e3 Merge branch 'PHP-5.4' 2012-04-24 20:37:29 +02:00
Michael Wallner
7c93a16477 fix bug #61443 
Since upgrade to PHP 5.4, we can't change zlib.output_compression on the
fly

the check for PHP_OUTPUT_WRITTEN was over-zealous
 2012-04-24 20:35:49 +02:00
Michael Wallner
342b641a93 Merge branch 'PHP-5.4' 2012-04-24 19:52:45 +02:00
Michael Wallner
df00b64cb9 fixed bug #61820 
using ob_gzhandler will complain about headers already sent
when no compression

the Vary header should only be sent on the PHP_OUTPUT_HANDLER_START
event
 2012-04-24 19:50:00 +02:00
Anatoliy Belsky
f5d8e2b896 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bug 61680 ext\zlib\tests\gzencode_variation1-win32.phpt fails
 2012-04-16 14:06:03 +02:00
Anatoliy Belsky
d588d01b7c Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug 61680 ext\zlib\tests\gzencode_variation1-win32.phpt fails
 2012-04-16 14:05:32 +02:00
Anatoliy Belsky
163c1a393f Fix bug 61680 ext\zlib\tests\gzencode_variation1-win32.phpt fails 2012-04-16 14:04:29 +02:00
Anatoliy Belsky
1eefd05eb5 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bug #61519	test fails, should pass - ext/zlib/tests/bug60761.phpt
 2012-03-27 18:22:37 +02:00
Anatoliy Belsky
b7596eaa1b Merge branch '5.3' into 5.4 
* 5.3:
  Fix bug #61519	test fails, should pass - ext/zlib/tests/bug60761.phpt

Conflicts:
	ext/zlib/tests/bug60761.phpt
 2012-03-27 18:16:02 +02:00
Anatoliy Belsky
bcfcfb2fc5 Fix bug #61519 test fails, should pass - ext/zlib/tests/bug60761.phpt 2012-03-27 18:02:31 +02:00
Gustavo André dos Santos Lopes
854f6377ae - Tentative fix for bug #61306. 
#cjones: Will update NEWS when confirmed it fixes the problem.
 2012-03-07 08:51:30 +00:00
Gustavo André dos Santos Lopes
d13f833875 - Tentative fix for bug #61306. 
#cjones: Will update NEWS when confirmed it fixes the problem.
 2012-03-07 08:51:30 +00:00
Michael Wallner
39d2996c57 MFH: Fixed bug #61287 (A particular string fails to decompress) 2012-03-05 15:38:24 +00:00
Michael Wallner
e63e6647ff fix bug #61287 (A particular string fails to decompress) 2012-03-05 15:35:22 +00:00
Nikita Popov
3748034f86 Merge: Fix bug #61139: gzopen leaks when specifying invalid mode 2012-03-02 14:16:47 +00:00
Nikita Popov
ecd13fd184 Fix bug #61139 gzopen leaks when specifying invalid mode 
Needs to be merged to 5.4.
 2012-02-19 14:39:29 +00:00