clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-30 22:36:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
93,839 Commits 494 Branches 1,367 Tags 797 MiB
3bfe1c55ae
Commit Graph

93839 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anatol Belski
f806fedd80 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  fix leaks and add one more NULL check
  add NULL check
  fix C89 compat
  fix arg type
 2016-02-29 15:48:51 +01:00
Anatol Belski
d7fd614cc6 fix leaks and add one more NULL check 2016-02-29 15:38:42 +01:00
Anatol Belski
a310c3b484 add NULL check 2016-02-29 15:26:57 +01:00
Anatol Belski
efaafd45b4 fix C89 compat 2016-02-29 15:24:31 +01:00
Anatol Belski
35be4398d1 fix arg type 2016-02-29 15:23:53 +01:00
Anatol Belski
273bb7e9c0 fix nmake clean in phpize mode 2016-02-29 14:58:49 +01:00
Anatol Belski
9ccf3a0292 fix nmake clean in phpize mode 2016-02-29 11:00:09 +01:00
Xinchen Hui
b79b036a31 The test self should be fixed(maybe relates to env?) 
Revert "Fixed test ext/readline/tests/readline_read_history_error_001.phpt"

This reverts commit 69e26f9f8f.
 2016-02-29 15:19:18 +08:00
Xinchen Hui
d0b3a72cea Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0 
* 'PHP-7.0' of git.php.net:/php-src:
  test fixes
  update NEWS
  Fix bug #71536 Access Violation crashes php-cgi.exe
 2016-02-29 15:07:38 +08:00
Xinchen Hui
69e26f9f8f Fixed test ext/readline/tests/readline_read_history_error_001.phpt 2016-02-29 15:07:19 +08:00
Xinchen Hui
6adfc20f04 Fixed segfault with file_cache_only 2016-02-28 15:54:01 +01:00
Anatol Belski
f738abab85 test fixes 2016-02-28 11:53:21 +01:00
Anatol Belski
0ac0604b30 update NEWS 2016-02-28 11:06:55 +01:00
Anatol Belski
93592a9c08 Fix bug #71536 Access Violation crashes php-cgi.exe 2016-02-28 11:02:01 +01:00
Xinchen Hui
8c053d44e4 Fixed segfault with file_cache_only 2016-02-28 11:50:06 +08:00
Dmitry Stogov
e2bf86fbfd Fixed possible crash at PCRE on MSHUTDOWN 2016-02-26 15:14:20 +01:00
Dmitry Stogov
ecea7d3d35 Fixed more synchronisation issues during SHM reload 2016-02-26 15:14:01 +01:00
Dmitry Stogov
e65cc72cb6 Set proper type flags (REFCOUNTED and COPYABLE) according to interned or regular string 2016-02-26 15:13:48 +01:00
Xinchen Hui
c299b272c7 Fixed bug #71660 (array_column behaves incorrectly after foreach by reference) 2016-02-25 16:07:22 +08:00
Nikita Popov
fd561505f4 Fix construction of AO with overloaded object error 
a) Fix uses of zend_string in error message
b) Don't assign the overloaded object as the backing storage, that
   sort of defeats the point. Instead leave the previous value.
 2016-02-24 22:34:50 +01:00
Nikita Popov
0aa7163816 Fix AO object properties separation 2016-02-24 22:34:50 +01:00
Nikita Popov
079f2f7eb3 Forbid exchangeArray() during sorting 
Previously this would leak.
 2016-02-24 22:34:50 +01:00
Nikita Popov
b657554585 Fix typo in foreach_017.phpt 2016-02-24 22:34:50 +01:00
Dmitry Stogov
6842a3674d Fixed possible crash at PCRE on MSHUTDOWN 2016-02-24 23:46:11 +03:00
Dmitry Stogov
43366f8ba8 Fixed more synchronisation issues during SHM reload 2016-02-24 21:15:53 +03:00
Nikita Popov
eb885e9d6e Fix leak on assignment to illegal AO offset 2016-02-24 17:39:16 +01:00
Nikita Popov
ea02f57656 Don't use ht applyCount for AO sorting protection 
Instead use the AOs own applyCount that just got freed up. Using the
apply count of the HashTable has various side effects, e.g. preventing
the ArrayObject from being dumped.
 2016-02-24 17:18:07 +01:00
