php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-27 17:52:16 +01:00
Code Issues Packages Projects Releases Wiki Activity
106,966 Commits 547 Branches 1,481 Tags
ef01ec08f080987c3614bd5658a87e985e28fa06
Commit Graph

47970 Commits

Author SHA1 Message Date
Christoph M. Becker
ef01ec08f0 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fix #62545: wrong unicode mapping in some charsets
 2018-03-11 18:05:08 +01:00
Christoph M. Becker
2b02e6dff3 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix #62545: wrong unicode mapping in some charsets
 2018-03-11 17:54:45 +01:00
Christoph M. Becker
01ea314e8c Fix #62545: wrong unicode mapping in some charsets 
Undefined characters are best mapped to Unicode REPLACEMENT characters.
 2018-03-11 17:38:28 +01:00
Gabriel Caruso
d0ee2a8254 Add is_countable function 
RFC: https://wiki.php.net/rfc/is-countable
 2018-03-11 16:41:16 +01:00
Gabriel Caruso
57896cf515 Make some skipped tests run, and fix some skip messages 2018-03-11 16:38:00 +01:00
Nikita Popov
bd2ecb01d2 Merge branch 'PHP-7.2' 2018-03-11 16:37:08 +01:00
Thomas Petazzoni
8489ecefd3 ext/sockets: make AI_IDN usage optional 
AI_IDN is not supported by all C libraries (uClibc, musl), so make it
optional, like AI_ALL.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
 2018-03-11 16:35:17 +01:00
Bob Weinand
827dff310b Merge branch 'PHP-7.2' 2018-03-10 15:29:21 +01:00
Bob Weinand
cfd0979be5 Merge branch 'PHP-7.1' into PHP-7.2 2018-03-10 15:21:16 +01:00
Bob Weinand
9c6df8a238 Fix bug #76074 (opcache corrupts variable in for-loop) 2018-03-10 15:20:45 +01:00
Anatol Belski
363e0450aa Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fixed bug #76068 parse_ini_string fails to parse "[foo]\nbar=1|>baz" with segfault
 2018-03-10 11:21:01 +01:00
Anatol Belski
cf0012dad0 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed bug #76068 parse_ini_string fails to parse "[foo]\nbar=1|>baz" with segfault
 2018-03-10 11:20:11 +01:00
Anatol Belski
8417a23973 Fixed bug #76068 parse_ini_string fails to parse "[foo]\nbar=1|>baz" with segfault 2018-03-10 11:18:21 +01:00
Joe Watkins
4b43f5c533 Merge branch 'master' of git://github.com/php/php-src 2018-03-10 10:55:12 +01:00
Christoph M. Becker
d48b233991 Update to Oniguruma 6.7.1 
We also apply the still relevant parts of `oniguruma.patch` and update
the patch accordingly.
 2018-03-10 01:07:00 +01:00
Christoph M. Becker
4095f63a90 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fix #73957: signed integer conversion in imagescale()
 2018-03-10 00:26:25 +01:00
Christoph M. Becker
d709922979 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix #73957: signed integer conversion in imagescale()
 2018-03-10 00:25:11 +01:00
Christoph M. Becker
f1b358c9a9 Fix #73957: signed integer conversion in imagescale() 
We must not pass values to `gdImageScale()` which cannot be represented
by an `unsigned int`.  Instead we return FALSE, according to what we
already did for negative integers.
 2018-03-10 00:17:09 +01:00
Dmitry Stogov
9d139b16c2 Test ReflectionZendExtension class 2018-03-09 12:07:52 +01:00
Gabriel Caruso
701437a948 Remove return types from some magic method in protos 
__construct, __destruct, __wakeup does not have return types defined.
 2018-03-09 12:04:46 +01:00
Anatol Belski
70a1b23c2c Remove unused assignment 2018-03-07 18:09:58 +01:00
Anatol Belski
98aeb528c3 Remove unused assignment 2018-03-07 17:12:27 +01:00
Dmitry Stogov
dcbac8ade6 Fixed use-after-free. 2018-03-07 10:21:51 +03:00
Dmitry Stogov
856b63a632 Avoid double copying 2018-03-06 21:59:02 +03:00
Dmitry Stogov
4d75504d4f Avoid double copying and string length recalculation 2018-03-06 21:19:18 +03:00
Christoph M. Becker
a98eb1ec2c [ci skip] Fix reference notation in protos 2018-03-06 13:22:39 +01:00
Gabriel Caruso
b47b3596ef [ci skip] Use float instead of double in proto 2018-03-06 13:16:18 +01:00
Dmitry Stogov
44e1d2f8a9 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Replaced usafe reference from SHM to process memory with SHM to SHM reference.
 2018-03-06 03:00:46 +03:00
