Daniel Lowrey
8680fc8331
Improve test to target specific issue
2015-03-04 10:23:46 -05:00
Daniel Lowrey
a39b1898fe
Misc updates/cleanup
2015-03-04 09:24:27 -05:00
Daniel Lowrey
3e841470c9
Add TLS ALPN extension support in crypto client/server streams
2015-02-28 17:41:30 -05:00
Daniel Lowrey
13acb7ec65
Add stream_socket_crypto_info() function
2015-02-28 17:41:29 -05:00
Daniel Lowrey
3ff36c265f
Update for OpenSSL 1.0.2 compatibility
2015-02-28 17:41:29 -05:00
Xinchen Hui
54e2020ee3
Fixed bug #69144 (strtr not replacing with partly matching replace pairs)
2015-02-28 22:37:46 +08:00
Xinchen Hui
49d19f6c7c
Fixed test?
2015-02-28 22:35:55 +08:00
Reeze Xia
1359dfd18f
Revert mktime()/gmmktime()'s arginfo
...
$is_dst parameter has been removed in commit: 9c5eaac18b
2015-02-28 18:32:18 +08:00
Reeze Xia
968a9f4807
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed bug #69141 Missing arguments in reflection info for some builtin functions
2015-02-28 16:43:41 +08:00
Reeze Xia
1b240ff9e3
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #69141 Missing arguments in reflection info for some builtin functions
2015-02-28 16:40:06 +08:00
Reeze Xia
f824f91ac9
Fixed bug #69141 Missing arguments in reflection info for some builtin functions
...
This include:
- setcookie (missing "httponly")
- setrawcookie (missing "httponly")
- spl_autoload_register (missing 2 optional params)
- mktime (missing "is_dst")
- gmmktime (missing "is_dst")
2015-02-28 16:37:14 +08:00
Bob Weinand
b22caa81ee
Remove useless date warning
2015-02-27 23:27:09 +01:00
Nikita Popov
b41b229d78
Merge branch 'PHP-5.5' into PHP-5.6
2015-02-27 23:23:49 +01:00
Дмитрий Пацура
e9c6798721
Fix ARG_INFO for levenshtein
...
This can work with 2 parameters (require)
refs http://php.net/manual/ru/function.levenshtein.php
refs https://github.com/phalcon/zephir/issues/753
2015-02-27 23:23:24 +01:00
Дмитрий Пацура
5806e370d2
Fix ARG_INFO for levenshtein
...
This can work with 2 parameters (require)
refs http://php.net/manual/ru/function.levenshtein.php
refs https://github.com/phalcon/zephir/issues/753
2015-02-27 23:15:35 +01:00
Anatol Belski
5aec067b34
fix dir separator in tests
2015-02-27 16:48:09 +01:00
Xinchen Hui
1aea0f4b59
Merge branch 'master' of https://git.php.net/repository/php-src
2015-02-27 23:35:56 +08:00
Xinchen Hui
794a28832d
Merge branch 'PHP-5.6'
...
Conflicts:
ext/soap/soap.c
2015-02-27 23:35:37 +08:00
Xinchen Hui
86ba1a2444
Merge branch 'PHP-5.5' into PHP-5.6
2015-02-27 23:32:59 +08:00
Xinchen Hui
997b7e5630
Fixed bug #69085 (SoapClient's __call() type confusion through unserialize()).
2015-02-27 23:32:32 +08:00
Anatol Belski
30830bcefd
Fixed bug #69115 crash in mail
...
There were two issues
- php_pcre_replace could be used directly and sbject_str could be NULL
- the Windows sendmail variant was freeing something passed from the outside
2015-02-27 10:42:20 +01:00
Xinchen Hui
a8927cd647
Merge branch 'PHP-5.6'
2015-02-27 11:43:49 +08:00
Xinchen Hui
cfaf7c3b5f
Merge branch 'PHP-5.5' into PHP-5.6
2015-02-27 11:42:57 +08:00
Xinchen Hui
3e82816ba1
Fixed bug #69125 (Array numeric string as key)
2015-02-27 11:42:36 +08:00
Xinchen Hui
5b8a504519
Merge branch 'PHP-5.6'
...
Conflicts:
ext/date/php_date.c
2015-02-27 11:13:07 +08:00
Xinchen Hui
2d1a3ecd27
Merge branch 'PHP-5.5' into PHP-5.6
2015-02-27 11:11:45 +08:00
Taoguang Chen
e441d71baa
fix bug#68942's patch
...
Fix type confusion bug in unserialize() with DateTimeZone. https://bugs.php.net/bug.php?id=68942
2015-02-27 10:41:53 +08:00
Xinchen Hui
34d397e267
better name
2015-02-25 20:49:07 +08:00
Xinchen Hui
60f18026eb
Merge branch 'PHP-5.6'
...
Conflicts:
ext/opcache/Optimizer/zend_optimizer.c
2015-02-25 20:16:15 +08:00
Xinchen Hui
d3615b5fb1
Merge branch 'PHP-5.5' into PHP-5.6
...
Conflicts:
ext/opcache/tests/bug69038.phpt
2015-02-25 20:13:47 +08:00
Xinchen Hui
d508ff9640
Improve fix for #69038
2015-02-25 20:07:02 +08:00
Xinchen Hui
aadf7366e0
Merge branch 'PHP-5.6'
...
Conflicts:
ext/spl/spl_observer.c
2015-02-25 18:23:54 +08:00
Xinchen Hui
9641bac0f5
Merge branch 'PHP-5.5' into PHP-5.6
2015-02-25 18:22:18 +08:00
Xinchen Hui
ffdc5728c8
Fixed bug #69108 ("Segmentation fault" when (de)serializing SplObjectStorage)
2015-02-25 18:21:59 +08:00
Dmitry Stogov
c2c78dc963
Added specialized versions of DO_FCALL handler:
...
DO_ICALL - for internal functions
DO_UCALL - for user functions
DO_FCALL_BY_NAME - plain, most probably user, funcstions (not methods)
2015-02-25 10:37:21 +03:00
Dmitry Stogov
5f278e4d3a
Use cache_slot offsets instead of indexes (simplify run-time instructions)
2015-02-25 01:52:35 +03:00
Dmitry Stogov
dcb96c2e03
Split INIT_FCALL_BY_NAME inti INIT_FCALL_BY_NAME(CONST+STRING) and INIT_DYNAMIC_CALL(CONST-STRING|TMPVAR|CV)
2015-02-24 22:29:47 +03:00
Dmitry Stogov
745504ea2a
Make current() and key() receive argument by value.
2015-02-24 17:40:25 +03:00
Popa Adrian Marius
3e6380d64b
Use Firebird default home folder, replace Interbase with Firebird
2015-02-24 13:58:14 +02:00
Julien Pauli
09c43bd398
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Updated NEWS
updated NEWS
curl: add new proxy constants
2015-02-23 11:23:57 +01:00
Julien Pauli
5256ffd4fe
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
updated NEWS
curl: add new proxy constants
2015-02-23 11:23:00 +01:00
Linus Unnebäck
63ab6d8249
curl: add new proxy constants
2015-02-23 11:19:36 +01:00
Julien Pauli
ee2f749a22
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed test fails for bug68557
2015-02-23 10:35:35 +01:00
Xinchen Hui
d5a1a3342b
Fixed test fails for bug68557
2015-02-23 10:35:16 +01:00
Derick Rethans
a18ffe407c
Merge branch 'pr/1103'
2015-02-23 08:57:20 +00:00
Jakub Zelenka
ad2b751985
Merge branch 'PHP-5.6'
...
The fix for master is a bit different (it's fixed in encoder)
2015-02-22 20:54:05 +00:00
Jakub Zelenka
97d809a8a5
Merge branch 'PHP-5.5' into PHP-5.6
...
Conflicts:
ext/json/json.c
2015-02-22 20:35:03 +00:00
Jakub Zelenka
591dbcabe5
Fix bug #64695 (JSON_NUMERIC_CHECK has issues with strings that are numbers plus the letter e)
2015-02-22 20:22:47 +00:00
Anatol Belski
a31f4ef884
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix Win32 SSPI initialization for digest authentication in cURL
2015-02-22 16:27:27 +01:00
Anatol Belski
e656932d0e
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix Win32 SSPI initialization for digest authentication in cURL
2015-02-22 16:26:52 +01:00