9c07ae6341
Cleaned white spaces in PHP_INI definition of phar
...
Removes unnecessary white spaces.
2015-06-19 12:31:03 +02:00
d079a1c9ea
better approach to fix bug #69846
...
don't destroy the current iterator object too early
2015-06-19 11:22:12 +02:00
bb4454b513
Merge branch 'master' of git.php.net:php-src
2015-06-19 09:57:48 +08:00
327e3b338c
Micro optimizations for pcre
2015-06-19 09:56:42 +08:00
e58a1abb00
Fix memory leak (double copy) in SplPriorityQueue
2015-06-19 03:42:59 +02:00
29087f00f6
Merge branch 'PHP-5.6'
2015-06-19 09:36:27 +08:00
bca005c8d9
Merge branch 'PHP-5.5' into PHP-5.6
2015-06-19 09:35:52 +08:00
6a8db93115
Merge branch 'patch-3' of https://github.com/s0ph1e/php-src into PHP-5.5
2015-06-19 09:35:28 +08:00
cdde1be056
Merge branch 'PHP-5.6'
...
* PHP-5.6:
update NEWS
updated NEWS
fixes bug #69835 : phpinfo() does not report many Windows SKUs
2015-06-18 22:05:07 +02:00
657f93e7b9
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
updated NEWS
fixes bug #69835 : phpinfo() does not report many Windows SKUs
2015-06-18 22:03:28 +02:00
a85156db7d
fixes bug #69835 : phpinfo() does not report many Windows SKUs
2015-06-18 22:01:20 +02:00
918de41ec2
partial fix to bug #69846
2015-06-18 20:17:04 +02:00
1edb2e9a10
Remove excess variable in mail.c (5.5 branch)
2015-06-18 20:06:08 +03:00
7a02d138a6
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed bug #69689 (Align PCRE_MINOR with current version)
2015-06-18 17:36:46 +03:00
3930e1f2fa
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #69689 (Align PCRE_MINOR with current version)
2015-06-18 17:35:54 +03:00
ca33ae3eb2
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #69689 (Align PCRE_MINOR with current version)
2015-06-18 17:34:53 +03:00
cc7194dd10
Fixed bug #69689 (Align PCRE_MINOR with current version)
2015-06-18 17:30:21 +03:00
20f3416682
Fixed bug #69872 (uninitialised value in strtr with array)
2015-06-18 22:28:29 +08:00
bfdc9e2805
fix unknown size of void error
2015-06-17 23:43:13 +02:00
51a259f378
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix buffer growth in sockets/conversion.c
Implements extended error messages
2015-06-17 13:34:42 -07:00
c4dd65c723
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix buffer growth in sockets/conversion.c
2015-06-17 13:34:33 -07:00
d241711f44
Fix buffer growth in sockets/conversion.c
...
memset() the *end* of the new buffer, not the beginning
Copy the pointer to the buffer, not its initial contents
Fixes bug 69619
2015-06-17 13:34:20 -07:00
269acaa363
Merge branch 'pull-request/1284'
...
* pull-request/1284:
Rename interface macros
Fix typo in UPGRADING
Move definition of Throwable to zend_exceptions.h/c
Check for zend_ce_throwable instead
Fix some missed tests
Add Throwable tests
Fix previous exception type check
Updated UPGRADING with RFC link
Changed AssertionException to AssertionError
Update exception error messages
Throwable method signatures.
Update exception names in tests after formatting changes.
Merge exception formatting changes.
Make zend_get_exception_base static.
Fix a few missed tests.
Fix handler double copy.
Updated tests to reflect exception class changes.
Remodel exceptions based on Throwable interface
2015-06-17 21:55:03 +02:00
eb702637a9
Implements extended error messages
...
This commit introduces a new constant that can be used to retrieve more
detailed error messages.
This fixes #47222
The new constant LDAP_OPT_DIAGNOSTIC_MESSAGE is defined in PHP when the
underlying library provides (and understands) it. This is the case in
the current OpenLDAP-implementation.
Tanks to Johnny Willer who provided the solution at http://stackoverflow.com/questions/28765077/get-number-of-ad-errors-with-ldap-and-php-ldap-function-return-unprecise-error/28816473#28816473
2015-06-17 15:39:07 +02:00
78fe52475f
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Replaced calls to deprecated openldap functions
Fixed LDAP tests so that base can exists
Conflicts:
ext/ldap/ldap.c
2015-06-17 15:08:47 +02:00
e7af0fe1eb
Replaced calls to deprecated openldap functions
...
ldap_unbind_s -> ldap_unbind_ext
389 -> LDAP_PORT
ldap_init -> ldap_initialize
ldap_bind_s -> ldap_sasl_bind_s
ldap_value_free -> ber_memvfree
Also added ldap_is_ldap_url check
2015-06-17 14:36:38 +02:00
a5629f8845
Fixed LDAP tests so that base can exists
...
Now you can set the base in the env var LDAP_TEST_BASE.
The base has to exists. (before tests were attempting to create/delete
the base itself)
2015-06-17 13:55:13 +02:00
8836404faf
Fixed LDAP tests so that base can exists
...
Now you can set the base in the env var LDAP_TEST_BASE.
The base has to exists. (before tests were attempting to create/delete
the base itself)
2015-06-17 13:50:14 +02:00
c9554b90e4
added regression test for bug #69840
2015-06-17 13:40:19 +02:00
e011e6fdf4
Add a comment
2015-06-17 17:33:55 +08:00
a524a375d9
Improved class type hints checks, by caching resolved class entries in run-time cache.
2015-06-17 12:07:43 +03:00
8c8ad8f40e
Use better hash functions (reuse key and avoid hash value recalculation)
2015-06-17 12:06:33 +03:00
a0b3fd7803
Improved variable name validation
2015-06-17 12:05:58 +03:00
ff9e290438
Fixed bug #69840 (iconv_substr() doesn't work with UTF-16BE)
2015-06-17 09:39:45 +02:00
455c7c8e26
Merge branch 'PHP-5.6'
...
* PHP-5.6:
updated NEWS
updated NEWS
Fixed bug #61221 - imagegammacorrect function loses alpha channel
2015-06-17 02:25:46 +02:00
7958a7b38f
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
updated NEWS
Fixed bug #61221 - imagegammacorrect function loses alpha channel
2015-06-17 02:18:53 +02:00
7469c7e7d0
Fixed bug #61221 - imagegammacorrect function loses alpha channel
...
When applying imagegammacorrect() the alpha channel is now fully retained, instead of being completely lost.
2015-06-17 02:15:59 +02:00
fb346c8f93
Support references in convert_to_*
...
conver_to_* functions now accept REFERENCE values, which will be
unwrapped before performing the usual conversion. This is consistent
with convert_scalar_to_number and matches the expected behavior in
a couple random use-sites I checked.
Also includes a couple fixes/cleanups elsewhere and two tests for
cases that previously didn't work (though the reference issue existed
all over the place).
2015-06-16 19:55:33 +02:00
183c00ddb6
Fix references handling in convert_scalar_to_number
2015-06-16 18:02:45 +02:00
44b7489fef
Drop now superflous check for VIA_TRAMPOLINE
...
This is not handled by USE_ARG_INFO.
2015-06-16 17:51:18 +02:00
3180b8e100
Fixed bug #69802 (Reflection on Closure::__invoke borks type hint class name) (onr more problem)
2015-06-16 13:29:17 +03:00
ed84bff445
Complete fix for problems related to bug #69802
2015-06-16 11:24:35 +03:00
6ae375db31
Fixed bug #69845 (ArrayObject with ARRAY_AS_PROPS broken)
2015-06-16 10:53:53 +03:00
77cf6d81b4
Fix some missed tests
2015-06-15 08:20:30 -05:00
33e71d5c20
Fixed bug #69802 (Reflection on Closure::__invoke borks type hint class name)
2015-06-15 15:44:44 +03:00
ae88a243e4
Rmoved opcache.load_comments.
2015-06-15 14:01:26 +03:00
6e3e1e31e9
Add phpdbg to allowed cli-SAPIs in opcache
2015-06-15 12:31:46 +02:00
0a21a0c752
Removed opcache.load_comments configuration directive. Now doc comments loading costs nothing and always enabled.
2015-06-15 13:18:52 +03:00
7eae1cc2ce
- Updated to version 2015.5 (2015e)
2015-06-15 10:41:32 +01:00
c661e7680f
- Updated to version 2015.5 (2015e)
2015-06-15 10:41:30 +01:00
Dominic