php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-21 15:08:16 +02:00
Code Issues Packages Projects Releases Wiki Activity
78,245 Commits 547 Branches 1,483 Tags
feb4eb850d2e901d6cae04fa6cafd385cdafe6aa
Commit Graph

8153 Commits

Author SHA1 Message Date
Johannes Schlüter 82dfe1acc8 Merge branch 'PHP-5.6' 2014-01-10 16:04:29 +01:00
Johannes Schlüter 45d46d7edd Merge branch 'PHP-5.5' into PHP-5.6 2014-01-10 16:02:46 +01:00
Johannes Schlüter 98e06a10d3 fix encoding 2014-01-10 15:57:40 +01:00
Anatol Belski e797e058c5 Merge branch 'PHP-5.6' 
* PHP-5.6:
  one more extension for the basename test
 2014-01-05 19:22:11 +01:00
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 ac875f8f7e Merge branch 'PHP-5.6' 
* PHP-5.6:
  improved the fix for bug #66395
  Fixed bug #66009 Failed compilation of PHP extension with C++ std library using VS 2012
  updated NEWS
  Fixed bug #66009 Failed compilation of PHP extension with C++ std library using VS 2012
 2014-01-05 19:13:40 +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 b502c0a3dc Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #66395 basename function doesn't remove drive letter
 2014-01-03 22:39:17 +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 b209c27302 Merge branch 'PHP-5.6' 2014-01-03 11:37:32 +08:00
Xinchen Hui 4e2ae5f5ca Here need to be str_efree 
found by ext/standard/tests/general_functions/phpinfo2.php fails
 2014-01-03 11:36:50 +08:00
Xinchen Hui 0f53e37494 Merge branch 'PHP-5.6' 2014-01-03 11:09:07 +08:00
Xinchen Hui c081ce628f Bump year 2014-01-03 11:08:10 +08:00
Xinchen Hui 47c9027772 Bump year 2014-01-03 11:06:16 +08:00
Xinchen Hui c0d060f5c0 Bump year 2014-01-03 11:04:26 +08:00
Joe Watkins ca8ff0725b update credits 2013-12-24 09:04:32 +00:00
Joe Watkins e538c1ad3f update credits headers 2013-12-24 09:03:22 +00:00
Kalle Sommer Nielsen aed4b086ac Eliminate the TSRMLS_FETCH() calls in the ticks functions and hook 2013-12-18 09:32:26 +01:00
Kalle Sommer Nielsen c83598119b Kill a TSRMLS_FETCH() in php_stream_context_set() by passing TSRMLS_CC to it 
# For mysqlnd: Relevant PHP_API_VERSION are put in place for cross version compatibility
 2013-12-18 09:19:24 +01:00
Kalle Sommer Nielsen 2eb9bd316d Merge branch 'master' of https://git.php.net/push/php-src 2013-12-18 07:27:14 +01:00
Kalle Sommer Nielsen d14670ccdb Eliminate another TSRMLS_FETCH() in i_zend_is_true() 
# Affected extensions have all been updated, ext/opcache and ext/zip
# both have macros for cross version compatibility
 2013-12-18 07:25:05 +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
Eric Stenson 50377b5bf2 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-13 10:42:32 -08:00
Sara Golemon 9adfcea241 Use 'user@example.com' rather than 'user@company.com' in tests 
Using some arbitrary 3rd party's domain name is clowny,
even if it never tries to send.
 2013-12-04 07:51:43 -08:00
Sara Golemon f0248bdce5 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Use 'user@example.com' rather than 'user@company.com' in tests
 2013-12-04 07:50:45 -08:00
Sara Golemon 32a4cc8353 Use 'user@example.com' rather than 'user@company.com' in tests 
Using some arbitrary 3rd party's domain name is clowny,
even if it never tries to send.
 2013-12-04 07:49:16 -08:00
Dmitry Stogov 0f39089384 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed tests
 2013-12-02 12:05:29 +04:00
Dmitry Stogov 2f5ab04c5f Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed tests
 2013-12-02 12:04:07 +04:00
Dmitry Stogov edbefd1d5c Fixed tests 2013-12-02 11:53:35 +04:00
Anatol Belski 696d286911 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fixed test
  And here is the real fix for #66124
  Fix for Bug #66124 (mysqli under mysqlnd loses precision when bind_param with 'i')
 2013-11-21 21:29:35 +01:00
Anatol Belski ad5a63e8bc Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fixed test
 2013-11-21 21:29:02 +01:00
Anatol Belski 345032946c fixed test 2013-11-21 21:24:47 +01:00
Yasuo Ohgaki bf91f101a6 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  added a test to cover distinction between boolean return value of unserialize function and deserializing serialized boolean
 2013-11-20 07:25:04 +09:00
Yasuo Ohgaki b8b92bd790 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  added a test to cover distinction between boolean return value of unserialize function and deserializing serialized boolean
 2013-11-20 07:23:54 +09:00
Yasuo Ohgaki 0d558afc05 Fix WS in serialization_error_002.phpt 2013-11-20 07:17:53 +09:00
Aaron Hamid 050dd59c63 added a test to cover distinction between boolean return value of unserialize function and deserializing serialized boolean 2013-11-20 07:14:53 +09:00
Jeff Welch 72a8489a12 Fixed tests that fail with non-default serialize_precision configurations. 
See:

 * https://bugs.php.net/bug.php?id=64760
 * 4dc4302
 2013-11-20 06:17:34 +09:00
Jeff Welch 101c780500 Fixed tests that fail with non-default serialize_precision configurations. 
See:

 * https://bugs.php.net/bug.php?id=64760
 * 4dc4302
 2013-11-20 06:17:23 +09:00
Jeff Welch b4210efe76 Fixed tests that fail with non-default serialize_precision configurations. 
See:

 * https://bugs.php.net/bug.php?id=64760
 * 4dc4302
 2013-11-20 06:14:32 +09:00
Xinchen Hui 140a42f779 Merge branch 'PHP-5.5' into PHP-5.6 2013-11-17 17:20:13 +08:00
Xinchen Hui de79c51555 Merge branch 'PHP-5.4' into PHP-5.5 2013-11-17 17:05:04 +08:00
Xinchen Hui 823e330c75 Fixed Bug #66094 (unregister_tick_function tries to cast a Closure to a string) 2013-11-17 17:04:37 +08:00
Remi Collet 74ab30e216 fix merge 2013-11-13 13:21:12 +01:00