php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-14 19:41:05 +02:00
Code Issues Packages Projects Releases Wiki Activity
93,994 Commits 547 Branches 1,483 Tags
9f3eab44dfc99ac032dbfc84418925ee3adcd175
Commit Graph

93994 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Márcio Almada
9f3eab44df allow null coalescing (??) on constant expressions 2016-04-21 01:22:28 +02:00
Nikita Popov
85867268fd Merge branch 'PHP-5.6' into PHP-7.0 
Conflicts:
	Zend/zend_compile.c
 2016-04-20 19:00:02 +02:00
Adam Harvey
c4f69b6dfd Fix ZTS builds by adding a missing TSRMLS_FETCH(). 2016-04-20 18:58:29 +02:00
Nikita Popov
77bb96d7c9 Fix bug #71737 
Also improve the error message for $this used in parameters.
 2016-04-20 18:38:40 +02:00
Xinchen Hui
ede06b7e20 Update NEWS 2016-04-20 08:42:06 -07:00
Nikita Nefedov
19759a5602 Fix RECV opcode to handle all kinds of exceptions 
fix RECV opcode to handle exceptions thrown from user-defined error handler
as a result Notice error from failed type coercion
 2016-04-20 08:40:44 -07:00
Stanislav Malyshev
7d93363bd9 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Better fix for #71952

Conflicts:
	ext/gd/gd.c
 2016-04-19 23:45:21 -07:00
Stanislav Malyshev
c02301b666 Better fix for #71952 2016-04-19 23:44:00 -07:00
Stanislav Malyshev
086729bb6c Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fix bug #71952: Corruption inside imageaffinematrixget

Conflicts:
	ext/gd/gd.c
 2016-04-18 23:34:26 -07:00
Stanislav Malyshev
f061867fd3 Fix bug #71952: Corruption inside imageaffinematrixget 2016-04-18 23:33:21 -07:00
Xinchen Hui
5ea2b3625d Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0 
* 'PHP-7.0' of git.php.net:/php-src:
  Prevent usage in GC after free.
  Fix SEND_USER as well
  Fix SEND_ARRAY+PREFER_REF SHM corruption
 2016-04-19 10:59:35 +08:00
Xinchen Hui
7648f20de3 Fixed bug #72051 (The reference in CallbackFilterIterator doesn't work as expected) 2016-04-19 10:59:10 +08:00
Dmitry Stogov
e46be0cd19 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Prevent usage in GC after free.
 2016-04-19 01:37:24 +03:00
Dmitry Stogov
ffc697ac27 Prevent usage in GC after free. 2016-04-19 01:31:49 +03:00
Nikita Popov
73958ca62d Fix SEND_USER as well 
Missed copy&paste code here
 2016-04-18 22:45:38 +02:00
Nikita Popov
a8792158bd Fix SEND_ARRAY+PREFER_REF SHM corruption 
Make the behavior consistent between namespaced and not and with
PHP 5.6.
 2016-04-18 18:26:20 +02:00
Xinchen Hui
aa9f8e695c combine conditions 2016-04-18 19:13:54 +08:00
Bob Weinand
b08bde185d Merge branch 'PHP-7.0' of https://github.com/php/php-src into PHP-7.0 2016-04-18 12:13:59 +02:00
Ferenc Kovacs
8f35ee49ee Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  mark frequent intermittent fpm test with XFAIL
 2016-04-18 09:04:55 +02:00
Ferenc Kovacs
3a16f511d9 mark frequent intermittent fpm test with XFAIL 2016-04-18 09:04:27 +02:00
Ferenc Kovacs
50cfe0a15c Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  prepare for 5.6.21RC1
 2016-04-18 08:15:47 +02:00
Ferenc Kovacs
6497d40521 prepare for 5.6.21RC1 2016-04-18 08:14:16 +02:00
Christopher Jones
3b54d93b2f Bump version in test 2016-04-18 11:15:01 +10:00
Nikita Popov
d1a38743a5 Fix SEND_UNPACK array separation 
Separating only immutable arrays is not enough.
 2016-04-16 22:33:23 +02:00
