b8e30a492a
Use more general optimisation patterns
2016-02-26 21:02:41 +03:00
b378c7cff1
Merge branch 'PHP-7.0'
...
* PHP-7.0:
Fixed bug #71660 (array_column behaves incorrectly after foreach by reference)
2016-02-25 16:07:38 +08:00
c299b272c7
Fixed bug #71660 (array_column behaves incorrectly after foreach by reference)
2016-02-25 16:07:22 +08:00
a1c9bd8803
Merge branch 'PHP-7.0'
2016-02-24 22:35:14 +01:00
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
0aa7163816
Fix AO object properties separation
2016-02-24 22:34:50 +01:00
079f2f7eb3
Forbid exchangeArray() during sorting
...
Previously this would leak.
2016-02-24 22:34:50 +01:00
b657554585
Fix typo in foreach_017.phpt
2016-02-24 22:34:50 +01:00
2517835c64
Merge branch 'PHP-7.0'
...
* PHP-7.0:
Fixed possible crash at PCRE on MSHUTDOWN
2016-02-24 23:47:05 +03:00
6842a3674d
Fixed possible crash at PCRE on MSHUTDOWN
2016-02-24 23:46:11 +03:00
1a46917740
Merge branch 'PHP-7.0'
...
* PHP-7.0:
Fixed more synchronisation issues during SHM reload
2016-02-24 21:16:35 +03:00
43366f8ba8
Fixed more synchronisation issues during SHM reload
2016-02-24 21:15:53 +03:00
55c0de8f95
Merge branch 'PHP-7.0'
2016-02-24 17:44:33 +01:00
eb885e9d6e
Fix leak on assignment to illegal AO offset
2016-02-24 17:39:16 +01:00
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
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
3ea877ca15
Fix "Call to member function on unknown"
...
Should be "on null".
2016-02-24 17:00:25 +01:00
9d137f37fc
Merge branch 'PHP-7.0'
2016-02-24 14:09:14 +01:00
d1057cc139
Fixed bug #71470
...
Don't report hashtable iterator leaks on unclean shutdown, those
are expected.
2016-02-24 14:09:03 +01:00
a3b1df41c0
Merge branch 'PHP-7.0'
...
* PHP-7.0:
fix NEWS
2016-02-24 12:30:00 +01:00
bb2856b28c
fix NEWS
2016-02-24 12:29:23 +01:00
64631972bc
Merge branch 'PHP-7.0'
...
* PHP-7.0:
fix NEWS
2016-02-24 12:26:37 +01:00
17967ecda1
fix NEWS
2016-02-24 12:26:25 +01:00
d313d6aedd
Merge branch 'PHP-7.0'
...
* PHP-7.0:
update NEWS
Port patch and test for bug #47803 to 7.0
2016-02-24 12:07:06 +01:00
f463297c51
update NEWS
2016-02-24 12:06:35 +01:00
c9778d3eb9
Port patch and test for bug #47803 to 7.0
...
See ff115e285a
2016-02-24 12:03:21 +01:00
69caec2c23
Merge branch 'PHP-7.0'
...
* PHP-7.0:
update NEWS
add test for bug #47803
Fixed bug #47803
2016-02-24 11:57:46 +01:00
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
7d7325246c
update NEWS
2016-02-24 11:56:12 +01:00
90ad6e3c6c
add test for bug #47803
2016-02-24 11:49:02 +01:00
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
1481c61911
Merge branch 'PHP-7.0'
...
* PHP-7.0:
Fixed bug #71535 (Integer overflow in zend_mm_alloc_heap())
2016-02-24 11:05:58 +03:00
0b9c87a02b
Fixed bug #71535 (Integer overflow in zend_mm_alloc_heap())
2016-02-24 11:04:48 +03:00
85ade00465
fix callback signature compat
2016-02-23 18:18:34 +01:00
c1b3a3d935
Merge branch 'PHP-7.0'
...
* PHP-7.0:
add test for bug #71171
2016-02-23 14:39:49 +01:00
01e85f3fdc
add test for bug #71171
2016-02-23 14:39:17 +01:00
38e77fd4d4
Merge branch 'PHP-7.0'
...
* PHP-7.0:
make ext/odbc test credentials configurable
2016-02-23 14:22:39 +01:00
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
9623d2dd83
make ext/odbc test credentials configurable
2016-02-23 14:21:04 +01:00
2d1559f827
Move free_chunk and resize_chunk into memory pool
...
Drops 24 bytes from each chunk. For the example in bug #71468 it
reduces memory usage by 30%.
2016-02-22 19:40:32 +01:00
42fe5e6791
Drop mysqlnd mempool refcount
...
This member was no longer used.
Also fix handling of from_pool in resize_chunk. It was setting
pool to NULL instead of from_pool to FALSE.
2016-02-22 19:40:32 +01:00
79db0859f0
Merge branch 'PHP-7.0'
...
* PHP-7.0:
missing include
2016-02-22 18:45:30 +01:00
18e3b11d62
missing include
2016-02-22 18:45:18 +01:00
29cc010829
Merge branch 'PHP-7.0'
...
* PHP-7.0:
update bundled libzip to 1.1.2
2016-02-22 18:18:43 +01:00
0d57c06b2c
update bundled libzip to 1.1.2
2016-02-22 18:18:30 +01:00
d5769d4234
Merge branch 'PHP-7.0'
2016-02-22 13:11:24 +01:00
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
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
7e81b8adbb
Merge branch 'PHP-7.0'
2016-02-22 12:40:30 +01:00
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
Dmitry Stogov