]>
granicus.if.org Git - php/log
Dmitry Stogov [Tue, 25 Oct 2016 19:13:46 +0000 (22:13 +0300)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fixed incorrec type usage
Revert "Update UPGRADING to reflect bug fix" This change was made in 7.0. Sorry for the noise.
Update UPGRADING to reflect bug fix
news for next rc
Dmitry Stogov [Tue, 25 Oct 2016 19:12:34 +0000 (22:12 +0300)]
Fixed incorrec type usage
Yasuo Ohgaki [Tue, 25 Oct 2016 19:01:55 +0000 (04:01 +0900)]
Revert "Update UPGRADING to reflect bug fix"
This change was made in 7.0. Sorry for the noise.
This reverts commit
e9c8e50b66366c250becb663bb76db24ed1b5890 .
Yasuo Ohgaki [Tue, 25 Oct 2016 18:26:44 +0000 (03:26 +0900)]
Update UPGRADING to reflect bug fix
Joe Watkins [Tue, 25 Oct 2016 15:22:23 +0000 (16:22 +0100)]
news for next rc
Dmitry Stogov [Tue, 25 Oct 2016 14:21:12 +0000 (17:21 +0300)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Export zend_analyze_calls() to allow building call trees.
Dmitry Stogov [Tue, 25 Oct 2016 14:20:27 +0000 (17:20 +0300)]
Export zend_analyze_calls() to allow building call trees.
Christoph M. Becker [Tue, 25 Oct 2016 12:41:00 +0000 (14:41 +0200)]
Merge branch 'PHP-7.1'
Christoph M. Becker [Tue, 25 Oct 2016 12:34:43 +0000 (14:34 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Tue, 25 Oct 2016 12:30:59 +0000 (14:30 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Tue, 25 Oct 2016 12:19:36 +0000 (14:19 +0200)]
Fix #72494: imagecropauto out-of-bounds access
This issue has actually already been fixed with commit
46f2c690 . We're
adding a regression test and a NEWS entry, and also port the fix in
gdImageCropThreshold() from libgd:
* <https://github.com/libgd/libgd/commit/
b347e034 >
* <https://github.com/libgd/libgd/commit/
46f2c690 >
Anatol Belski [Tue, 25 Oct 2016 08:32:15 +0000 (10:32 +0200)]
Merge branch 'PHP-7.1'
* PHP-7.1:
move dev to 7.0.14
Anatol Belski [Tue, 25 Oct 2016 08:31:49 +0000 (10:31 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
move dev to 7.0.14
Anatol Belski [Tue, 25 Oct 2016 08:29:51 +0000 (10:29 +0200)]
move dev to 7.0.14
Derick Rethans [Mon, 24 Oct 2016 09:37:20 +0000 (10:37 +0100)]
Updated to version 2016.8 (2016h)
Derick Rethans [Mon, 24 Oct 2016 09:37:19 +0000 (10:37 +0100)]
Empty merge
Derick Rethans [Mon, 24 Oct 2016 09:37:17 +0000 (10:37 +0100)]
Updated to version 2016.8 (2016h)
Derick Rethans [Mon, 24 Oct 2016 09:37:16 +0000 (10:37 +0100)]
Empty merge
Derick Rethans [Mon, 24 Oct 2016 09:37:13 +0000 (10:37 +0100)]
Updated to version 2016.8 (2016h)
Derick Rethans [Mon, 24 Oct 2016 09:37:12 +0000 (10:37 +0100)]
Empty merge
Derick Rethans [Mon, 24 Oct 2016 09:37:07 +0000 (10:37 +0100)]
Updated to version 2016.8 (2016h)
Nikita Popov [Sun, 23 Oct 2016 20:27:25 +0000 (22:27 +0200)]
Merge branch 'PHP-7.1'
Nikita Popov [Sun, 23 Oct 2016 20:27:11 +0000 (22:27 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Sun, 23 Oct 2016 20:26:25 +0000 (22:26 +0200)]
Nikita Popov [Sun, 23 Oct 2016 20:13:59 +0000 (22:13 +0200)]
Merge branch 'PHP-7.1'
Nikita Popov [Sun, 23 Oct 2016 20:12:55 +0000 (22:12 +0200)]
Fix call graph construction
Travis build for 7.1+ has been failing for the past week...
Jakub Zelenka [Sun, 23 Oct 2016 18:56:29 +0000 (19:56 +0100)]
Merge branch 'PHP-7.1'
Jakub Zelenka [Sun, 23 Oct 2016 18:55:22 +0000 (19:55 +0100)]
Try to fix LibreSSL build
Jakub Zelenka [Sun, 23 Oct 2016 18:40:48 +0000 (19:40 +0100)]
Merge branch 'PHP-7.1'
Jakub Zelenka [Sun, 23 Oct 2016 18:37:07 +0000 (19:37 +0100)]
Drop useless checks for DH and RSA
If DH or RSA was disabled, the build would fail already as
it's used already elsewhere without checking the OPENSSL_NO_DH
or OPENSSL_NO_RSA defines.
Xinchen Hui [Sat, 22 Oct 2016 06:51:23 +0000 (14:51 +0800)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Update NEWS
Xinchen Hui [Sat, 22 Oct 2016 06:51:11 +0000 (14:51 +0800)]
Update NEWS
Xinchen Hui [Sat, 22 Oct 2016 06:50:53 +0000 (14:50 +0800)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fixed bug #73350 (Exception::__toString() cause circular references)
Xinchen Hui [Sat, 22 Oct 2016 06:50:42 +0000 (14:50 +0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #73350 (Exception::__toString() cause circular references)
Xinchen Hui [Sat, 22 Oct 2016 06:50:21 +0000 (14:50 +0800)]
Fixed bug #73350 (Exception::__toString() cause circular references)
Anatol Belski [Fri, 21 Oct 2016 19:34:09 +0000 (21:34 +0200)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Better fix for bug #73360
Revert "Fixed bug #73360 Unable to work in root with unicode chars"
Anatol Belski [Fri, 21 Oct 2016 19:29:35 +0000 (21:29 +0200)]
Better fix for bug #73360
This also fixes the TS issue. And, it also reveals that there's an
issue in the VCWD_* API to be possibly addressed.
Anatol Belski [Fri, 21 Oct 2016 18:15:16 +0000 (20:15 +0200)]
Revert "Fixed bug #73360 Unable to work in root with unicode chars"
This reverts commit
64fee0aecb2c804a088b896da6f736dbc19d8424 .
Anatol Belski [Fri, 21 Oct 2016 14:57:30 +0000 (16:57 +0200)]
Merge branch 'PHP-7.1'
* PHP-7.1:
update NEWS
Dmitry Stogov [Fri, 21 Oct 2016 14:47:30 +0000 (17:47 +0300)]
Turn IS_TYPE_COLLECTABLE zval flag into GC_COLLECTABLE zend_refcounted flag.
This simplifies checks and allows reset this flag for "acyclic" arrays and objects.
Anatol Belski [Fri, 21 Oct 2016 14:43:55 +0000 (16:43 +0200)]
update NEWS
The bug is currently not good testable, because the doc_root will be
blocked from the invoked test server process. This will prevent the
cleanup, which would be confusing.
Anatol Belski [Fri, 21 Oct 2016 14:00:49 +0000 (16:00 +0200)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fixed bug #73360 Unable to work in root with unicode chars
Anatol Belski [Fri, 21 Oct 2016 13:22:59 +0000 (15:22 +0200)]
Fixed bug #73360 Unable to work in root with unicode chars
Amo Chohan [Fri, 21 Oct 2016 03:21:42 +0000 (20:21 -0700)]
Add tests for PDO::getAvailableDrivers
Adam Baratz [Thu, 20 Oct 2016 21:34:29 +0000 (17:34 -0400)]
Remove DBDO-specific field
DBDO is a PECL package which hasn't been updated since 2010 and has been marked
as unmaintained. Additionally, I can't find a reference to this field in the
latest source.
Kalle Sommer Nielsen [Thu, 20 Oct 2016 14:03:46 +0000 (16:03 +0200)]
Save some more calls to strlen() on the CURLFile helper methods
Kalle Sommer Nielsen [Thu, 20 Oct 2016 14:02:37 +0000 (16:02 +0200)]
Revert "Fix test, this is kinda ugly, but at least for me on Windows there seems to be some messed up line endings"
This reverts commit
aeeaedeeb7bdf7df3f0885a62e8d317762e88bf8 .
This seems to make Travis unhappy (shocker), so revert for now until we find a better fix
Kalle Sommer Nielsen [Thu, 20 Oct 2016 12:28:52 +0000 (14:28 +0200)]
Merge branch 'master' of git.php.net:php-src
Kalle Sommer Nielsen [Thu, 20 Oct 2016 12:28:24 +0000 (14:28 +0200)]
Save a call to strlen(), since we can figure out the length of this constant value with sizeof() at compile time
Kalle Sommer Nielsen [Thu, 20 Oct 2016 12:24:01 +0000 (14:24 +0200)]
Fix test, this is kinda ugly, but at least for me on Windows there seems to be some messed up line endings
Nikita Popov [Thu, 20 Oct 2016 11:26:51 +0000 (13:26 +0200)]
Merge branch 'PHP-7.1'
Nikita Popov [Thu, 20 Oct 2016 11:26:34 +0000 (13:26 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Adam Saponara [Fri, 26 Aug 2016 21:33:22 +0000 (17:33 -0400)]
Fix bug #71241: array_replace_recursive mutates ref params
`array_replace_recursive` can sometimes mutate its params if
references are nested within. This differs from the PHP 5 behavior.
Kalle Sommer Nielsen [Thu, 20 Oct 2016 11:10:51 +0000 (13:10 +0200)]
Merge branch 'master' of git.php.net:php-src
Kalle Sommer Nielsen [Thu, 20 Oct 2016 11:10:28 +0000 (13:10 +0200)]
Do not overwrite config.nice.bat if --with-config-profile is used on Windows
Christoph M. Becker [Thu, 20 Oct 2016 10:59:03 +0000 (12:59 +0200)]
Update UPGRADING wrt. imageresolution()
Cf. <http://git.php.net/?p=php-src.git;a=commit;h=
209d4220 >.
Matteo Beccati [Thu, 20 Oct 2016 10:51:18 +0000 (12:51 +0200)]
Fixed test to accept MYSQLI_OPT_READ_TIMEOUT
The new constant has been added in
7108db30
Anatol Belski [Thu, 20 Oct 2016 09:41:52 +0000 (11:41 +0200)]
remove redundant includes
Anatol Belski [Thu, 20 Oct 2016 09:38:59 +0000 (11:38 +0200)]
fix Windows compilation
php.h is included, it contains all the stuff needed and conflicts
otherwise.
Leigh [Thu, 20 Oct 2016 09:18:38 +0000 (10:18 +0100)]
Merge branch 'PHP-7.1'
Leigh [Thu, 20 Oct 2016 09:18:16 +0000 (10:18 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Leigh [Wed, 19 Oct 2016 17:00:54 +0000 (18:00 +0100)]
Add php_random_int internal API
This is the internal API compliment to `php_random_bytes`
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'
Joe Watkins [Thu, 20 Oct 2016 04:21:56 +0000 (05:21 +0100)]
news entry for #pr 2152
Joe Watkins [Thu, 20 Oct 2016 04:23:21 +0000 (05:23 +0100)]
Merge branch 'pull-request/2152' into PHP-7.1
Joe Watkins [Thu, 20 Oct 2016 04:21:56 +0000 (05:21 +0100)]
news entry for #pr 2152
Joe Watkins [Thu, 20 Oct 2016 04:19:10 +0000 (05:19 +0100)]
Merge branch 'pull-request/2152' into PHP-7.0
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.