php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-17 13:01:02 +02:00
Code Issues Packages Projects Releases Wiki Activity
100,776 Commits 547 Branches 1,483 Tags
9a72a7c58fab41ebeee76fcbbd5027f05a8fbeee
Commit Graph

44377 Commits

Author SHA1 Message Date
Derick Rethans
9a72a7c58f Merge branch 'PHP-7.0' into PHP-7.1 2017-08-16 11:14:47 +01:00
Derick Rethans
5d2c303438 Fixed stupid test 2017-08-16 11:14:41 +01:00
Derick Rethans
4dc8f4f9d1 Merge branch 'PHP-7.0' into PHP-7.1 2017-08-16 09:51:28 +01:00
Derick Rethans
7829f9b1d2 Added timelib version to phpinfo() 2017-08-16 09:51:21 +01:00
Remi Collet
44209573e3 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  cleanup
 2017-08-16 07:46:23 +02:00
Remi Collet
01735f4d9f cleanup 2017-08-16 07:46:07 +02:00
Derick Rethans
336cfd9980 Merge branch 'PHP-7.0' into PHP-7.1 2017-08-15 20:24:21 +01:00
Derick Rethans
3df753c6ca Remove removed header files from configuration files. 2017-08-15 20:22:41 +01:00
Derick Rethans
584db6f38f Merged PHP-7.0 by hand due to conflicts. 2017-08-15 15:06:18 +01:00
Derick Rethans
bdd56f3107 Upgrade timelib to 2017.05beta7 2017-08-15 14:10:23 +01:00
Dmitry Stogov
3bc1226804 Made test 32/64-bit independent 2017-08-15 13:12:54 +03:00
Dmitry Stogov
0f3e01f5cc Skip 64-bit related test 2017-08-15 13:00:45 +03:00
Xinchen Hui
4f8e703854 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #75075 (unpack with X* causes infinity loop)
 2017-08-15 12:34:37 +08:00
Xinchen Hui
d8c80af71e Fixed bug #75075 (unpack with X* causes infinity loop) 2017-08-15 12:34:13 +08:00
Tianfang Yang
e112d71435 Merge branch 'PHP-7.0' into PHP-7.1 2017-08-14 21:21:11 -04:00
Tianfang Yang
259477826c Prepare for PECL release 2017-08-14 21:14:14 -04:00
Anatol Belski
1f3b87dc11 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Test cleanup improvements, files might be locked in the test process
 2017-08-14 14:39:58 +02:00
Anatol Belski
ab07265573 Test cleanup improvements, files might be locked in the test process 2017-08-14 13:08:04 +02:00
Anatol Belski
bd0b0cc8c9 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  fix test cleanup
 2017-08-14 12:55:58 +02:00
Anatol Belski
71fd58652f fix test cleanup 2017-08-14 12:55:14 +02:00
Tianfang Yang
4d936c1254 Merge branch 'PHP-7.0' into PHP-7.1 2017-08-14 00:23:41 -04:00
Tianfang Yang
f555224743 Sync OCI8 on PHP 7.x branches 2017-08-13 23:44:24 -04:00
Anatol Belski
3069ad8dd1 Fixed bug #75063 2017-08-14 00:44:19 +02:00
Christoph M. Becker
207105b1a3 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #73793 (WDDX uses wrong decimal seperator)
 2017-08-13 21:03:45 +02:00
Christoph M. Becker
f64be0b013 Fixed bug #73793 (WDDX uses wrong decimal seperator) 
The WDDX specification[1] requires to serialize floats with a decimal
point, but `snprintf()` is locale-dependent and may use a decimal
comma. We fix that afterwards by replacing an eventual comma with a
point.

[1] <http://xml.coverpages.org/wddx0090-dtd-19980928.txt>
 2017-08-13 20:51:53 +02:00
Christoph M. Becker
de5a5f6fdc Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Skip this test if ext/session is not available
 2017-08-13 18:07:42 +02:00
