]> granicus.if.org Git - php/log
php
11 years agoAdded missing ZE/OPcache related entries
Dmitry Stogov [Fri, 17 May 2013 09:35:32 +0000 (13:35 +0400)]
Added missing ZE/OPcache related entries

11 years agoRecover NEWS
Johannes Schlüter [Fri, 17 May 2013 09:22:04 +0000 (11:22 +0200)]
Recover NEWS

Apperently wrongly merged in revision 488933792a8

11 years agoImproved IS_VAR operands fetching
Dmitry Stogov [Fri, 17 May 2013 09:15:09 +0000 (13:15 +0400)]
Improved IS_VAR operands fetching

11 years agoAdd optional second arg to unserialize()
Sara Golemon [Thu, 16 May 2013 21:37:36 +0000 (14:37 -0700)]
Add optional second arg to unserialize()

Returns the number of bytes consumed by reference for
streaming unserialization.

Actual unserialization behavior is not modified at all.

The need for this came up while trying to parse SplDoublyLinkedList's
serialization format which uses a non-standard stream of serialized values.

11 years agoMerge branch 'PHP-5.5'
Anatol Belski [Thu, 16 May 2013 17:29:42 +0000 (19:29 +0200)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fixed error handling for ext/sockets under win

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Anatol Belski [Thu, 16 May 2013 17:29:25 +0000 (19:29 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed error handling for ext/sockets under win

11 years agoFixed error handling for ext/sockets under win
Anatol Belski [Thu, 16 May 2013 17:23:31 +0000 (19:23 +0200)]
Fixed error handling for ext/sockets under win

WSAGetLastError() must be the very next call after a socket
function had an invalid return. Any function call inbetween
will clear the error information.

11 years agoMerge branch 'PHP-5.5'
Anatol Belski [Thu, 16 May 2013 06:45:02 +0000 (08:45 +0200)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  updated NEWS
  Fixed bug #64853Use of no longer available ini directives causes crash on TS build

11 years agoupdated NEWS
Anatol Belski [Thu, 16 May 2013 06:44:36 +0000 (08:44 +0200)]
updated NEWS

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Anatol Belski [Thu, 16 May 2013 06:43:07 +0000 (08:43 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #64853Use of no longer available ini directives causes crash on TS build

11 years agoFixed bug #64853Use of no longer available ini directives causes crash on TS build
Anatol Belski [Thu, 16 May 2013 06:40:56 +0000 (08:40 +0200)]
Fixed bug #64853Use of no longer available ini directives causes crash on TS build

The fatal error for removed ini options is thrown before the executor
init, so ensure the relevant variables are initialized.

11 years agoMerge branch 'PHP-5.5'
Pierre Joye [Wed, 15 May 2013 13:55:20 +0000 (15:55 +0200)]
Merge branch 'PHP-5.5'

* PHP-5.5:

11 years agoMerge branch 'master' of git.php.net:php-src
Pierre Joye [Wed, 15 May 2013 13:55:13 +0000 (15:55 +0200)]
Merge branch 'master' of git.php.net:php-src

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Pierre Joye [Wed, 15 May 2013 13:54:52 +0000 (15:54 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:

11 years agoMerge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
Pierre Joye [Wed, 15 May 2013 13:54:46 +0000 (15:54 +0200)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

11 years agoMerge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
Pierre Joye [Wed, 15 May 2013 13:53:57 +0000 (15:53 +0200)]
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4

11 years agoMerge branch 'PHP-5.5'
David Soria Parra [Wed, 15 May 2013 12:43:03 +0000 (14:43 +0200)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fix array_colum segfault

11 years agoFix array_colum segfault
David Soria Parra [Wed, 15 May 2013 12:27:59 +0000 (14:27 +0200)]
Fix array_colum segfault

Separate zval to avoid gc from freeing

11 years agoMerge branch 'PHP-5.5'
Anatol Belski [Wed, 15 May 2013 12:24:46 +0000 (14:24 +0200)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  fixe preprocessor definition

11 years agofixe preprocessor definition
Anatol Belski [Wed, 15 May 2013 12:24:21 +0000 (14:24 +0200)]
fixe preprocessor definition

11 years agoMerge branch 'PHP-5.5'
Anatol Belski [Wed, 15 May 2013 09:17:57 +0000 (11:17 +0200)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fix unitialized vars when sql.safe_mode=1
  more check for php_stream_fopen_tmpfile failure

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Anatol Belski [Wed, 15 May 2013 09:17:18 +0000 (11:17 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix unitialized vars when sql.safe_mode=1
  more check for php_stream_fopen_tmpfile failure

11 years agoMerge branch 'PHP-5.3' into PHP-5.4
Anatol Belski [Wed, 15 May 2013 09:14:58 +0000 (11:14 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fix unitialized vars when sql.safe_mode=1
  more check for php_stream_fopen_tmpfile failure

11 years agoFix unitialized vars when sql.safe_mode=1
Anatol Belski [Wed, 15 May 2013 09:12:17 +0000 (11:12 +0200)]
Fix unitialized vars when sql.safe_mode=1

which can break the subsequent mysqlnd_connect() call

11 years agoMerge branch 'PHP-5.5'
Pierre Joye [Tue, 14 May 2013 14:46:40 +0000 (16:46 +0200)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  more check for php_stream_fopen_tmpfile failure

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Pierre Joye [Tue, 14 May 2013 14:46:32 +0000 (16:46 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  more check for php_stream_fopen_tmpfile failure

11 years agoMerge branch 'PHP-5.3' into PHP-5.4
Pierre Joye [Tue, 14 May 2013 14:45:56 +0000 (16:45 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  more check for php_stream_fopen_tmpfile failure

11 years agomore check for php_stream_fopen_tmpfile failure
Pierre Joye [Tue, 14 May 2013 14:45:11 +0000 (16:45 +0200)]
more check for php_stream_fopen_tmpfile failure

11 years agoMerge branch 'PHP-5.5' of ssh://git.php.net/php-src into PHP-5.5
Andrey Hristov [Tue, 14 May 2013 11:01:18 +0000 (13:01 +0200)]
Merge branch 'PHP-5.5' of ssh://git.php.net/php-src into PHP-5.5

11 years agoMerge branch 'master' of ssh://git.php.net/php-src
Andrey Hristov [Tue, 14 May 2013 10:57:19 +0000 (12:57 +0200)]
Merge branch 'master' of ssh://git.php.net/php-src

11 years agoMerge branch 'PHP-5.5'
Andrey Hristov [Tue, 14 May 2013 10:57:02 +0000 (12:57 +0200)]
Merge branch 'PHP-5.5'

Conflicts:
NEWS

11 years agoFix for Bug #64394 MYSQL_OPT_CAN_HANDLE_EXPIRED_PASSWORDS undeclared when using Conne...
Andrey Hristov [Tue, 14 May 2013 09:26:35 +0000 (11:26 +0200)]
Fix for Bug #64394 MYSQL_OPT_CAN_HANDLE_EXPIRED_PASSWORDS undeclared when using Connector/C

11 years agoMerge branch 'PHP-5.5'
Anatol Belski [Tue, 14 May 2013 09:16:17 +0000 (11:16 +0200)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  updated libmagic.patch after fix for #64830

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Anatol Belski [Tue, 14 May 2013 09:16:01 +0000 (11:16 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  updated libmagic.patch after fix for #64830

11 years agoupdated libmagic.patch after fix for #64830
Anatol Belski [Tue, 14 May 2013 09:14:37 +0000 (11:14 +0200)]
updated libmagic.patch after fix for #64830

11 years agoMerge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
Anatol Belski [Tue, 14 May 2013 07:45:02 +0000 (09:45 +0200)]
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4

11 years agoMerge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
Anatol Belski [Tue, 14 May 2013 07:44:48 +0000 (09:44 +0200)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

11 years agoMerge branch 'master' of git.php.net:php-src
Anatol Belski [Tue, 14 May 2013 07:44:36 +0000 (09:44 +0200)]
Merge branch 'master' of git.php.net:php-src

11 years agoMerge branch 'PHP-5.5'
Anatol Belski [Tue, 14 May 2013 07:42:57 +0000 (09:42 +0200)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  updated NEWS
  Fixed bug #64830 mimetype detection segfaults on mp3 file

11 years agoupdated NEWS
Anatol Belski [Tue, 14 May 2013 07:42:34 +0000 (09:42 +0200)]
updated NEWS

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Anatol Belski [Tue, 14 May 2013 07:41:38 +0000 (09:41 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #64830 mimetype detection segfaults on mp3 file

11 years agoFixed bug #64830 mimetype detection segfaults on mp3 file
Anatol Belski [Tue, 14 May 2013 07:40:43 +0000 (09:40 +0200)]
Fixed bug #64830 mimetype detection segfaults on mp3 file

11 years agoMerge branch 'PHP-5.5'
Pierre Joye [Tue, 14 May 2013 07:21:38 +0000 (09:21 +0200)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  php_stream_fopen_tmpfile may file, causing any following stream usage to crash

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Pierre Joye [Tue, 14 May 2013 07:21:30 +0000 (09:21 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  php_stream_fopen_tmpfile may file, causing any following stream usage to crash

11 years agoMerge branch 'PHP-5.3' into PHP-5.4
Pierre Joye [Tue, 14 May 2013 07:21:17 +0000 (09:21 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  php_stream_fopen_tmpfile may file, causing any following stream usage to crash

11 years agophp_stream_fopen_tmpfile may file, causing any following stream usage to crash
Pierre Joye [Tue, 14 May 2013 07:20:53 +0000 (09:20 +0200)]
php_stream_fopen_tmpfile may file, causing any following stream usage to crash

11 years agoMerge branch 'PHP-5.5'
Anatol Belski [Mon, 13 May 2013 12:27:12 +0000 (14:27 +0200)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  fix heap overflow warnings on win x64 debug crt

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Anatol Belski [Mon, 13 May 2013 12:26:50 +0000 (14:26 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix heap overflow warnings on win x64 debug crt

11 years agoMerge branch 'PHP-5.3' into PHP-5.4
Anatol Belski [Mon, 13 May 2013 12:25:25 +0000 (14:25 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  fix heap overflow warnings on win x64 debug crt

11 years agofix heap overflow warnings on win x64 debug crt
Anatol Belski [Mon, 13 May 2013 12:24:21 +0000 (14:24 +0200)]
fix heap overflow warnings on win x64 debug crt

11 years agoMerge branch 'PHP-5.5'
Anatol Belski [Sun, 12 May 2013 19:30:21 +0000 (21:30 +0200)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fixed bug #64825 Invalid free unserializing DateTimeZone

11 years agoFixed bug #64825 Invalid free unserializing DateTimeZone
Anatol Belski [Sun, 12 May 2013 19:29:16 +0000 (21:29 +0200)]
Fixed bug #64825 Invalid free unserializing DateTimeZone

11 years agoMerge branch 'PHP-5.5'
Anatol Belski [Sun, 12 May 2013 12:10:24 +0000 (14:10 +0200)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  updated NEWS
  updated NEWS
  Fixed bug #64821 Custom Exceptions crash when internal properties overridden

11 years agoupdated NEWS
Anatol Belski [Sun, 12 May 2013 12:09:59 +0000 (14:09 +0200)]
updated NEWS

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Anatol Belski [Sun, 12 May 2013 12:09:16 +0000 (14:09 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  updated NEWS
  Fixed bug #64821 Custom Exceptions crash when internal properties overridden

11 years agoupdated NEWS
Anatol Belski [Sun, 12 May 2013 12:08:42 +0000 (14:08 +0200)]
updated NEWS

11 years agoMerge branch 'PHP-5.3' into PHP-5.4
Anatol Belski [Sun, 12 May 2013 12:06:59 +0000 (14:06 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fixed bug #64821 Custom Exceptions crash when internal properties overridden

11 years agoFixed bug #64821 Custom Exceptions crash when internal properties overridden
Anatol Belski [Sun, 12 May 2013 12:00:32 +0000 (14:00 +0200)]
Fixed bug #64821 Custom Exceptions crash when internal properties overridden

If user inherits Exception and overrides the properties to arbitrary data types,
or simply doesn't run parent::__construct(), here we go. Just convert everything
to the appropriate data type, like Exception::__toString() does.

11 years agoMerge branch 'PHP-5.5'
Anatol Belski [Sat, 11 May 2013 00:48:24 +0000 (02:48 +0200)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  fixed variable corruption under win x64

11 years agofixed variable corruption under win x64
Anatol Belski [Sat, 11 May 2013 00:47:48 +0000 (02:47 +0200)]
fixed variable corruption under win x64

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Xinchen Hui [Thu, 9 May 2013 07:57:44 +0000 (15:57 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5

11 years agoMissed SKIPIF
Xinchen Hui [Thu, 9 May 2013 07:57:25 +0000 (15:57 +0800)]
Missed SKIPIF

11 years agoFix NEWS (wrong bug # AND wrong section...)
Gustavo Lopes [Wed, 8 May 2013 18:03:43 +0000 (20:03 +0200)]
Fix NEWS (wrong bug # AND wrong section...)

It's bug #64508, not #64506.

11 years agoFix bug #64506: fix build with --disable-ipv6
Gustavo Lopes [Wed, 8 May 2013 17:51:39 +0000 (19:51 +0200)]
Fix bug #64506: fix build with --disable-ipv6

11 years agoFixed news, rc1 is already branched
Anatol Belski [Wed, 8 May 2013 17:24:51 +0000 (19:24 +0200)]
Fixed news, rc1 is already branched

11 years agoFixed bug #64769 mbstring PHPTs crash on Windows x64
Anatol Belski [Wed, 8 May 2013 16:58:32 +0000 (18:58 +0200)]
Fixed bug #64769 mbstring PHPTs crash on Windows x64

The tricky business going there in oniguruma is saving a pointer
in an int variable, passing that variable into a function and making
it a pointer again. On 64bit windows casting a pointer to a 32 bit
int will truncate that pointer. This kind of things won't work on
Windows x64.

[SNIPPET]
unsigned long ul0[2], ul1, *ul2;

ul0[0] = 42uL;
ul0[0] = 24uL;

ul1 = (unsigned long)ul0;
ul2 = (unsigned long *)ul1;

/* now it's broken, accessing ul2[0] will crash. */
[/SNIPPET]

To make it portable, ULONG_PTR should be used in this case.

In oniguruma this behaviour is to see at least in the following
codepath:

ext/mbstring/oniguruma/enc/unicode.c:10938
ext/mbstring/oniguruma/st.c:308
ext/mbstring/oniguruma/enc/unicode.c:10859

11 years agoNews for RC2
David Soria Parra [Wed, 8 May 2013 16:57:06 +0000 (18:57 +0200)]
News for RC2

11 years agoNEWS for RC1
David Soria Parra [Wed, 8 May 2013 16:44:05 +0000 (18:44 +0200)]
NEWS for RC1

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Johannes Schlüter [Wed, 8 May 2013 16:03:12 +0000 (18:03 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

11 years agoMerge branch 'PHP-5.3' into PHP-5.4
Johannes Schlüter [Wed, 8 May 2013 16:02:35 +0000 (18:02 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

11 years agoPHP 5.3.25 NEWS
Johannes Schlüter [Wed, 8 May 2013 16:01:39 +0000 (18:01 +0200)]
PHP 5.3.25 NEWS

11 years agoFixed bug #64785 : restore 5.4 behaviour, libpng is mandatory
Remi Collet [Wed, 8 May 2013 05:37:40 +0000 (07:37 +0200)]
Fixed bug #64785 : restore 5.4 behaviour, libpng is mandatory

11 years agoFix #64780 (PHP 5.5 builds are broken with GCC 3)
Ard Biesheuvel [Tue, 7 May 2013 18:37:04 +0000 (20:37 +0200)]
Fix #64780 (PHP 5.5 builds are broken with GCC 3)

A recent change (by me) introduced a call to __builtin_offsetof()
into zend_operators.h which is not defined by GCC prior to
version 4.

Changed the code to use offsetof() instead: this is defined in
<stddef.h>, so #include this header conditionally (#ifdef GNUC)

11 years agoFix for challenge string length pointed out by Kalle Nielsen
jas- [Tue, 7 May 2013 00:43:13 +0000 (18:43 -0600)]
Fix for challenge string length pointed out by Kalle Nielsen

11 years agoAddress feature request #38917 for native SPKAC (HTML5 keygen element) support
jas- [Mon, 6 May 2013 22:36:06 +0000 (16:36 -0600)]
Address feature request #38917 for native SPKAC (HTML5 keygen element) support

11 years agoMerge branch 'PHP-5.5'
Xinchen Hui [Thu, 9 May 2013 07:57:56 +0000 (15:57 +0800)]
Merge branch 'PHP-5.5'

11 years agoMerge branch 'PHP-5.5'
Gustavo Lopes [Wed, 8 May 2013 17:58:43 +0000 (19:58 +0200)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fix bug #64506: fix build with --disable-ipv6

11 years agoMerge branch 'PHP-5.5'
Gustavo Lopes [Wed, 8 May 2013 17:57:23 +0000 (19:57 +0200)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fix bug #64506: fix build with --disable-ipv6

11 years agoFix bug #64506: fix build with --disable-ipv6
Gustavo Lopes [Wed, 8 May 2013 17:51:39 +0000 (19:51 +0200)]
Fix bug #64506: fix build with --disable-ipv6

11 years agoMerge branch 'PHP-5.5'
Anatol Belski [Wed, 8 May 2013 17:26:04 +0000 (19:26 +0200)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fixed news, rc1 is already branched
  Fixed bug #64769 mbstring PHPTs crash on Windows x64

11 years agoMerge branch 'master' of git.php.net:php-src
Anatol Belski [Wed, 8 May 2013 17:19:24 +0000 (19:19 +0200)]
Merge branch 'master' of git.php.net:php-src

11 years agoMerge branch 'PHP-5.5'
Anatol Belski [Wed, 8 May 2013 17:18:00 +0000 (19:18 +0200)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fixed bug #64769 mbstring PHPTs crash on Windows x64

11 years agoFixed bug #64769 mbstring PHPTs crash on Windows x64
Anatol Belski [Wed, 8 May 2013 16:58:32 +0000 (18:58 +0200)]
Fixed bug #64769 mbstring PHPTs crash on Windows x64

The tricky business going there in oniguruma is saving a pointer
in an int variable, passing that variable into a function and making
it a pointer again. On 64bit windows casting a pointer to a 32 bit
int will truncate that pointer. This kind of things won't work on
Windows x64.

[SNIPPET]
unsigned long ul0[2], ul1, *ul2;

ul0[0] = 42uL;
ul0[0] = 24uL;

ul1 = (unsigned long)ul0;
ul2 = (unsigned long *)ul1;

/* now it's broken, accessing ul2[0] will crash. */
[/SNIPPET]

To make it portable, ULONG_PTR should be used in this case.

In oniguruma this behaviour is to see at least in the following
codepath:

ext/mbstring/oniguruma/enc/unicode.c:10938
ext/mbstring/oniguruma/st.c:308
ext/mbstring/oniguruma/enc/unicode.c:10859

11 years agoMerge branch 'PHP-5.5'
David Soria Parra [Wed, 8 May 2013 16:57:23 +0000 (18:57 +0200)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  News for RC2
  NEWS for RC1

11 years agoMerge branch 'PHP-5.5'
Johannes Schlüter [Wed, 8 May 2013 16:03:53 +0000 (18:03 +0200)]
Merge branch 'PHP-5.5'

11 years agoMerge branch 'PHP-5.5'
Remi Collet [Wed, 8 May 2013 05:37:46 +0000 (07:37 +0200)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fixed bug #64785 : restore 5.4 behaviour, libpng is mandatory

11 years agoMerge branch 'PHP-5.5'
Ard Biesheuvel [Tue, 7 May 2013 20:08:24 +0000 (22:08 +0200)]
Merge branch 'PHP-5.5'

11 years agoMerge branch 'PHP-5.5'
Remi Collet [Mon, 6 May 2013 08:25:41 +0000 (10:25 +0200)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  gd: fix 2 failed tests (bundled lib) due to arithmetic precision (allow minor diff).

11 years agogd: fix 2 failed tests (bundled lib) due to arithmetic precision (allow minor diff).
Remi Collet [Mon, 6 May 2013 08:25:36 +0000 (10:25 +0200)]
gd: fix 2 failed tests (bundled lib) due to arithmetic precision (allow minor diff).

11 years agoMerge branch 'PHP-5.5'
Remi Collet [Mon, 6 May 2013 08:07:11 +0000 (10:07 +0200)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  gd: fix previous (bad include)

11 years agogd: fix previous (bad include)
Remi Collet [Mon, 6 May 2013 08:07:06 +0000 (10:07 +0200)]
gd: fix previous (bad include)

11 years agoMerge branch 'PHP-5.5'
Remi Collet [Mon, 6 May 2013 08:02:34 +0000 (10:02 +0200)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  Revert removal of overflow2 use in gd.c Function provided by gd_security with bundled libgd Function provided by gd_compat with system libgd

11 years agoRevert removal of overflow2 use in gd.c
Remi Collet [Mon, 6 May 2013 08:00:45 +0000 (10:00 +0200)]
Revert removal of overflow2 use in gd.c
Function provided by gd_security with bundled libgd
Function provided by gd_compat with system libgd

This fix failed test imageloadfont_invalid.phpt
This test now also pass with system libgd

11 years agoMerge branch 'PHP-5.5'
Remi Collet [Sun, 5 May 2013 08:39:37 +0000 (10:39 +0200)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  gd: fix include...

11 years agogd: fix include...
Remi Collet [Sun, 5 May 2013 08:39:33 +0000 (10:39 +0200)]
gd: fix include...

11 years agoMerge branch 'PHP-5.5'
Remi Collet [Sun, 5 May 2013 07:56:52 +0000 (09:56 +0200)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  Move (back) missing functions in system libgd to gd_compat - display libPng version in all cases - gd_compat.c in ext/gd (nothing in ext/gd/libgd)

11 years agoMove (back) missing functions in system libgd to gd_compat
Remi Collet [Sun, 5 May 2013 07:54:27 +0000 (09:54 +0200)]
Move (back) missing functions in system libgd to gd_compat
- display libPng version in all cases
- gd_compat.c in ext/gd (nothing in ext/gd/libgd)

11 years agoMerge branch 'PHP-5.5'
Remi Collet [Sun, 5 May 2013 06:35:34 +0000 (08:35 +0200)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  gd: don't include png.h (breaks build on some old version), so report libPNG version only with external libgd

11 years agogd: don't include png.h (breaks build on some old version), so report libPNG version...
Remi Collet [Sun, 5 May 2013 06:35:29 +0000 (08:35 +0200)]
gd: don't include png.h (breaks build on some old version), so report libPNG version only with external libgd

11 years agoMerge branch 'PHP-5.5'
Remi Collet [Sun, 5 May 2013 04:52:35 +0000 (06:52 +0200)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  gd: missing comma