Bob Weinand
6bb81d2c5f Fix non-/Zend tests too 2016-04-16 20:57:28 +02:00
Bob Weinand
15d1d4f45b Fixed bug #72038 (Function calls with values to a by-ref parameter don't always throw a notice) 2016-04-16 20:36:19 +02:00
Dominic Luechinger
02766d0180 Adds new curl option CURLOPT_SSL_VERIFYSTATUS to enable OCSP verification 2016-04-16 18:30:19 +02:00
Anatol Belski
fd6f7b8341 Add test for bug #72028 2016-04-16 16:11:22 +02:00
Nikita Popov
d8590940a1 Use symtable lookup for arrays in array_column 2016-04-16 09:59:01 +02:00
Nikita Popov
28801bf249 Respect property visibility in array_column 2016-04-16 09:59:01 +02:00
Nikita Popov
c0d8dc5bd7 Fixed bug #72031 2016-04-16 09:58:57 +02:00
Xinchen Hui
7e01c518b6 Fixed bug #72028 (pg_query_params(): NULL converts to empty string) 
I don't have a pgsql server by hand, so no test script, but the fix must
be right.
 2016-04-15 21:29:27 -07:00
Xinchen Hui
05d53dee7d Fixed bug #71972 (Cyclic references causing session_start(): Failed to decode session object) 2016-04-15 21:08:51 -07:00
Lior Kaplan
edb569b439 Align NEWS entry format 2016-04-15 22:17:37 +03:00
Lior Kaplan
7d61d0712b Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Align NEWS entry format
 2016-04-15 22:09:05 +03:00
Lior Kaplan
5142bf27b2 Align NEWS entry format 2016-04-15 22:07:47 +03:00
Anatol Belski
c0de35273a update NEWS 2016-04-15 13:41:09 +02:00
Anatol Belski
d263616525 Fixed #71062 pg_convert() doesn't accept ISO 8601 for datatype timestamp 2016-04-15 13:38:49 +02:00
Xinchen Hui
163d26d584 Fixed failed with libedit 2016-04-15 11:57:53 +08:00
Xinchen Hui
8a17b1a241 Fixed bug #72014 (Including a file with anonymous classes multiple times leads to fatal error) 2016-04-14 20:21:19 +08:00
Christopher Jones
ec358dac03 On second thoughts, keep this in sync with 5.6 for 71422 2016-04-14 15:49:15 +10:00
Christopher Jones
96ece22a05 Merge branch 'PHP-5.6' into PHP-7.0 2016-04-14 15:09:02 +10:00
Christopher Jones
d1e81a59a7 Fix old comment cut-n-paste error 2016-04-14 15:08:42 +10:00
Christopher Jones
12cd25bb1a Fixed bug #71600 (oci_fetch_all segfaults when selecting more than 8 columns) (Tian Yang) 2016-04-14 14:09:16 +10:00
Christopher Jones
cef4bc61c1 Merge fix for bug #71422. No code changed needed in PHP 7 2016-04-14 13:55:32 +10:00
Christopher Jones
8f2e6da806 Fixed bug #71422 (Fix ORA-01438: value larger than specified precision allowed for this column) 2016-04-14 13:50:01 +10:00
Christopher Jones
be491a6b3b Merge branch 'PHP-7.0' of https://git.php.net/repository/php-src into PHP-7.0 2016-04-14 13:43:13 +10:00
Anatol Belski
8e6549c354 update NEWS 2016-04-12 19:37:36 +02:00
Anatol Belski
e49580c96e Fixed bug #68849 bindValue is not using the right data type 2016-04-12 19:12:45 +02:00
Nikita Popov
4e585eb429 Fix ZEND_SEPARATE for by-val func returning ref zval 2016-04-12 14:44:29 +02:00