php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-19 22:11:12 +02:00
Code Issues Packages Projects Releases Wiki Activity
100,744 Commits 547 Branches 1,483 Tags
4fb7665c099eb2e2ee75ead8e77479866ab01b2a
Commit Graph

100744 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Andrea Faulds
e88ab74886 Merge branch 'PHP-7.0' into PHP-7.1 2017-08-12 01:37:47 +01:00
Andrea Faulds
b59718bdc4 Fix bug #74725 (html_errors=1 breaks unhandled exceptions) 2017-08-12 01:37:20 +01:00
Xinchen Hui
46ecda76ba Update NEWS 2017-08-09 11:29:32 +08: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
Anatol Belski
42608a3401 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Remove mistakingly added line
 2017-08-08 19:40:28 +02:00
Anatol Belski
afb20f4895 Remove mistakingly added line 2017-08-08 19:37:55 +02:00
Anatol Belski
315d3910fa Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Sync makefile options for phpize
 2017-08-08 17:59:15 +02:00
Anatol Belski
075986f214 Sync makefile options for phpize 
- run target
- debugger mode
 2017-08-08 17:58:10 +02: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
Anatol Belski
9ebf813ea4 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Unify EOL
 2017-08-07 17:03:54 +02:00
Anatol Belski
4c9fe5a490 Unify EOL 2017-08-07 17:03:17 +02:00
Anatol Belski
da966a93ac Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  fix test target for phpize
 2017-08-07 16:45:41 +02:00
Anatol Belski
d058e30917 fix test target for phpize 2017-08-07 16:45:02 +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
Anatol Belski
54e2224df7 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  update NEWS
 2017-08-02 21:50:26 +02:00
Anatol Belski
3e5b8c1e89 [ci skip] update NEWS 2017-08-02 21:49:56 +02:00
Anatol Belski
9ba2cfd33e update NEWS 2017-08-02 21:49:21 +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
9871555090 Merge branch 'PHP-7.0' into PHP-7.1 2017-08-02 18:16:56 +02:00
Nikita Popov
9ca1b2a775 Merge remote-tracking branch 'php-src/PHP-7.0' into PHP-7.0 2017-08-02 18:16:18 +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
George Wang
e78712791d take care of compile warnings. 2017-08-02 11:59:41 -04: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
Joe Watkins
9c6262f39b Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  fixed #endif comments
 2017-08-02 08:35:38 +01:00
clwu
b2934d2612 fixed #endif comments 2017-08-02 08:35:27 +01:00
Julien Pauli
f0d40286e7 Updated NEWS 2017-08-01 16:02:26 +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
0c0cbb43da Updated NEWS 2017-08-01 16:01:43 +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
Anatol Belski
eab66f9068 remove dup of the binary file, rely on a test runtime copy instead 2017-07-30 17:51:27 +02:00
Christoph M. Becker
2d6d1ec55b Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Shrink another large image
 2017-07-30 16:27:38 +02:00
Christoph M. Becker
2d96fdd54f Shrink another large image 
This image is only used for testing `BITMAPV5HEADER` support in
`getimagesize()` (see bf9ad4e). Therefore it is not necessary to have
a big image; a single pixel is sufficient.
 2017-07-30 16:26:06 +02:00
Christoph M. Becker
82e4ad3983 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Shrink test image
 2017-07-30 14:44:52 +02:00
Christoph M. Becker
74a696d53b Shrink test image 
The last (`IDAT`) chunk in this file starting at `0x5e265` reports to
have a length of `0x2000` bytes, but there are only `0x1D9B` bytes
left. Simply cutting the first `IDAT` chunk which starts at `0x31` and
also reports a length of `0x2000` at the same offset should produce the
same test results (while reducing the file size to 7.628 bytes).
 2017-07-30 14:43:37 +02:00
Christoph M. Becker
f213ee5952 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Skip this test if ext/gd is not available
 2017-07-30 13:30:18 +02:00