a6be0f3fd6
Merge branch 'array_keys_strict_refs' of https://github.com/tony2001/php-src
2015-10-05 14:50:04 +02:00
a549a3ac17
improve error message
2015-10-04 16:36:53 +02:00
c97198e181
fix incrementing on 32-bit
2015-10-04 12:19:16 +02:00
ba4a85b012
fix coverage report for datelib
2015-10-04 05:39:01 -04:00
4cb6342426
remove useless checks
...
Other platforms than listed in the checks are not supported since
PHP 5.5. We also won't need these checks for a while, so can simplify.
2015-10-03 10:57:32 +02:00
96fe3be7f2
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
fix win10 support
2015-10-03 10:46:10 +02:00
83bef0ef83
fix win10 support
...
dwMajorVersion == 10 there, and generally this check is obsolete
as we don't support dwMajorVersion < 6 since 5.5
2015-10-03 10:44:43 +02:00
e892e2e253
Merge branch 'PHP-5.6' into PHP-7.0
2015-10-03 10:13:44 +02:00
fe1933aae2
Fixed bug #70625
2015-10-03 10:12:11 +02:00
a2f5619303
Updated to version 2015.7 (2015g)
2015-10-02 18:12:18 +01:00
c08824fd72
Updated to version 2015.7 (2015g)
2015-10-02 18:12:16 +01:00
c98ea8465b
Fixed bug #70619 (DateTimeImmutable segfault)
2015-10-02 07:19:21 -07:00
1287c48082
Fix/improve zpp usage
...
The ext/interbase changes are done blindly, fingers crossed.
Some of these are bug fixes, some make zpp usage more idiomatic.
2015-10-02 09:35:00 +02:00
99d5634079
fix dl() function
...
..which was using old macro
2015-09-30 14:40:29 +01:00
a60105d7a4
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Fixed test
5.5.31 now
2015-09-30 13:19:37 +02:00
0fd71d1184
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed test
5.5.31 now
Conflicts:
configure.in
main/php_version.h
2015-09-30 13:19:18 +02:00
d7fb43e30d
Fixed test
2015-09-30 13:18:16 +02:00
3e74df74f9
fix test
2015-09-30 12:18:32 +02:00
07a8e5ce37
Add JSON as exported type, if available. mysqlnd has it, libmysql doesn't export it (for now).
2015-09-30 09:03:35 +02:00
7b787ebbb6
Merge branch 'PHP-5.6' into PHP-7.0
2015-09-30 09:04:00 +02:00
bfd2637068
fix test
2015-09-29 13:04:06 +02:00
dae3ab8e7a
Update openssl_x509_checkpurpose.phpt
2015-09-29 10:41:24 +02:00
fc3580c9d5
add test to openssl ext
2015-09-29 10:41:22 +02:00
560e4fa393
Removed or simplified incorrect SEPARATE_*() macros usage.
2015-09-29 11:17:43 +03:00
694b9af5b6
Remove makedev() check.
2015-09-29 09:14:30 +02:00
46aa628605
Different error message if makedev check fails
2015-09-29 09:14:29 +02:00
6554f721f7
Add support for getrandom(2), add type check on file descriptor
...
Fix to_read, throw exception if syscall fails
Fixes thanks to feedback from sarnold at ##crypto on freenode
Correction on error conditions
Remove dead code (thanks @defuse)
It turns out getrandom can take >256, getentropy refuses.
Better semantics
Thanks @defuse for catching my silly mistake here
Cast to size_t to be explicit
Let's simplify the logic a bit
Let's be consistent; define everything before we do any logic
Continuously check that the file descriptor is still a valid one
Add device type check on fd initialization
2015-09-29 09:14:28 +02:00
208ed0a010
fix test
...
cutting out the '/' is not critical, but allows to avoid forking
2015-09-29 09:11:52 +02:00
d6e8426ebf
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Better fix for bug #70433
Conflicts:
ext/phar/dirstream.c
ext/phar/util.c
2015-09-28 21:43:16 -07:00
2e267bd3c7
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Better fix for bug #70433
Conflicts:
ext/phar/dirstream.c
2015-09-28 21:42:08 -07:00
1ddf72180a
Better fix for bug #70433
2015-09-28 21:41:02 -07:00
4c6f4863fa
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
fix memory leak
FIx bug #70433 - Uninitialized pointer in phar_make_dirstream when zip entry filename is "/"
Conflicts:
ext/phar/dirstream.c
2015-09-28 20:45:02 -07:00
51b23cd0f0
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix memory leak
FIx bug #70433 - Uninitialized pointer in phar_make_dirstream when zip entry filename is "/"
Conflicts:
ext/phar/dirstream.c
2015-09-28 20:44:28 -07:00
f98ab19dc0
fix memory leak
2015-09-28 20:43:18 -07:00
e78ac461db
FIx bug #70433 - Uninitialized pointer in phar_make_dirstream when zip entry filename is "/"
2015-09-28 17:12:35 -07:00
e7574a5329
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Fix bug #69720 : Null pointer dereference in phar_get_fp_offset()
Conflicts:
ext/phar/util.c
2015-09-28 17:00:32 -07:00
f39a4ee0c9
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix bug #69720 : Null pointer dereference in phar_get_fp_offset()
2015-09-28 16:59:46 -07:00
d698f0ae51
Fix bug #69720 : Null pointer dereference in phar_get_fp_offset()
2015-09-28 15:56:51 -07:00
899753f240
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Fix bug #70480 (php_url_parse_ex() buffer overflow read)
2015-09-28 13:08:44 -07:00
629e4da7cc
Fix bug #70480 (php_url_parse_ex() buffer overflow read)
2015-09-28 11:31:14 -07:00
be6546fac9
Add support for parameters to tick functions, on C level. This is only
...
for extensions that want to use register tick functions. Userland tick
functions are unaffected.
2015-09-28 11:21:17 +02:00
7e3cd7cadf
Merge branch 'PHP-5.6' into PHP-7.0
2015-09-25 14:29:06 +02:00
59de2c037c
Fixed bug #70572 segfault in mysqlnd_connect
2015-09-25 14:06:28 +02:00
37c85ebb94
check for test requirement
2015-09-25 11:50:15 +02:00
c75346624a
fix data type and warning
2015-09-25 11:50:13 +02:00
a05fc48055
Extended zend_extension API to allow storing additional data associated with op_arrays in opcache SHM. (op_array->reserved[])
2015-09-25 11:50:38 +03:00
f509706318
Make necessary separation (it might be possible to fix this in a better way, but this will requre some refactoring)
2015-09-25 10:59:27 +03:00
67aff16d94
fix ident
2015-09-25 08:30:44 +02:00
c21d18ef95
Cleanup: avoid useless array duplication
2015-09-25 02:20:05 +03:00
01d5beddf4
Cleanup
2015-09-25 01:36:10 +03:00
Bob Weinand