Dmitry Stogov
020a02ef9d Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Replaced usafe reference from SHM to process memory with SHM to SHM reference.
 2018-03-06 02:47:01 +03:00
Dmitry Stogov
50949c9332 Replaced usafe reference from SHM to process memory with SHM to SHM reference. 2018-03-06 02:43:26 +03:00
Dmitry Stogov
47f5f87826 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Don't keep HashTable.pDestructor in SHM and always set it into ZVAL_PTR_DTOR in zval_array_dup(). Keeping pointer to a function in SHM is not safe because of ASLR.
 2018-03-06 01:02:31 +03:00
Dmitry Stogov
b48d2f6d10 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Don't keep HashTable.pDestructor in SHM and always set it into ZVAL_PTR_DTOR in zval_array_dup(). Keeping pointer to a function in SHM is not safe because of ASLR.
 2018-03-06 01:00:14 +03:00
Dmitry Stogov
b711a96acb Don't keep HashTable.pDestructor in SHM and always set it into ZVAL_PTR_DTOR in zval_array_dup(). 
Keeping pointer to a function in SHM is not safe because of ASLR.
 2018-03-06 00:56:16 +03:00
Dmitry Stogov
d740024e35 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fixed invalid destructor
 2018-03-06 00:47:05 +03:00
Dmitry Stogov
b7ebf90221 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed invalid destructor
 2018-03-06 00:46:40 +03:00
Dmitry Stogov
a83581e223 Fixed invalid destructor 2018-03-06 00:46:19 +03:00
Dmitry Stogov
d9d30a7f38 AST is not COPYABLE anymore and its reference-counter doesn't have to be initialized by 2. 2018-03-06 00:30:25 +03:00
Dmitry Stogov
84a0423e05 Set and keep HASH_FLAG_STATIC_KEYS for all HashTables stored in SHM (or file cache). 2018-03-06 00:00:13 +03:00
Dmitry Stogov
d76061d5c1 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fixed invalid destructor
 2018-03-05 23:38:15 +03:00
Dmitry Stogov
53baf6fa1d Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed invalid destructor
 2018-03-05 23:33:53 +03:00
Dmitry Stogov
87553b0730 Fixed invalid destructor 2018-03-05 23:33:08 +03:00
Nikita Popov
4838e9799f Merge branch 'PHP-7.2' 2018-03-05 15:33:34 +01:00
Nikita Popov
634a1ff033 Merge branch 'PHP-7.1' into PHP-7.2 2018-03-05 15:32:39 +01:00
Nikita Popov
fd5bd37ab1 Revert "Fixed bug #75961 (Strange references behavior)" 
This reverts commit 94e9d0a2ae.

This code needs to be mindful about modifications to the array
happening during callback execution. It was written in a way that
only accessed the reference, which is guaranteed not to move. The
changed implementation instead accesses the array slot, leading to
use-after-free.

Run ext/standard/tests/array/bug61967.phpt under valgrind to see
the issue.
 2018-03-05 15:32:21 +01:00
Anatol Belski
cf84e5a529 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Include username into the file cache path
 2018-03-05 15:22:11 +01:00
Anatol Belski
54212dfbf9 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Include username into the file cache path
 2018-03-05 15:21:31 +01:00
Anatol Belski
27a603e811 Include username into the file cache path 2018-03-05 15:16:55 +01:00
Dmitry Stogov
f32b7dbc43 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fixed "opcache.file_cache_fallback" mode.
 2018-03-05 16:21:20 +03:00
Dmitry Stogov
a8fbb15311 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed "opcache.file_cache_fallback" mode.
 2018-03-05 16:15:38 +03:00
Dmitry Stogov
350082ed71 Fixed "opcache.file_cache_fallback" mode. 
It's not safe to change value of ZCG(accel_directives).file_cache_only, becuse it might be altered by INI subsystem.
Use global variable instead.
 2018-03-05 16:01:43 +03:00