Christoph M. Becker
472b25921e Skip this test if ext/session is not available 2017-08-13 18:05:45 +02:00
Nikita Popov
4fb7665c09 Merge branch 'PHP-7.0' into PHP-7.1 2017-08-12 13:15:48 +02:00
Nikita Popov
1a23ebc1ff Fixed bug #74103 and bug #75054 
Directly fail unserialization when trying to acquire an r/R
reference to an UNDEF HT slot. Previously this left an UNDEF and
later deleted the index/key from the HT.

What actually caused the issue here is a combination of two
factors: First, the key deletion was performed using the hash API,
rather than the symtable API, such that the element was not actually
removed if it used an integral string key. Second, a subsequent
deletion operation, while collecting trailing UNDEF ranges, would
mark the element as available for reuse (leaving a corrupted HT
state with nNumOfElemnts > nNumUsed).

Fix this by failing early and dropping the deletion code.
 2017-08-12 13:11:35 +02:00
Xinchen Hui
307acb6618 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #75049 (spl_autoload_unregister can't handle spl_autoload_functions results)
 2017-08-09 11:29:13 +08:00
Xinchen Hui
b06f8cb58b Fixed bug #75049 (spl_autoload_unregister can't handle spl_autoload_functions results) 2017-08-09 11:28:53 +08:00
Darek Slusarczyk
86aa1ca990 Merge branch 'PHP-7.0' into PHP-7.1 2017-08-08 16:05:13 +02:00
Darek Slusarczyk
618dcd6520 JSON: fix config.w32 / Install headers on windows 2017-08-08 15:52:53 +02:00
Remi Collet
aee20e637a Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  use AC_DEFINE + win32
 2017-08-04 13:21:41 +02:00
Remi Collet
159e5c1048 use AC_DEFINE + win32 2017-08-04 13:21:28 +02:00
Anatol Belski
21c6ba3412 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Increase expected timing on Travis
 2017-08-03 15:07:47 +02:00
Anatol Belski
9689796c10 Increase expected timing on Travis 
If 5ms to read/write 8 bytes still has issue, probably next this test
should skip on Travis to avoid false positive fails.
 2017-08-03 15:05:22 +02:00
Nikita Popov
4988e83fe9 Merge branch 'PHP-7.0' into PHP-7.1 2017-08-02 18:50:04 +02:00
Andreas Treichel
c2b8066efb Bug #74975: Different serialization for classes 2017-08-02 18:49:26 +02:00
Nikita Popov
63607375f5 Merge branch 'PHP-7.0' into PHP-7.1 2017-08-02 18:09:09 +02:00
Fabien Villepinte
2cc1cbf2f4 Fix Bug #75001: Wrong reflection on mb_eregi_replace 2017-08-02 18:08:42 +02:00
Fabien Villepinte
15abb2b56e Fix test transliterator_create_inverse_basic.phpt 2017-08-02 18:04:43 +02:00
Anatol Belski
1fdc518971 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #75002 Null Pointer Dereference in timelib_time_clone
 2017-08-02 16:41:48 +02:00
Derick Rethans
b112d09013 Fixed bug #75002 Null Pointer Dereference in timelib_time_clone 2017-08-02 16:40:48 +02:00
Remi Collet
5f030924c1 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  fix build with old system libsqlite (sqlite3_errstr may be missing)
 2017-08-02 14:03:02 +02:00
Remi Collet
666cb6c802 fix build with old system libsqlite (sqlite3_errstr may be missing) 2017-08-02 14:01:56 +02:00
Julien Pauli
cd06b5af09 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Updated NEWS
  Fix #75015. Crash in SPL destructors
 2017-08-01 16:02:00 +02:00
Julien Pauli
64e6ddc7f7 Fix #75015. Crash in SPL destructors 2017-08-01 15:59:54 +02:00
Anatol Belski
d9d152b895 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Test to cover the change in ce1a0d97
 2017-08-01 12:50:52 +02:00
Anatol Belski
a8e25fdbf8 Test to cover the change in ce1a0d97 2017-08-01 12:49:45 +02:00