]>
granicus.if.org Git - php/log
Kalle Sommer Nielsen [Thu, 20 Oct 2016 08:57:38 +0000 (10:57 +0200)]
Fix compiler warnings, always cast to zend_long from sqlite3_int64 when converting to a zval
Kalle Sommer Nielsen [Thu, 20 Oct 2016 08:56:08 +0000 (10:56 +0200)]
Ignore the return value of sqlite3->busyTimeout() if their "API Armor" is not enabled.
The sqlite3_busy_timeout() function can only ever return SQLITE_OK if the armor is not compiled in, which means we can skip this error check
Joe Watkins [Thu, 20 Oct 2016 04:34:22 +0000 (05:34 +0100)]
news entry for pr #2135
Joe Watkins [Thu, 20 Oct 2016 04:33:12 +0000 (05:33 +0100)]
Merge branch 'pull-request/2135'
Joe Watkins [Thu, 20 Oct 2016 04:25:49 +0000 (05:25 +0100)]
news entry for pr #2152
Joe Watkins [Thu, 20 Oct 2016 04:25:03 +0000 (05:25 +0100)]
Merge branch 'pull-request/2152'
Dmitry Stogov [Wed, 19 Oct 2016 22:17:55 +0000 (01:17 +0300)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fixed typo
Dmitry Stogov [Wed, 19 Oct 2016 22:17:40 +0000 (01:17 +0300)]
Fixed typo
Dmitry Stogov [Wed, 19 Oct 2016 20:12:17 +0000 (23:12 +0300)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Introduced HT_IS_PACKED() and HT_IS_WITHOUT_HOLES() macros. (Benjamin Coutu)
Dmitry Stogov [Wed, 19 Oct 2016 20:10:42 +0000 (23:10 +0300)]
Introduced HT_IS_PACKED() and HT_IS_WITHOUT_HOLES() macros. (Benjamin Coutu)
Joe Watkins [Wed, 19 Oct 2016 12:45:27 +0000 (13:45 +0100)]
Merge branch 'master' of git.php.net:/php-src
Joe Watkins [Wed, 19 Oct 2016 12:43:31 +0000 (13:43 +0100)]
Implement #72612 (libxmlrc uses system malloc instead of PHP alloc routines)
Kalle Sommer Nielsen [Wed, 19 Oct 2016 07:02:41 +0000 (09:02 +0200)]
T1Lib support was removed in 7.0
Kalle Sommer Nielsen [Wed, 19 Oct 2016 07:01:29 +0000 (09:01 +0200)]
Fix typo
Kalle Sommer Nielsen [Wed, 19 Oct 2016 05:10:28 +0000 (07:10 +0200)]
Poor copy/paste mistake, nobody saw I used getrusage.[c|h] as skeleton here!
Kalle Sommer Nielsen [Wed, 19 Oct 2016 04:44:30 +0000 (06:44 +0200)]
Move these files to the same compilation batch instead of two
Kalle Sommer Nielsen [Wed, 19 Oct 2016 04:29:15 +0000 (06:29 +0200)]
Ignore notices with headers already being defined to their magic HAVE_<name>_H define on Windows.
This is very minor and only happens so far for zlib.h, which both ext/zip and ext/zlib looks for.
Kalle Sommer Nielsen [Tue, 18 Oct 2016 23:14:15 +0000 (01:14 +0200)]
Improve the config.simple.bat for Windows a little;
This adds --with-config-profile=foobar, this generates a config.foobar.bat file in the root of php-src directory with the relevant configuration arguments.
Kalle Sommer Nielsen [Tue, 18 Oct 2016 21:29:28 +0000 (23:29 +0200)]
Added config.simple.bat to .gitignore
Kalle Sommer Nielsen [Tue, 18 Oct 2016 21:25:59 +0000 (23:25 +0200)]
Make proc_nice() more in line with that of Unix, as discussed with Anatol
Kalle Sommer Nielsen [Tue, 18 Oct 2016 21:14:46 +0000 (23:14 +0200)]
Always include the header for nice() on Windows
Kalle Sommer Nielsen [Tue, 18 Oct 2016 21:13:30 +0000 (23:13 +0200)]
Added config.simple for the Windows build system, this is pretty much
like running configure for only the core of PHP and sapi/cli for quick
and fast building.
buildconf
config.simple
nmake
Release_TS\php -v
(This also enables --with-mp for multi processing for a faster build)
Anatol Belski [Tue, 18 Oct 2016 17:44:47 +0000 (19:44 +0200)]
Merge branch 'PHP-7.1'
* PHP-7.1:
update NEWS
update NEWS
Anatol Belski [Tue, 18 Oct 2016 17:44:20 +0000 (19:44 +0200)]
update NEWS
Anatol Belski [Tue, 18 Oct 2016 17:43:57 +0000 (19:43 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
update NEWS
Anatol Belski [Tue, 18 Oct 2016 17:43:12 +0000 (19:43 +0200)]
update NEWS
Anatol Belski [Tue, 18 Oct 2016 17:14:54 +0000 (19:14 +0200)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fixed bug #73329 (Float)"Nano" == NAN
Anatol Belski [Tue, 18 Oct 2016 17:14:14 +0000 (19:14 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #73329 (Float)"Nano" == NAN
Anatol Belski [Tue, 18 Oct 2016 17:11:18 +0000 (19:11 +0200)]
Fixed bug #73329 (Float)"Nano" == NAN
The special cases (float)"inf", etc. were never intended and are
caused by the updated strtod lib. While it might be nice as an
easy way to produce Inf and NaN special values, it was never
documented and cause BC breaches.
Anatol Belski [Tue, 18 Oct 2016 16:26:11 +0000 (18:26 +0200)]
Merge branch 'PHP-7.1'
* PHP-7.1:
sync NEWS
sync NEWS
Anatol Belski [Tue, 18 Oct 2016 16:24:42 +0000 (18:24 +0200)]
sync NEWS
Anatol Belski [Tue, 18 Oct 2016 16:22:52 +0000 (18:22 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
sync NEWS
Anatol Belski [Tue, 18 Oct 2016 16:18:04 +0000 (18:18 +0200)]
sync NEWS
48f1a178 is reverted
Christoph M. Becker [Tue, 18 Oct 2016 12:56:20 +0000 (14:56 +0200)]
Make this test meaningful
We're not only checking that hash_update_file() succeeds, but rather
that it properly works.
Furthermore, we fix the SKIPIF section – we don't need mhash to run the
test, and we don't need to check for unsupported PHP versions.
We also shorten the test name to avoid cluttering the test reports with
unnecessary detail.
Johannes Schlüter [Tue, 18 Oct 2016 12:48:17 +0000 (14:48 +0200)]
Install ext/json headers so that other extension can parse, too
Bob Weinand [Tue, 18 Oct 2016 12:32:12 +0000 (14:32 +0200)]
Merge branch 'PHP-7.1'
Bob Weinand [Tue, 18 Oct 2016 12:31:49 +0000 (14:31 +0200)]
Merge remote-tracking branch 'origin/PHP-7.0' into PHP-7.1
Christoph M. Becker [Tue, 18 Oct 2016 12:28:49 +0000 (14:28 +0200)]
Use our own domains to test getmxrr()
Christoph M. Becker [Tue, 18 Oct 2016 12:16:46 +0000 (14:16 +0200)]
Remove superfluous checks for PNG support
PNG support is required to build ext/gd, so there's no need to check
for it in the tests.
Bob Weinand [Tue, 18 Oct 2016 12:13:20 +0000 (14:13 +0200)]
Fixed bug #73338 (Exception thrown from error handler may crash)
Dmitry Stogov [Tue, 18 Oct 2016 12:11:16 +0000 (15:11 +0300)]
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
Revert "Fix bug #47890 #73215 uniqid() should use better random source"
Dmitry Stogov [Tue, 18 Oct 2016 12:10:03 +0000 (15:10 +0300)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fixed bug #73337 (try/catch not working with two exceptions inside a same operation)
Revert "Fix bug #47890 #73215 uniqid() should use better random source"
Revert "Fix bug #47890 #73215 uniqid() should use better random source"
Update NEWS
Dmitry Stogov [Tue, 18 Oct 2016 12:09:44 +0000 (15:09 +0300)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #73337 (try/catch not working with two exceptions inside a same operation)
Revert "Fix bug #47890 #73215 uniqid() should use better random source"
Update NEWS
Dmitry Stogov [Tue, 18 Oct 2016 12:04:49 +0000 (15:04 +0300)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fixed bug #73337 (try/catch not working with two exceptions inside a same operation)
Dmitry Stogov [Tue, 18 Oct 2016 11:48:01 +0000 (14:48 +0300)]
Fixed bug #73337 (try/catch not working with two exceptions inside a same operation)
Joe Watkins [Tue, 18 Oct 2016 10:30:45 +0000 (11:30 +0100)]
Revert "Fix bug #47890 #73215 uniqid() should use better random source"
This reverts commit
48f1a17886d874dc90867c669481804de90509e8 .
Joe Watkins [Tue, 18 Oct 2016 10:30:33 +0000 (11:30 +0100)]
Revert "Fix bug #47890 #73215 uniqid() should use better random source"
This reverts commit
48f1a17886d874dc90867c669481804de90509e8 .
Joe Watkins [Tue, 18 Oct 2016 10:30:19 +0000 (11:30 +0100)]
Revert "Fix bug #47890 #73215 uniqid() should use better random source"
This reverts commit
48f1a17886d874dc90867c669481804de90509e8 .
Dmitry Stogov [Tue, 18 Oct 2016 09:41:10 +0000 (12:41 +0300)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fixed type inference rules.
Update NEWS
Dmitry Stogov [Tue, 18 Oct 2016 09:39:33 +0000 (12:39 +0300)]
Fixed type inference rules.
Yasuo Ohgaki [Tue, 18 Oct 2016 00:28:18 +0000 (09:28 +0900)]
Update NEWS
Yasuo Ohgaki [Tue, 18 Oct 2016 00:28:08 +0000 (09:28 +0900)]
Update NEWS
Yasuo Ohgaki [Tue, 18 Oct 2016 00:14:57 +0000 (09:14 +0900)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fix bug #47890 #73215 uniqid() should use better random source
Yasuo Ohgaki [Tue, 18 Oct 2016 00:14:48 +0000 (09:14 +0900)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix bug #47890 #73215 uniqid() should use better random source
Yasuo Ohgaki [Tue, 18 Oct 2016 00:04:57 +0000 (09:04 +0900)]
Fix bug #47890 #73215 uniqid() should use better random source
Christoph M. Becker [Mon, 19 Sep 2016 20:48:22 +0000 (22:48 +0200)]
Add PHP bindings for setting and getting the image resolution
We expose the image resolution related GD functionality to userland
by introducing `imageresolution()` as getter/setter. Given only the
image argument, it returns the current resolution as indexed array.
Given only a second argument, it sets the horizontal and vertical
resolution to this value. Given three arguments, it sets the horizontal
and vertical resolution to the given arguments, respectively.
Christoph M. Becker [Mon, 17 Oct 2016 22:02:18 +0000 (00:02 +0200)]
Merge branch 'PHP-7.1'
Christoph M. Becker [Mon, 17 Oct 2016 22:00:37 +0000 (00:00 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Yasuo Ohgaki [Mon, 17 Oct 2016 21:54:10 +0000 (06:54 +0900)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Simply return FALSE from session_gc(). Error could be annoying because internal save handlers may return -1 when GC cannot be performed for reasons
Yasuo Ohgaki [Mon, 17 Oct 2016 21:52:52 +0000 (06:52 +0900)]
Simply return FALSE from session_gc(). Error could be annoying because internal save handlers may return -1 when GC cannot be performed for reasons
Christoph M. Becker [Mon, 17 Oct 2016 21:37:00 +0000 (23:37 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
We also use ZEND_LONG_(MAX|MIN) now instead of LONG_(MAX|MIN).
Christoph M. Becker [Mon, 17 Oct 2016 14:58:49 +0000 (16:58 +0200)]
Fix #73333:
2147483647 is fetched as string
We return all integers that can be represented as such by PHP as
integers, and only those that exceed the possible range as strings.
On builds which represent integers with 64 bits, the range check is
unnecessary and might cause code checkers to complain, so we skip this
special casing via the preprocessor according to
<http://git.php.net/?p=php-src.git;a=commit;h=
99d087e5 >.
Yasuo Ohgaki [Mon, 17 Oct 2016 21:18:21 +0000 (06:18 +0900)]
Add save handler explanations for documentation purpose
Adam Baratz [Mon, 17 Oct 2016 21:06:49 +0000 (17:06 -0400)]
Remove dead code
Dmitry Stogov [Mon, 17 Oct 2016 21:06:50 +0000 (00:06 +0300)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Use simple "one-pass" algorithm.
Dmitry Stogov [Mon, 17 Oct 2016 21:06:20 +0000 (00:06 +0300)]
Use simple "one-pass" algorithm.
Anatol Belski [Mon, 17 Oct 2016 19:28:19 +0000 (21:28 +0200)]
Merge branch 'PHP-7.1'
* PHP-7.1:
sync NEWS
Merge branch 'pull-request/1817'
Merge branch 'pull-request/1816'
Merge branch 'pull-request/1814'
Merge branch 'pull-request/1808'
Merge branch 'pull-request/1817'
Merge branch 'pull-request/1816'
Merge branch 'pull-request/1814'
Merge branch 'pull-request/1808'
Anatol Belski [Mon, 17 Oct 2016 19:27:32 +0000 (21:27 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
sync NEWS
Merge branch 'pull-request/1817'
Merge branch 'pull-request/1816'
Merge branch 'pull-request/1814'
Merge branch 'pull-request/1808'
Merge branch 'pull-request/2097'
news entry for pr #2158
Merge branch 'pull-request/2158'
Anatol Belski [Mon, 17 Oct 2016 19:26:34 +0000 (21:26 +0200)]
sync NEWS
Andrey Hristov [Mon, 17 Oct 2016 16:31:43 +0000 (19:31 +0300)]
Merge branch 'PHP-7.1'
Andrey Hristov [Mon, 17 Oct 2016 16:31:29 +0000 (19:31 +0300)]
Merge branch 'PHP-7.0' into PHP-7.1
Andrey Hristov [Mon, 17 Oct 2016 16:30:08 +0000 (19:30 +0300)]
Merge branch 'PHP-5.6' into PHP-7.0
Andrey Hristov [Mon, 17 Oct 2016 16:25:01 +0000 (19:25 +0300)]
Lower the value to 24 hours from 1 year, which due to a overflow in
php_tvtoto (bug#71507) is just 17 days.
Andrey Hristov [Mon, 17 Oct 2016 16:12:56 +0000 (19:12 +0300)]
Merge branch 'master' of git.php.net:php-src
Andrey Hristov [Mon, 17 Oct 2016 16:12:33 +0000 (19:12 +0300)]
Merge branch 'PHP-7.1'
Andrey Hristov [Mon, 17 Oct 2016 16:11:54 +0000 (19:11 +0300)]
Merge branch 'PHP-7.0' into PHP-7.1
Joe Watkins [Mon, 17 Oct 2016 15:49:24 +0000 (16:49 +0100)]
Merge branch 'pull-request/1817'
Joe Watkins [Mon, 17 Oct 2016 15:50:12 +0000 (16:50 +0100)]
Merge branch 'pull-request/1816'
Joe Watkins [Mon, 17 Oct 2016 15:50:53 +0000 (16:50 +0100)]
Merge branch 'pull-request/1814'
Joe Watkins [Mon, 17 Oct 2016 15:53:04 +0000 (16:53 +0100)]
Merge branch 'pull-request/1808'
Joe Watkins [Mon, 17 Oct 2016 15:49:24 +0000 (16:49 +0100)]
Merge branch 'pull-request/1817'
Joe Watkins [Mon, 17 Oct 2016 15:50:12 +0000 (16:50 +0100)]
Merge branch 'pull-request/1816'
Andrey Hristov [Mon, 17 Oct 2016 16:01:12 +0000 (19:01 +0300)]
Merge branch 'PHP-5.6' into PHP-7.0
Joe Watkins [Mon, 17 Oct 2016 15:50:53 +0000 (16:50 +0100)]
Merge branch 'pull-request/1814'
Joe Watkins [Mon, 17 Oct 2016 15:53:04 +0000 (16:53 +0100)]
Merge branch 'pull-request/1808'
Andrey Hristov [Mon, 17 Oct 2016 15:58:14 +0000 (18:58 +0300)]
This is a very very old thing dated back to year 2009.
MYSQL_OPT_READ_TIMEOUT was never a macro in mysqlnd but an enum value.
So this never actually worked correctly. mysqlnd provides these so it is
safe to have them when mysqlnd used.
Joe Watkins [Mon, 17 Oct 2016 15:53:04 +0000 (16:53 +0100)]
Merge branch 'pull-request/1808'
Joe Watkins [Mon, 17 Oct 2016 15:50:53 +0000 (16:50 +0100)]
Merge branch 'pull-request/1814'
Joe Watkins [Mon, 17 Oct 2016 15:50:12 +0000 (16:50 +0100)]
Merge branch 'pull-request/1816'
Joe Watkins [Mon, 17 Oct 2016 15:49:24 +0000 (16:49 +0100)]
Merge branch 'pull-request/1817'
Joe Watkins [Mon, 17 Oct 2016 14:59:51 +0000 (15:59 +0100)]
Merge branch 'pull-request/2097'
Joe Watkins [Mon, 17 Oct 2016 14:59:51 +0000 (15:59 +0100)]
Merge branch 'pull-request/2097'
Joe Watkins [Mon, 17 Oct 2016 14:59:51 +0000 (15:59 +0100)]
Merge branch 'pull-request/2097'
Joe Watkins [Mon, 17 Oct 2016 14:50:59 +0000 (15:50 +0100)]
news entry for pr #2158
Joe Watkins [Mon, 17 Oct 2016 13:42:35 +0000 (14:42 +0100)]
Merge branch 'pull-request/2158'
Andrea Faulds [Mon, 17 Oct 2016 14:44:16 +0000 (15:44 +0100)]
NEWS and UPGRADING for utf8_encode() and utf8_decode() move
Andrea Faulds [Thu, 13 Oct 2016 22:33:33 +0000 (23:33 +0100)]
Move utf8_encode and utf8_decode to ext/standard
Joe Watkins [Mon, 17 Oct 2016 13:47:08 +0000 (14:47 +0100)]
news entry for pr #2158
Joe Watkins [Mon, 17 Oct 2016 13:42:35 +0000 (14:42 +0100)]
Merge branch 'pull-request/2158'
Joe Watkins [Mon, 17 Oct 2016 13:44:11 +0000 (14:44 +0100)]
Merge branch 'master' of git.php.net:/php-src