Anatol Belski
ffabfc703d
fix exports
2015-03-23 15:09:06 +01:00
Anatol Belski
5539cb5972
indicate if an ext was forced shared globally
2015-03-23 15:09:04 +01:00
Anatol Belski
7a13715459
fix shared compilation
2015-03-23 15:09:03 +01:00
Anatol Belski
f195870a9e
implemented --with-all-shared option
2015-03-23 15:09:01 +01:00
Dmitry Stogov
bdc96afbdd
Merge branch 'master' of git.php.net:php-src
...
* 'master' of git.php.net:php-src:
Also add preg_replace_callback_array in NEWS
update NEWS with group use declarations implementation
2015-03-23 12:01:19 +03:00
Dmitry Stogov
f596c953e4
Fixed PHP_CHECK_BUILTIN_EXPECT setting
2015-03-23 12:00:37 +03:00
Xinchen Hui
eaf394e9e3
Also add preg_replace_callback_array in NEWS
2015-03-23 16:51:06 +08:00
Xinchen Hui
d96ff5105e
Merge branch 'master' of https://github.com/marcioAlmada/php-src
2015-03-23 16:49:46 +08:00
Anatol Belski
44fd3902c0
added UPGRADING notes to ext/ftp changes
2015-03-23 08:42:06 +01:00
Anatol Belski
585a5748e8
Merge branch 'PHP-5.6'
...
* PHP-5.6:
updated libs versions
updated libs versions
2015-03-23 08:39:33 +01:00
Anatol Belski
c2ec4f90d2
updated libs versions
2015-03-23 08:38:58 +01:00
Anatol Belski
8fe9715d05
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
updated libs versions
2015-03-23 08:38:25 +01:00
Márcio Almada
c9f29f143e
update NEWS with group use declarations implementation
2015-03-23 04:36:29 -03:00
Anatol Belski
a52385fc02
updated libs versions
2015-03-23 08:35:36 +01:00
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
ec8dd442f5
Merge branch 'pull-request/1191'
...
* pull-request/1191:
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:23 -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
012e525044
Merge branch 'pull-request/1188'
...
* pull-request/1188:
Reduce downstream patches
2015-03-22 21:34:13 -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
941989fa31
Merge branch 'pull-request/1186'
...
* pull-request/1186:
Move check for __builtin_expect to configure
2015-03-22 21:11:43 -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
Stanislav Malyshev
3b9fcc4d0d
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Renamed test case to match with reported bug
Fixed serialization of non string values on __sleep
Conflicts:
ext/standard/var.c
2015-03-22 20:35:35 -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
ad51c459f7
Merge branch 'pull-request/1192'
...
* pull-request/1192:
add CURL_HTTP_VERSION_2_0 and CURL_VERSION_HTTP2
2015-03-22 18:56:12 -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