granicus.if.org Git - php/log

]> granicus.if.org Git - php/log

projects / php / log

summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next

commit | commitdiff | tree

Christoph M. Becker [Sat, 24 Sep 2016 12:44:57 +0000 (14:44 +0200)]

Don't enforce palette conversion when writing GD images

The GD image format is able to handle truecolor images as of libgd 2.0.12
(<https://github.com/libgd/libgd/blob/gd-2.2.3/src/gd_gd.c#L31-L33>).
Therefore we don't need the potentially lossy and time consuming palette
conversion.

This way, imagegd() can also be used to export raw truecolor image data.

commit | commitdiff | tree

Nikita Popov [Sat, 24 Sep 2016 11:23:54 +0000 (13:23 +0200)]

Merge branch 'PHP-7.1'

commit | commitdiff | tree

Nikita Popov [Sat, 24 Sep 2016 11:22:00 +0000 (13:22 +0200)]

Merge branch 'PHP-7.0' into PHP-7.1

commit | commitdiff | tree

Nikita Popov [Sat, 24 Sep 2016 11:18:43 +0000 (13:18 +0200)]

Fixed bug #73163

commit | commitdiff | tree

Christoph M. Becker [Sat, 24 Sep 2016 10:52:14 +0000 (12:52 +0200)]

Merge branch 'PHP-7.1'

commit | commitdiff | tree

Christoph M. Becker [Sat, 24 Sep 2016 10:46:20 +0000 (12:46 +0200)]

Merge branch 'PHP-7.0' into PHP-7.1

commit | commitdiff | tree

Christoph M. Becker [Sat, 24 Sep 2016 10:39:56 +0000 (12:39 +0200)]

Merge branch 'PHP-5.6' into PHP-7.0

commit | commitdiff | tree

Christoph M. Becker [Sat, 24 Sep 2016 10:36:54 +0000 (12:36 +0200)]

Fix #73161: imagecreatefromgd2() may leak memory

commit | commitdiff | tree

Christoph M. Becker [Sat, 24 Sep 2016 09:42:55 +0000 (11:42 +0200)]

Merge branch 'PHP-7.1'

commit | commitdiff | tree

Christoph M. Becker [Sat, 24 Sep 2016 09:36:50 +0000 (11:36 +0200)]

Merge branch 'PHP-7.0' into PHP-7.1

commit | commitdiff | tree

Christoph M. Becker [Sat, 24 Sep 2016 09:31:11 +0000 (11:31 +0200)]

Merge branch 'PHP-5.6' into PHP-7.0

commit | commitdiff | tree

Christoph M. Becker [Sat, 24 Sep 2016 09:28:20 +0000 (11:28 +0200)]

Fix #73159: imagegd2(): unrecognized formats may result in corrupted files

We must not apply the format correction twice for truecolor images.

commit | commitdiff | tree

Christoph M. Becker [Sat, 24 Sep 2016 09:03:46 +0000 (11:03 +0200)]

Merge branch 'PHP-7.1'

commit | commitdiff | tree

Christoph M. Becker [Sat, 24 Sep 2016 08:57:30 +0000 (10:57 +0200)]

Merge branch 'PHP-7.0' into PHP-7.1

commit | commitdiff | tree

Christoph M. Becker [Sat, 24 Sep 2016 08:47:11 +0000 (10:47 +0200)]

Merge branch 'PHP-5.6' into PHP-7.0

commit | commitdiff | tree

Christoph M. Becker [Fri, 23 Sep 2016 22:46:35 +0000 (00:46 +0200)]

Fix #73155: imagegd2() writes wrong chunk sizes on boundaries

commit | commitdiff | tree

Christoph M. Becker [Fri, 23 Sep 2016 22:38:04 +0000 (00:38 +0200)]

Merge branch 'PHP-7.1'

commit | commitdiff | tree

Christoph M. Becker [Fri, 23 Sep 2016 22:37:37 +0000 (00:37 +0200)]

Merge branch 'PHP-7.0' into PHP-7.1

commit | commitdiff | tree

Christoph M. Becker [Fri, 23 Sep 2016 22:36:53 +0000 (00:36 +0200)]

Merge branch 'PHP-5.6' into PHP-7.0

commit | commitdiff | tree

Christoph M. Becker [Fri, 23 Sep 2016 22:35:24 +0000 (00:35 +0200)]

Fix #73157 (again): imagegd2() ignores 3rd param if 4 are given

Obviously, there was a bad merge.

commit | commitdiff | tree

Christoph M. Becker [Fri, 23 Sep 2016 22:13:36 +0000 (00:13 +0200)]

Merge branch 'PHP-7.1'

commit | commitdiff | tree

Christoph M. Becker [Fri, 23 Sep 2016 22:07:11 +0000 (00:07 +0200)]

Merge branch 'PHP-7.0' into PHP-7.1

commit | commitdiff | tree

Adam Baratz [Fri, 23 Sep 2016 21:53:58 +0000 (17:53 -0400)]

update NEWS

commit | commitdiff | tree

Adam Baratz [Fri, 23 Sep 2016 21:53:24 +0000 (17:53 -0400)]

update NEWS

commit | commitdiff | tree

Christoph M. Becker [Fri, 23 Sep 2016 21:44:02 +0000 (23:44 +0200)]

Merge branch 'PHP-5.6' into PHP-7.0

commit | commitdiff | tree

Christoph M. Becker [Fri, 23 Sep 2016 21:23:45 +0000 (23:23 +0200)]

Fix #73157: imagegd2() ignores 3rd param if 4 are given

We must initialize `q` for *more* than three parameters, too.

commit | commitdiff | tree

Anatol Belski [Fri, 23 Sep 2016 16:48:41 +0000 (18:48 +0200)]

Merge branch 'PHP-7.1'

* PHP-7.1:
Revert "Fixed bug #73037 SoapServer reports Bad Request when gzipped"

commit | commitdiff | tree

Anatol Belski [Fri, 23 Sep 2016 16:48:14 +0000 (18:48 +0200)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
Revert "Fixed bug #73037 SoapServer reports Bad Request when gzipped"

commit | commitdiff | tree

Anatol Belski [Fri, 23 Sep 2016 16:46:51 +0000 (18:46 +0200)]

Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
Revert "Fixed bug #73037 SoapServer reports Bad Request when gzipped"

commit | commitdiff | tree

Anatol Belski [Fri, 23 Sep 2016 16:45:03 +0000 (18:45 +0200)]

Revert "Fixed bug #73037 SoapServer reports Bad Request when gzipped"

This reverts commit f9a699f6c3aa7acea922242a0f14731f6b829742.

commit | commitdiff | tree

Anatol Belski [Fri, 23 Sep 2016 16:11:15 +0000 (18:11 +0200)]

Merge branch 'PHP-7.1'

* PHP-7.1:
skip this test for now as it seems to have issues running dev server
Fixed bug #73037 SoapServer reports Bad Request when gzipped

commit | commitdiff | tree

Anatol Belski [Fri, 23 Sep 2016 16:10:55 +0000 (18:10 +0200)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
skip this test for now as it seems to have issues running dev server
Fixed bug #73037 SoapServer reports Bad Request when gzipped

commit | commitdiff | tree

Anatol Belski [Fri, 23 Sep 2016 16:10:07 +0000 (18:10 +0200)]

Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
skip this test for now as it seems to have issues running dev server
Fixed bug #73037 SoapServer reports Bad Request when gzipped

commit | commitdiff | tree

Anatol Belski [Fri, 23 Sep 2016 16:07:08 +0000 (18:07 +0200)]

skip this test for now as it seems to have issues running dev server

commit | commitdiff | tree

Anatol Belski [Fri, 23 Sep 2016 14:02:50 +0000 (16:02 +0200)]

Fixed bug #73037 SoapServer reports Bad Request when gzipped

(cherry picked from commit 410c68788ae4826807e8ced3f4a02e676142b22a)

commit | commitdiff | tree

Christoph M. Becker [Fri, 23 Sep 2016 14:27:59 +0000 (16:27 +0200)]

Merge branch 'PHP-7.1'

commit | commitdiff | tree

Christoph M. Becker [Fri, 23 Sep 2016 14:26:54 +0000 (16:26 +0200)]

Merge branch 'PHP-7.0' into PHP-7.1

commit | commitdiff | tree

Christoph M. Becker [Fri, 23 Sep 2016 14:25:21 +0000 (16:25 +0200)]

Merge branch 'PHP-5.6' into PHP-7.0

commit | commitdiff | tree

Christoph M. Becker [Fri, 23 Sep 2016 14:23:58 +0000 (16:23 +0200)]

Update NEWS

commit | commitdiff | tree

Anatol Belski [Fri, 23 Sep 2016 14:08:09 +0000 (16:08 +0200)]

Merge branch 'PHP-7.1'

* PHP-7.1:
Fixed bug #73037 SoapServer reports Bad Request when gzipped

commit | commitdiff | tree

Anatol Belski [Fri, 23 Sep 2016 14:07:12 +0000 (16:07 +0200)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
Fixed bug #73037 SoapServer reports Bad Request when gzipped

commit | commitdiff | tree

Anatol Belski [Fri, 23 Sep 2016 14:02:50 +0000 (16:02 +0200)]

Fixed bug #73037 SoapServer reports Bad Request when gzipped

commit | commitdiff | tree

Christoph M. Becker [Fri, 23 Sep 2016 13:50:25 +0000 (15:50 +0200)]

Merge branch 'PHP-7.1'

commit | commitdiff | tree

Christoph M. Becker [Fri, 23 Sep 2016 13:22:45 +0000 (15:22 +0200)]

Fix FreeType tests using UTF-8 font file names

UTF-8 font file names are not yet supported on Windows[1], so we're skipping
the respective tests on this platform, but enable them on other platforms.

[1] <http://news.php.net/php.internals.win/1142>

commit | commitdiff | tree

Julien Pauli [Fri, 23 Sep 2016 11:54:46 +0000 (13:54 +0200)]

Merge branch 'PHP-7.1'

* PHP-7.1:
Formatting. Fix possible memory corruption in FPM SHM management
fix every work call mmap

commit | commitdiff | tree

Julien Pauli [Fri, 23 Sep 2016 11:54:22 +0000 (13:54 +0200)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
Formatting. Fix possible memory corruption in FPM SHM management
fix every work call mmap

Conflicts:
sapi/fpm/fpm/fpm_scoreboard.c

commit | commitdiff | tree

Julien Pauli [Fri, 23 Sep 2016 11:53:22 +0000 (13:53 +0200)]

Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
Formatting. Fix possible memory corruption in FPM SHM management
fix every work call mmap

commit | commitdiff | tree

Julien Pauli [Fri, 23 Sep 2016 11:24:31 +0000 (13:24 +0200)]

Formatting. Fix possible memory corruption in FPM SHM management

commit | commitdiff | tree

tom916 [Fri, 16 Sep 2016 14:37:09 +0000 (22:37 +0800)]

fix every work call mmap

fix fpm_scoreboard_free

commit | commitdiff | tree

Christoph M. Becker [Fri, 23 Sep 2016 11:11:14 +0000 (13:11 +0200)]

Merge branch 'PHP-7.1'

commit | commitdiff | tree

Christoph M. Becker [Fri, 23 Sep 2016 10:55:13 +0000 (12:55 +0200)]

Merge branch 'PHP-7.0' into PHP-7.1

commit | commitdiff | tree

Christoph M. Becker [Fri, 23 Sep 2016 10:29:37 +0000 (12:29 +0200)]

Merge branch 'PHP-5.6' into PHP-7.0

commit | commitdiff | tree

Christoph M. Becker [Thu, 22 Sep 2016 09:52:10 +0000 (11:52 +0200)]

Rework FreeType related tests

Firstly, there is no fundamental difference between running the tests on
freetype before and after 2.4.10, so we re-join the respective test cases.

Secondly, there are some minor differences in the results depending on
architecture, freetype versions and config options, so we cater to that
by allowing small deviations from the expectations.

commit | commitdiff | tree

Dmitry Stogov [Fri, 23 Sep 2016 09:27:15 +0000 (12:27 +0300)]

Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src:
update NEWS
update NEWS

commit | commitdiff | tree

Dmitry Stogov [Fri, 23 Sep 2016 09:26:30 +0000 (12:26 +0300)]

Removed redundand code

commit | commitdiff | tree

Anatol Belski [Fri, 23 Sep 2016 09:26:24 +0000 (11:26 +0200)]

Merge branch 'PHP-7.1'

* PHP-7.1:
update NEWS
update NEWS

commit | commitdiff | tree

Anatol Belski [Fri, 23 Sep 2016 09:26:03 +0000 (11:26 +0200)]

update NEWS

commit | commitdiff | tree

Anatol Belski [Fri, 23 Sep 2016 09:25:33 +0000 (11:25 +0200)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
update NEWS
phpdbg next command must stop when leaving function

commit | commitdiff | tree

Anatol Belski [Fri, 23 Sep 2016 09:24:55 +0000 (11:24 +0200)]

update NEWS

commit | commitdiff | tree

Bob Weinand [Fri, 23 Sep 2016 01:29:56 +0000 (03:29 +0200)]

Merge branch 'PHP-7.0'

commit | commitdiff | tree

Bob Weinand [Fri, 23 Sep 2016 01:29:37 +0000 (03:29 +0200)]

phpdbg next command must stop when leaving function

commit | commitdiff | tree

Anatol Belski [Thu, 22 Sep 2016 23:55:35 +0000 (01:55 +0200)]

Merge branch 'PHP-7.1'

* PHP-7.1:
Fix bug #73121 Bundled PCRE doesn't compile because JIT isn't supported on s390

commit | commitdiff | tree

Anatol Belski [Thu, 22 Sep 2016 23:55:17 +0000 (01:55 +0200)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
Fix bug #73121 Bundled PCRE doesn't compile because JIT isn't supported on s390

commit | commitdiff | tree

Anatol Belski [Thu, 22 Sep 2016 23:52:42 +0000 (01:52 +0200)]

Fix bug #73121 Bundled PCRE doesn't compile because JIT isn't supported on s390

commit | commitdiff | tree

Anatol Belski [Thu, 22 Sep 2016 15:05:51 +0000 (17:05 +0200)]

Merge branch 'master' of git.php.net:php-src

commit | commitdiff | tree

Anatol Belski [Thu, 22 Sep 2016 15:04:06 +0000 (17:04 +0200)]

Merge branch 'PHP-7.1'

* PHP-7.1:
update libs versions
update libs versions

commit | commitdiff | tree

Anatol Belski [Thu, 22 Sep 2016 15:03:49 +0000 (17:03 +0200)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
update libs versions
update libs versions

commit | commitdiff | tree

Anatol Belski [Thu, 22 Sep 2016 15:03:12 +0000 (17:03 +0200)]

Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
update libs versions

commit | commitdiff | tree

Anatol Belski [Thu, 22 Sep 2016 15:02:54 +0000 (17:02 +0200)]

update libs versions

commit | commitdiff | tree

Anatol Belski [Thu, 22 Sep 2016 15:01:02 +0000 (17:01 +0200)]

update libs versions

commit | commitdiff | tree

Dmitry Stogov [Thu, 22 Sep 2016 14:58:45 +0000 (17:58 +0300)]

Removed impossible condition

commit | commitdiff | tree

Nikita Popov [Thu, 22 Sep 2016 10:50:36 +0000 (12:50 +0200)]

Merge branch 'PHP-7.1'

commit | commitdiff | tree

Nikita Popov [Thu, 22 Sep 2016 10:50:29 +0000 (12:50 +0200)]

Merge branch 'PHP-7.0' into PHP-7.1

commit | commitdiff | tree

Nikita Popov [Thu, 22 Sep 2016 10:48:38 +0000 (12:48 +0200)]

Merge branch 'PHP-5.6' into PHP-7.0

commit | commitdiff | tree

Márcio Almada [Mon, 19 Sep 2016 16:42:07 +0000 (12:42 -0400)]

fix bug related to #865

In case USE_KEY flag is active, RegexIterator->accept() should keep it's
old behavior which is to accept keys mapping arrays.

This broke after PHP 5.5 but was not noticed due to lack of tests for USE_KEY.

commit | commitdiff | tree

Nikita Popov [Thu, 22 Sep 2016 10:39:00 +0000 (12:39 +0200)]

Merge branch 'PHP-7.1'

commit | commitdiff | tree

Nikita Popov [Thu, 22 Sep 2016 10:38:48 +0000 (12:38 +0200)]

Merge branch 'PHP-7.0' into PHP-7.1

commit | commitdiff | tree

John Boehr [Thu, 22 Sep 2016 03:09:45 +0000 (20:09 -0700)]

Fix bug #69579

commit | commitdiff | tree

Nikita Popov [Thu, 22 Sep 2016 10:35:29 +0000 (12:35 +0200)]

Merge branch 'PHP-7.1'

commit | commitdiff | tree

Nikita Popov [Thu, 22 Sep 2016 10:34:55 +0000 (12:34 +0200)]

Merge branch 'PHP-7.0' into PHP-7.1

commit | commitdiff | tree

John Boehr [Thu, 22 Sep 2016 03:09:45 +0000 (20:09 -0700)]

Fix bug #69579

commit | commitdiff | tree

Anatol Belski [Thu, 22 Sep 2016 10:08:06 +0000 (12:08 +0200)]

Merge branch 'PHP-7.1'

* PHP-7.1:
update NEWS

commit | commitdiff | tree

Anatol Belski [Thu, 22 Sep 2016 10:07:37 +0000 (12:07 +0200)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
update NEWS

commit | commitdiff | tree

Anatol Belski [Thu, 22 Sep 2016 10:06:44 +0000 (12:06 +0200)]

Merge branch 'PHP-7.1'

* PHP-7.1:
update NEWS

commit | commitdiff | tree

Anatol Belski [Thu, 22 Sep 2016 10:06:25 +0000 (12:06 +0200)]

update NEWS

commit | commitdiff | tree

Anatol Belski [Thu, 22 Sep 2016 10:04:37 +0000 (12:04 +0200)]

update NEWS

commit | commitdiff | tree

Anatol Belski [Thu, 22 Sep 2016 09:51:53 +0000 (11:51 +0200)]

Merge branch 'PHP-7.1'

* PHP-7.1:
Fixed bug #73126 Cannot pass parameter 1 by reference

commit | commitdiff | tree

Anatol Belski [Thu, 22 Sep 2016 09:51:39 +0000 (11:51 +0200)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
Fixed bug #73126 Cannot pass parameter 1 by reference

commit | commitdiff | tree

Anatol Belski [Thu, 22 Sep 2016 09:49:35 +0000 (11:49 +0200)]

Fixed bug #73126 Cannot pass parameter 1 by reference

commit | commitdiff | tree

Adam Baratz [Wed, 21 Sep 2016 20:24:15 +0000 (16:24 -0400)]

Merge branch 'PHP-7.1'

* PHP-7.1:
Limit size of result set for test query

commit | commitdiff | tree

Adam Baratz [Wed, 21 Sep 2016 20:23:58 +0000 (16:23 -0400)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
Limit size of result set for test query

commit | commitdiff | tree

Adam Baratz [Wed, 21 Sep 2016 20:21:33 +0000 (16:21 -0400)]

Limit size of result set for test query

This result set can be very large, depending on the database. This change
ensures this test won't be slow.

commit | commitdiff | tree

Adam Baratz [Wed, 21 Sep 2016 19:15:54 +0000 (15:15 -0400)]

Merge branch 'PHP-7.1'

* PHP-7.1:
update NEWS
PHP bug 67130: nextRowset should work with unfetched rows

commit | commitdiff | tree

Adam Baratz [Wed, 21 Sep 2016 19:15:18 +0000 (15:15 -0400)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
update NEWS
PHP bug 67130: nextRowset should work with unfetched rows

commit | commitdiff | tree

Adam Baratz [Wed, 21 Sep 2016 18:29:42 +0000 (14:29 -0400)]

update NEWS

commit | commitdiff | tree

Peter LeBrun [Fri, 1 Jul 2016 19:44:06 +0000 (15:44 -0400)]

PHP bug 67130: nextRowset should work with unfetched rows

commit | commitdiff | tree

Adam Baratz [Wed, 21 Sep 2016 16:02:42 +0000 (12:02 -0400)]

Merge branch 'PHP-7.1'

* PHP-7.1:
Move dtor before memory freed to avoid invalid read

commit | commitdiff | tree

Adam Baratz [Wed, 21 Sep 2016 16:02:17 +0000 (12:02 -0400)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
Move dtor before memory freed to avoid invalid read

commit | commitdiff | tree

Adam Baratz [Wed, 21 Sep 2016 16:00:19 +0000 (12:00 -0400)]

Move dtor before memory freed to avoid invalid read

commit | commitdiff | tree

Xinchen Hui [Wed, 21 Sep 2016 09:20:48 +0000 (17:20 +0800)]

Merge branch 'PHP-7.1'

* PHP-7.1:
Fixed skip

Unnamed repository; edit this file 'description' to name the repository.