Stanislav Malyshev
14d6de97c5
add imap
2015-01-28 10:15:11 -08:00
Xinchen Hui
b7751630d1
Merge branch 'PHP-5.6'
...
Conflicts:
ext/phar/phar_object.c
2015-01-29 00:02:03 +08:00
Xinchen Hui
659395e3dd
Merge branch 'master' of https://git.php.net/repository/php-src
2015-01-29 00:01:24 +08:00
Xinchen Hui
5208113ad1
Merge branch 'PHP-5.5' into PHP-5.6
2015-01-29 00:01:00 +08:00
Xinchen Hui
b2cf3f064b
Fixed bug #68901 (use after free)
2015-01-29 00:00:09 +08:00
Anatol Belski
4d16937449
fix unportable dereferencing
2015-01-28 15:15:38 +01:00
Popa Adrian Marius
be29cb15a6
Merge branch 'master' of https://git.php.net/push/php-src
...
* 'master' of https://git.php.net/push/php-src :
Fixed #68868 (Segfault in clean_non_persistent_constants() in SugarCRM 6.5.20)
2015-01-28 15:39:58 +02:00
Popa Adrian Marius
b9868f23a0
fbird_close if connection_id omitted, the last opened link is assumed , so it was already closed
2015-01-28 15:39:42 +02:00
Xinchen Hui
a0cf025134
Fixed #68868 (Segfault in clean_non_persistent_constants() in SugarCRM 6.5.20)
2015-01-28 17:12:23 +08:00
Dmitry Stogov
638d0cb753
Merge branch 'typed_returns' of github.com:morrisonlevi/php-src into test
...
* 'typed_returns' of github.com:morrisonlevi/php-src:
Implement return types
2015-01-28 06:56:19 +03:00
Xinchen Hui
f2f98e51e1
Merge branch 'master' of https://git.php.net/repository/php-src
2015-01-28 10:55:25 +08:00
Stanislav Malyshev
598c935245
update the .re file for PDO
2015-01-27 13:48:24 -08:00
Levi Morrison
c8576c5a46
Implement return types
...
RFC is documented here: https://wiki.php.net/rfc/return_types
2015-01-27 11:49:56 -07:00
Daniel Lowrey
7d663aa90c
Merge branch 'windows-ssl-timeout-fix'
2015-01-27 13:23:58 -05:00
Daniel Lowrey
4965fe7fb8
Merge https://github.com/bbroerman30/php-src into windows-ssl-timeout-fix
...
Conflicts:
ext/openssl/xp_ssl.c
2015-01-27 13:22:47 -05:00
Stanislav Malyshev
0290571ccf
bump the API no
2015-01-27 09:22:20 -08:00
Xinchen Hui
1828ec21e2
Fixed some annoying warnings
2015-01-27 23:28:31 +08:00
Xinchen Hui
68f5eb7e71
minor CS fix
2015-01-27 20:35:25 +08:00
Márcio Almada
927ebc9789
add another test to #1022
2015-01-27 07:16:22 -03:00
Márcio Almada
f869bf3829
fix failure with shared zvals in php_str_replace_in_subject
2015-01-27 07:16:22 -03:00
Márcio Almada
1c0dcb268c
add failing test for string_replace and array replaces with references
...
```
make test TESTS=ext/standard/tests/strings/str_replace_*.phpt
```
2015-01-27 07:16:22 -03:00
Xinchen Hui
59593ba66c
Fixed #68915 (wrong assertion here)
2015-01-27 15:58:32 +08:00
Brad Broerman
8302d658db
Quick fix
2015-01-26 21:35:35 -05:00
Brad Broerman
db49dd91bd
Fixed windows infinite loop problem.
2015-01-26 20:40:52 -05:00
Stanislav Malyshev
dfe6aea9ca
size_t cleanup for PDO
2015-01-26 16:16:02 -08:00
Bob Weinand
5845f2c0c1
Merge branch 'PHP-5.6'
...
Conflicts:
NEWS
main/streams/filter.c
2015-01-26 22:53:36 +01:00
Bob Weinand
666cb333f7
Merge remote-tracking branch 'origin/PHP-5.5' into PHP-5.6
...
Conflicts:
NEWS
2015-01-26 22:51:37 +01:00
Bob Weinand
b8461eb9ac
Fix call after close if multiple filters are attached
2015-01-26 22:47:35 +01:00
Keyur Govande
5f3dbab0fa
One more bad merge fix
2015-01-26 21:44:14 +00:00
Keyur Govande
f41d58efa0
Fix bad merge
2015-01-26 21:38:43 +00:00
Keyur Govande
6635466bcc
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Add NEWS
Patch commit d9f85373e3
by moving the float_to_double function to a header file.
Fix for bugs #68114 (Build fails on OS X due to undefined symbols) and #68657 (Reading 4 byte floats with Mysqli and libmysqlclient has rounding errors).
Patch commit d9f85373e3
by moving the float_to_double function to a header file.
Fix for bugs #68114 (Build fails on OS X due to undefined symbols) and #68657 (Reading 4 byte floats with Mysqli and libmysqlclient has rounding errors).
Conflicts:
ext/mysqli/mysqli_api.c
ext/mysqlnd/mysql_float_to_double.h
2015-01-26 21:36:36 +00:00
Keyur Govande
4c6918ec17
Patch commit d9f85373e3
by moving the float_to_double function to
...
a header file.
2015-01-26 21:20:29 +00:00
Keyur Govande
b34f8ef599
Fix for bugs #68114 (Build fails on OS X due to undefined symbols)
...
and #68657 (Reading 4 byte floats with Mysqli and libmysqlclient
has rounding errors).
The patch removes support for Decimal floating point numbers and
now defaults to using similar logic as what libmysqlclient does:
convert a 4 byte floating point number into a string, and then the
string into a double. The quirks of MySQL are maintained as seen in
Field_Float::val_str()
2015-01-26 21:20:29 +00:00
Keyur Govande
1933b556b9
Patch commit d9f85373e3
by moving the float_to_double function to
...
a header file.
2015-01-26 21:19:00 +00:00
Keyur Govande
e51980f4e6
Fix for bugs #68114 (Build fails on OS X due to undefined symbols)
...
and #68657 (Reading 4 byte floats with Mysqli and libmysqlclient
has rounding errors).
The patch removes support for Decimal floating point numbers and
now defaults to using similar logic as what libmysqlclient does:
convert a 4 byte floating point number into a string, and then the
string into a double. The quirks of MySQL are maintained as seen in
Field_Float::val_str()
2015-01-26 21:19:00 +00:00
Nikita Popov
e05993dfa2
Remove dl() on fpm-fcgi
2015-01-26 21:00:23 +01:00
Nikita Popov
cb9c99ebd0
Remove preg_replace /e modifier
2015-01-26 21:00:23 +01:00
Nikita Popov
4d3e4d3bf9
Remove assignment of new by reference
2015-01-26 21:00:22 +01:00
Dmitry Stogov
23b683c0d3
Fixed wrong size
2015-01-26 15:33:10 +03:00
Dmitry Stogov
8aa146b810
Fixed use after free
2015-01-26 12:24:33 +03:00
Stanislav Malyshev
f1b2adb881
map fixes
2015-01-25 00:04:18 -08:00
Stanislav Malyshev
cb6fb59b59
Fix the fix for #68884
2015-01-24 23:07:50 -08:00
Xinchen Hui
a98fd7125a
Fixed bug #68897 (Using variable for sort flag in array_multisort cause wrong results)
2015-01-24 22:51:37 +08:00
Márcio Almada
f27e96c2f8
remove unused var, make string.c compilation zero warnings
2015-01-24 00:26:01 -03:00
Dmitry Stogov
e427188755
Fixed memory leak
2015-01-23 21:47:26 +03:00
Anatol Belski
ee8a0b3797
cleanup TSRMLS_*
2015-01-23 18:05:18 +01:00
Anatol Belski
647caea9f7
C89 compat
2015-01-23 15:04:29 +01:00
Xinchen Hui
4369215b8f
Merge branch 'fix-strripos-memleak' of https://github.com/reeze/php-src
2015-01-23 17:35:37 +08:00
Reeze Xia
bdfe4d6558
Fix one more leak when wrong $needle type provide of strripos
2015-01-23 17:14:39 +08:00
Reeze Xia
d44b6e58ba
Fixed memory leak of strripos() when empty needle or haystack
2015-01-23 16:53:58 +08:00