Stanislav Malyshev
28fdf6a131
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed #68021 - get_browser() browser_name_regex
2015-03-22 22:13:21 -07:00
Stanislav Malyshev
3342a248a2
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed #68021 - get_browser() browser_name_regex
2015-03-22 22:13:08 -07:00
Tjerk Meesters
5b5742c016
Fixed #68021 - get_browser() browser_name_regex
...
Replaced expression delimiter with tilde (~) and escape where necessary.
2015-03-22 22:12:26 -07:00
Stanislav Malyshev
32bd6568d3
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Print checking message for all ODBC drivers
Change default option of ODBC drivers to no to enable bulding standalone ODBC
2015-03-22 22:05:12 -07:00
Stanislav Malyshev
a1bca171d2
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Print checking message for all ODBC drivers
Change default option of ODBC drivers to no to enable bulding standalone ODBC
Conflicts:
ext/odbc/config.m4
2015-03-22 22:04:41 -07:00
Lior Kaplan
6f5ed34d20
Print checking message for all ODBC drivers
...
This makes the output more readble in case no ODBC driver was selected
2015-03-22 22:03:38 -07:00
Lior Kaplan
7a41574239
Change default option of ODBC drivers to no to enable bulding standalone ODBC
2015-03-22 22:03:29 -07:00
Stanislav Malyshev
081a812b49
Merge branch 'PHP-5.6'
...
* PHP-5.6:
oops, forgot TSRMLS_CC
Conflicts:
ext/date/php_date.c
2015-03-22 21:56:40 -07:00
Stanislav Malyshev
57f835e148
oops, forgot TSRMLS_CC
2015-03-22 21:55:34 -07:00
Stanislav Malyshev
6929089db0
fix warning & improve error handling in CURL
2015-03-22 21:51:58 -07:00
Stanislav Malyshev
62859309b0
silence warning
2015-03-22 21:43:05 -07:00
Stanislav Malyshev
736afd48cf
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Reduce downstream patches
2015-03-22 21:33:52 -07:00
lesniewskister
c12e031530
Reduce downstream patches
...
As per http://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/lang/php/5.6/patches/patch-ext_gd_libgd_gdcache_h?rev=1.1&content-type=text/x-cvsweb-markup
2015-03-22 21:33:45 -07:00
Stanislav Malyshev
dc6d8f7838
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Adding a new `createFromImmutable` method to the `DateTime` class to mirror the current `DateTime::createFromMutable()`
Conflicts:
ext/date/php_date.c
2015-03-22 21:09:00 -07:00
Stanislav Malyshev
cc2fd00942
Merge branch 'pull-request/1145'
...
* pull-request/1145:
Putting whitespace back to the way it was.
Updating the `DateTime_verify` test to include the new method in the reflected method list
Whoops! String length....
Adding a new test for the new method
Adding a new `createFromImmutable` method to the `DateTime` class to mirror the current `DateTime::createFromMutable()`
2015-03-22 21:04:41 -07:00
Stanislav Malyshev
aa22e80b1a
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Adding a new `createFromImmutable` method to the `DateTime` class to mirror the current `DateTime::createFromMutable()`
2015-03-22 21:03:46 -07:00
Trevor Suarez
c2e22556ba
Adding a new createFromImmutable
method to the DateTime
class to mirror the current DateTime::createFromMutable()
2015-03-22 20:54:25 -07:00
Juan Basso
3e7f47cb03
Renamed test case to match with reported bug
2015-03-22 20:34:59 -07:00
Juan Basso
4076a4d2a9
Fixed serialization of non string values on __sleep
...
Returning just N; (null) on the __sleep makes the number of fields/values be incomplete and corrupting the generated value from serialize, making impossible to unserialize it.
Conflicts:
ext/standard/var.c
2015-03-22 20:31:40 -07:00
Stanislav Malyshev
b62eec67df
Merge branch 'pull-request/1057'
...
* pull-request/1057:
Renamed test case to match with reported bug
Fixed serialization of non string values on __sleep
2015-03-22 20:27:35 -07:00
Stanislav Malyshev
be2e0b39ba
Merge branch 'PHP-5.6'
...
* PHP-5.6:
add CURL_HTTP_VERSION_2_0 and CURL_VERSION_HTTP2
2015-03-22 18:55:04 -07:00
Stanislav Malyshev
c6384a7908
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
add CURL_HTTP_VERSION_2_0 and CURL_VERSION_HTTP2
2015-03-22 18:54:48 -07:00
Masaki Kagaya
1badfd8171
add CURL_HTTP_VERSION_2_0 and CURL_VERSION_HTTP2
2015-03-22 18:52:42 -07:00
Stanislav Malyshev
cd5802e1b3
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Bacport fix bug #68741 - Null pointer dereference
Check that the type is correct
Conflicts:
ext/standard/incomplete_class.c
2015-03-22 18:33:39 -07:00
Stanislav Malyshev
fce9a856e7
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Bacport fix bug #68741 - Null pointer dereference
Check that the type is correct
2015-03-22 18:32:16 -07:00
Stanislav Malyshev
723ffe2e89
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Bacport fix bug #68741 - Null pointer dereference
Check that the type is correct
2015-03-22 18:30:56 -07:00
Stanislav Malyshev
968fbc6acf
Bacport fix bug #68741 - Null pointer dereference
2015-03-22 18:30:05 -07:00
Stanislav Malyshev
fb83c76dee
Check that the type is correct
2015-03-22 18:17:47 -07:00
Stanislav Malyshev
5a5b63774b
Merge branch 'pull-request/1091'
...
* pull-request/1091:
Stop trying to call the callback after it has thrown an exception. Also, as an exception has been thrown, there is no need to have a separate error message.
Fix freeing null segfault. Added test for behaviour.
Conflicts:
ext/sqlite3/tests/bug68760.phpt
2015-03-22 16:48:54 -07:00
Stanislav Malyshev
574b9a4e60
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix #68760 : Fix freeing null segfault. Added test for behaviour.
Fix #68760 : Fix freeing null segfault. Added test for behaviour.
Conflicts:
ext/sqlite3/sqlite3.c
2015-03-22 16:47:54 -07:00
Stanislav Malyshev
40037f1474
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix #68760 : Fix freeing null segfault. Added test for behaviour.
Conflicts:
ext/sqlite3/tests/bug68760.phpt
2015-03-22 16:46:30 -07:00
Danack
0c27a8eb61
Fix #68760 : Fix freeing null segfault. Added test for behaviour.
2015-03-22 16:46:02 -07:00
Danack
1ec430d4ed
Fix #68760 : Fix freeing null segfault. Added test for behaviour.
2015-03-22 16:44:06 -07:00
Anatol Belski
63d7cd7d5b
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
cosmetic fix to default odbcver
Remove extraneous strlen() call
2015-03-23 00:07:43 +01:00
Anatol Belski
a759c40872
cosmetic fix to default odbcver
2015-03-23 00:07:09 +01:00
Anatol Belski
6b01927126
cosmetic fix to default odbcver
2015-03-23 00:06:00 +01:00
Rasmus Lerdorf
d33636f764
Remove extraneous strlen() call
2015-03-21 08:29:12 -07:00
Rasmus Lerdorf
7fce3607ea
Remove extraneous strlen() call
2015-03-21 08:28:40 -07:00
Rasmus Lerdorf
f01071f55f
Remove extraneous strlen() call
2015-03-21 08:26:06 -07:00
Derick Rethans
a86a871bd0
- Updated to version 2015.2 (2015b)
2015-03-21 14:51:14 +01:00
Derick Rethans
a73d0b0fb3
- Updated to version 2015.2 (2015b)
2015-03-21 14:51:11 +01:00
Derick Rethans
b98a486606
- Updated to version 2015.2 (2015b)
2015-03-21 14:51:09 +01:00
Xinchen Hui
784c60ab6d
Improve test scripts
2015-03-21 21:11:14 +08:00
Xinchen Hui
a4529cc0e5
Fixed memleak
2015-03-21 20:17:04 +08:00
Xinchen Hui
4180226117
More error conditions
2015-03-21 16:54:45 +08:00
Xinchen Hui
5f845cdc48
Merge branch 'master' of https://git.php.net/repository/php-src
2015-03-21 15:56:52 +08:00
Xinchen Hui
2f6dbfc26b
Improved impelmentation(and cleanup behaviro with errors conditions)
2015-03-21 15:56:42 +08:00
Rasmus Lerdorf
4d10e15845
Fix a couple of warnings
2015-03-20 23:32:07 -07:00
Xinchen Hui
c524dd6d1e
Merge branch 'rfc-preg-replace-callback-array' of https://github.com/zxcvdavid/php-src
...
Conflicts:
Zend/zend_vm_gen.php
ext/pcre/php_pcre.c
2015-03-21 14:01:11 +08:00
Xinchen Hui
775a257cef
Only used in ZTS
2015-03-21 13:58:29 +08:00