1
0
mirror of https://github.com/php/php-src.git synced 2026-04-28 18:53:33 +02:00
Commit Graph

709 Commits

Author SHA1 Message Date
Anatol Belski 61e1f79585 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  one more extension for the basename test
2014-01-05 19:21:49 +01:00
Anatol Belski 748e707bf9 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  one more extension for the basename test
2014-01-05 19:21:27 +01:00
Anatol Belski 1c586d4070 one more extension for the basename test 2014-01-05 19:19:54 +01:00
Anatol Belski e5dd5d0ad4 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  improved the fix for bug #66395
  updated NEWS
  Fixed bug #66009 Failed compilation of PHP extension with C++ std library using VS 2012
2014-01-05 19:13:15 +01:00
Anatol Belski 3bde9cfd8d Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  improved the fix for bug #66395
2014-01-05 19:12:52 +01:00
Anatol Belski 3f7f72adb2 improved the fix for bug #66395
- fixed the traverse vulnerability in case like c:d:file.txt
- ensure paths containing NTFS streams are still worky
2014-01-05 19:05:04 +01:00
Anatol Belski f0100261e1 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed bug #66395 basename function doesn't remove drive letter
2014-01-03 22:38:47 +01:00
Anatol Belski d3a053d9f4 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fixed bug #66395 basename function doesn't remove drive letter
2014-01-03 22:32:39 +01:00
Anatol Belski 46f60fae22 Fixed bug #66395 basename function doesn't remove drive letter 2014-01-03 22:25:58 +01:00
Xinchen Hui 5eb8d9d700 Merge branch 'PHP-5.6' of https://git.php.net/push/php-src into PHP-5.6 2013-12-15 16:55:29 +08:00
Eric Stenson 330168a247 Fix tests expecting specific resource IDs
When Wincache or APC are installed, the resource IDs are not the same.
This is because Wincache takes a few resource objects for itself.  As a
result, these tests become false positives.

On Windows boxes, the microtime precision is not granular enough
to reliably register a difference if two calls to uniqid() are made
concurrently.  This is a fix to the uniqid() test to avoid the false
positive when run on Windows machines.  Also, added a test to exercise
the 'more_entropy' variant of uniqid().
2013-12-15 16:51:21 +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 290becb1f1 fix missing change from 'tcp_socket' to the more common 'server' 2013-11-06 10:32:00 +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 6764993358 Merge branch 'PHP-5.5'
* PHP-5.5:
  remove TRAVIS check in test source
  Just SKIP that test on travis
2013-10-21 12:21:21 +02:00
Michael Wallner fb610b4e80 remove TRAVIS check in test source 2013-10-21 12:18:58 +02:00
Michael Wallner 825174e480 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Just SKIP that test on travis
2013-10-21 12:18:10 +02:00
Michael Wallner 2ecf94e07e Just SKIP that test on travis 2013-10-21 12:16:41 +02:00
Michael Wallner bd666e2f99 Merge branch 'PHP-5.5'
* PHP-5.5:
  Assume the free space is correct on Travis CI.
2013-10-17 12:12:26 +02:00
Tjerk Meesters 51b809e3ad Assume the free space is correct on Travis CI. 2013-10-17 12:12:05 +02:00
Paul Tarjan a2eacd8a2c fix typo in copy_variation16 test 2013-10-14 23:54:59 -07:00
ptarjan 361e984e46 fix missing change from 'tcp_socket' to the more common 'server' 2013-09-26 01:06:36 -07:00
ptarjan ecbe4af0de 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-09-26 00:30:23 -07:00
Michael Wallner 002763fb7b fix test concurrency 2013-09-18 10:52:18 +02:00
Michael Wallner ca3d5d06e4 use 65k of data to get a more explicit result 2013-09-16 10:50:02 +02:00
Michael Wallner 52bd9f05ea this test is fragile on travis, let's see why 2013-09-16 09:29:42 +02:00
Stanislav Malyshev 524fab3e41 Merge branch 'PHP-5.5'
* PHP-5.5:
  Expose fputcsv's escape_char to userland
2013-08-24 20:46:03 -07:00
Joey Smith 2139d2702d Expose fputcsv's escape_char to userland
Allows users to assert that something other than the backslash
should be considered an escape char; also follows the RFC 4180
recommendation that fields containing a " be enclosed.
2013-08-24 20:45:14 -07:00
Anatol Belski 827100df82 split the glob() test to test different basedir 2013-08-20 13:40:19 +02:00
Anatol Belski f4df40108b fixed glob() edge case on windows, ref bug #47358 2013-08-19 14:21:16 +02:00
Anatol Belski f61b648da4 modified the new glob() test for master 2013-08-19 11:22:18 +02:00
Anatol Belski cdc64f0345 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  added new glob() test
2013-08-19 11:19:42 +02:00
Anatol Belski 4bad49e3bc added new glob() test 2013-08-19 11:17:13 +02:00
Christopher Jones 8c61758dc7 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Skip test if SKIP_ONLINE_TESTS set
2013-08-14 15:45:46 -07:00
Christopher Jones 9d62807190 Skip test if SKIP_ONLINE_TESTS set 2013-08-14 15:45:06 -07:00
Stanislav Malyshev c793a65690 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  non living code related typo fixes

Conflicts:
	Zend/zend_compile.c
2013-08-04 16:06:24 -07:00
Veres Lajos 8d86597d73 non living code related typo fixes 2013-08-04 16:05:36 -07:00
Veres Lajos e9a95d78ef typo fixes 2013-07-15 00:23:03 -07:00
Veres Lajos 72085b0e5f typo fixes 2013-07-15 00:18:57 -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 02e4d7a290 Merge branch 'pull-request/341'
* pull-request/341: (23 commits)
  typofixes
2013-06-10 14:30:59 -07:00
Stanislav Malyshev ac40c0b562 Merge branch 'pull-request/341'
* pull-request/341: (23 commits)
  typofixes
2013-06-10 14:20:18 -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
Matt Ficken 7d0dd957eb Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fix Test Bug #64714
2013-04-25 11:37:25 -07:00
Matt Ficken 5adf1be45d Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fix Test Bug #64714
2013-04-25 11:37:09 -07:00
Matt Ficken bf5506f511 Fix Test Bug #64714 2013-04-25 11:34:57 -07:00
Xinchen Hui bbb4a44f98 Merge branch 'PHP-5.4' into PHP-5.5 2013-04-03 18:51:19 +08:00
ptarjan 99ad08f9a5 Fix #64572: Clean up after the test
Lets not leave stuff lying around.
2013-04-03 18:50:27 +08:00