Nikita Popov
38db6ff306 Remove recursion checks from AO get_properties 
These are pointless, there is no recursion (of that kind) happening
there.
 2016-02-24 17:10:28 +01:00
Nikita Popov
3ea877ca15 Fix "Call to member function on unknown" 
Should be "on null".
 2016-02-24 17:00:25 +01:00
Nikita Popov
d1057cc139 Fixed bug #71470 
Don't report hashtable iterator leaks on unclean shutdown, those
are expected.
 2016-02-24 14:09:03 +01:00
Anatol Belski
bb2856b28c fix NEWS 2016-02-24 12:29:23 +01:00
Remi Collet
17967ecda1 fix NEWS 2016-02-24 12:26:25 +01:00
Anatol Belski
f14c0cc43a sync with improvements in NEWS 2016-02-24 12:23:26 +01:00
Anatol Belski
f463297c51 update NEWS 2016-02-24 12:06:35 +01:00
Anatol Belski
c9778d3eb9 Port patch and test for bug #47803 to 7.0 
See ff115e285a
 2016-02-24 12:03:21 +01:00
Anatol Belski
6e1862d0a8 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  update NEWS
  add test for bug #47803
  Fixed bug #47803
 2016-02-24 11:57:15 +01:00
Anatol Belski
7d7325246c update NEWS 2016-02-24 11:56:12 +01:00
Anatol Belski
90ad6e3c6c add test for bug #47803 2016-02-24 11:49:02 +01:00
Anatol Belski
ff115e285a Fixed bug #47803 
Executing prepared statements is succesfull only for the first two statements

The reworked patch descends to the bug #69526 which is fixed by
this as well. The broken logic in the current code was, that
SQLDescribeParam was executed in odbc_execute every time. This piece
is now moved into odbc_prepare and the results are carried on in an
additional structure.

Since the ext/odbc headers are not being currently installed and the
corresponding structs like odbc_result are not used outside ext/odbc,
the binary compatibility persists. Executing SQLDescribeParam only once
in odbc_prepare is also an optimization as the filds usually won't
change that fast and thus requestind the descriptions on every
execution is not required.
 2016-02-24 11:40:35 +01:00
Dmitry Stogov
ca779add4d Fixed process synchronisation problem, that may cause crashes after opcache restart 2016-02-24 10:54:37 +01:00
Dmitry Stogov
0b9c87a02b Fixed bug #71535 (Integer overflow in zend_mm_alloc_heap()) 2016-02-24 11:04:48 +03:00
Anatol Belski
01e85f3fdc add test for bug #71171 2016-02-23 14:39:17 +01:00
Anatol Belski
cd75429ad8 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  make ext/odbc test credentials configurable
 2016-02-23 14:22:06 +01:00
Anatol Belski
9623d2dd83 make ext/odbc test credentials configurable 2016-02-23 14:21:04 +01:00
Remi Collet
18e3b11d62 missing include 2016-02-22 18:45:18 +01:00
Remi Collet
0d57c06b2c update bundled libzip to 1.1.2 2016-02-22 18:18:30 +01:00
Nikita Popov
78b29310bc Remove check_std_props arg from get_hash_table 
get_properties() is the only place using it, so handle it only
there.
 2016-02-22 13:09:54 +01:00
Nikita Popov
3f5c80e8c2 Don't recurse into USE_OTHER checking STD_PROP_LIST 
If STD_PROP_LIST is explicitly disabled in the constructor, it
should really be disabled.
 2016-02-22 13:04:19 +01:00
Nikita Popov
6c2ca18fe0 Fix typo in previous commit 
Happened to be correct because array is the first member, but
definitely not what I wanted...
 2016-02-22 12:39:07 +01:00
Nikita Popov
fd6ac61064 Fix ArrayObject clone for certain USE_OTHER cases 
We can't simply use HASH_OF, need to use the usual hash table
getter.
 2016-02-22 12:35:00 +01:00