]> granicus.if.org Git - php/log
php
11 years agoMerge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
Christopher Jones [Wed, 31 Jul 2013 16:01:56 +0000 (09:01 -0700)]
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5

* 'PHP-5.5' of https://git.php.net/repository/php-src:
  Improved fix for bug #44686 (SOAP-ERROR: Parsing WSDL)
  Fixed bug #65018 (SoapHeader problems with SoapServer)
  Added opcache.restrict_api configuration directive that may limit usage of OPcahce API functions only to patricular script(s)
  MFH: fixed #65045: mb_convert_encoding breaks well-formed character.
  Fixed php-5.2 support
  added test script for bug65045.
  MFH: fixed #65045: mb_convert_encoding breaks well-formed character.
  Added support for glob symbols in blacklist entries (?, *, **)
  Fixed bug #65336

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Dmitry Stogov [Wed, 31 Jul 2013 13:37:08 +0000 (17:37 +0400)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Improved fix for bug #44686 (SOAP-ERROR: Parsing WSDL)

11 years agoImproved fix for bug #44686 (SOAP-ERROR: Parsing WSDL)
Dmitry Stogov [Wed, 31 Jul 2013 13:36:06 +0000 (17:36 +0400)]
Improved fix for bug #44686 (SOAP-ERROR: Parsing WSDL)

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Dmitry Stogov [Wed, 31 Jul 2013 12:34:26 +0000 (16:34 +0400)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #65018 (SoapHeader problems with SoapServer)
  MFH: fixed #65045: mb_convert_encoding breaks well-formed character.
  Fixed bug #65336

Conflicts:
NEWS

11 years agoFixed bug #65018 (SoapHeader problems with SoapServer)
Dmitry Stogov [Wed, 31 Jul 2013 12:32:26 +0000 (16:32 +0400)]
Fixed bug #65018 (SoapHeader problems with SoapServer)

11 years agoAdded opcache.restrict_api configuration directive that may limit usage of OPcahce...
Dmitry Stogov [Wed, 31 Jul 2013 10:20:56 +0000 (14:20 +0400)]
Added opcache.restrict_api configuration directive that may limit usage of OPcahce API functions only to patricular script(s)

11 years agoMFH: fixed #65045: mb_convert_encoding breaks well-formed character.
Rui Hirokawa [Tue, 30 Jul 2013 23:46:54 +0000 (08:46 +0900)]
MFH: fixed #65045: mb_convert_encoding breaks well-formed character.

11 years agoMerge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
Dmitry Stogov [Tue, 30 Jul 2013 23:24:04 +0000 (03:24 +0400)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

* 'PHP-5.5' of git.php.net:php-src:
  added test script for bug65045.
  MFH: fixed #65045: mb_convert_encoding breaks well-formed character.

11 years agoFixed php-5.2 support
Dmitry Stogov [Tue, 30 Jul 2013 23:22:34 +0000 (03:22 +0400)]
Fixed php-5.2 support

11 years agoMerge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
Rui Hirokawa [Tue, 30 Jul 2013 23:18:51 +0000 (08:18 +0900)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

11 years agoadded test script for bug65045.
Rui Hirokawa [Tue, 30 Jul 2013 23:18:39 +0000 (08:18 +0900)]
added test script for bug65045.

11 years agoMFH: fixed #65045: mb_convert_encoding breaks well-formed character.
Rui Hirokawa [Tue, 30 Jul 2013 23:17:15 +0000 (08:17 +0900)]
MFH: fixed #65045: mb_convert_encoding breaks well-formed character.

11 years agoMerge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
Dmitry Stogov [Tue, 30 Jul 2013 23:04:48 +0000 (03:04 +0400)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

* 'PHP-5.5' of git.php.net:php-src:

11 years agoAdded support for glob symbols in blacklist entries (?, *, **)
Dmitry Stogov [Tue, 30 Jul 2013 23:01:19 +0000 (03:01 +0400)]
Added support for glob symbols in blacklist entries (?, *, **)

11 years agoMerge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
Christopher Jones [Tue, 30 Jul 2013 20:39:20 +0000 (13:39 -0700)]
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5

* 'PHP-5.5' of https://git.php.net/repository/php-src:
  Improved implementation of NOP removal pass from O(n^2) to O(n) (hnw)
  A minor fix for configure outpu (Tony)

11 years agoImproved implementation of NOP removal pass from O(n^2) to O(n) (hnw)
Dmitry Stogov [Tue, 30 Jul 2013 18:31:37 +0000 (22:31 +0400)]
Improved implementation of NOP removal pass from O(n^2) to O(n) (hnw)

11 years agoA minor fix for configure outpu (Tony)
Dmitry Stogov [Tue, 30 Jul 2013 18:03:21 +0000 (22:03 +0400)]
A minor fix for configure outpu (Tony)

11 years agoFixed bug #65338 (Enabling both php_opcache and php_wincache AVs on shutdown).
Dmitry Stogov [Tue, 30 Jul 2013 13:35:19 +0000 (17:35 +0400)]
Fixed bug #65338 (Enabling both php_opcache and php_wincache AVs on shutdown).

11 years agoMerge from GitHub
Dmitry Stogov [Sun, 28 Jul 2013 09:47:13 +0000 (13:47 +0400)]
Merge from GitHub

11 years agoUpdate NEWS
Yasuo Ohgaki [Fri, 26 Jul 2013 20:51:30 +0000 (05:51 +0900)]
Update NEWS

11 years agoFixed bug #65336
Yasuo Ohgaki [Fri, 26 Jul 2013 20:46:11 +0000 (05:46 +0900)]
Fixed bug #65336

11 years agoFixed bug #65336
Yasuo Ohgaki [Fri, 26 Jul 2013 20:46:11 +0000 (05:46 +0900)]
Fixed bug #65336

11 years agoMerge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
Christopher Jones [Thu, 25 Jul 2013 17:57:47 +0000 (10:57 -0700)]
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5

* 'PHP-5.5' of https://git.php.net/repository/php-src:

11 years agoMerge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
Christopher Jones [Thu, 25 Jul 2013 17:57:46 +0000 (10:57 -0700)]
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4

* 'PHP-5.4' of https://git.php.net/repository/php-src:

11 years agoMerge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
Christopher Jones [Thu, 25 Jul 2013 17:42:45 +0000 (10:42 -0700)]
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5

* 'PHP-5.5' of https://git.php.net/repository/php-src:
  Upper section name
  Update NEWs
  Fixed bug #65328 (Segfault when getting SplStack object Value)

11 years agoMerge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
Christopher Jones [Thu, 25 Jul 2013 17:42:43 +0000 (10:42 -0700)]
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4

* 'PHP-5.4' of https://git.php.net/repository/php-src:
  Upper section name
  Fixed bug #65328 (Segfault when getting SplStack object Value)

11 years agoMerge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
Christopher Jones [Thu, 25 Jul 2013 15:53:29 +0000 (08:53 -0700)]
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5

# By Johannes Schlüter (3) and others
# Via Xinchen Hui (3) and others
* 'PHP-5.5' of https://git.php.net/repository/php-src:
  Upper section name
  Update NEWs
  Fixed bug #65328 (Segfault when getting SplStack object Value)
  Expand the ZEND_STRL macro to handle platforms where strncmp() is a macro.
  fix missing include
  Fix bug 65299
  Fix compiler warning on redefined constant
  Fix comment
  fixed bug #65311 testsuite failure due to incomplete fix to bug28985.phpt
  fix bug #65028  Phar::buildFromDirectory creates corrupt archives for some specific contents

11 years agoMerge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
Christopher Jones [Thu, 25 Jul 2013 15:53:26 +0000 (08:53 -0700)]
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4

# By Xinchen Hui (2) and others
# Via Stanislav Malyshev (1) and Xinchen Hui (1)
* 'PHP-5.4' of https://git.php.net/repository/php-src:
  Upper section name
  Fixed bug #65328 (Segfault when getting SplStack object Value)
  Fix compiler warning on redefined constant
  fixed bug #65311 testsuite failure due to incomplete fix to bug28985.phpt
  fix bug #65028  Phar::buildFromDirectory creates corrupt archives for some specific contents

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Xinchen Hui [Thu, 25 Jul 2013 14:45:44 +0000 (22:45 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5

11 years agoUpper section name
Xinchen Hui [Thu, 25 Jul 2013 14:45:15 +0000 (22:45 +0800)]
Upper section name

11 years agoUpdate NEWs
Xinchen Hui [Thu, 25 Jul 2013 14:44:59 +0000 (22:44 +0800)]
Update NEWs

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Xinchen Hui [Thu, 25 Jul 2013 14:44:19 +0000 (22:44 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5

11 years agoFixed bug #65328 (Segfault when getting SplStack object Value)
Xinchen Hui [Thu, 25 Jul 2013 14:43:41 +0000 (22:43 +0800)]
Fixed bug #65328 (Segfault when getting SplStack object Value)

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Stanislav Malyshev [Wed, 24 Jul 2013 04:44:54 +0000 (21:44 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix bug #65028  Phar::buildFromDirectory creates corrupt archives for some specific contents

11 years agoMerge branch 'bug65028' into PHP-5.4
Stanislav Malyshev [Wed, 24 Jul 2013 04:44:06 +0000 (21:44 -0700)]
Merge branch 'bug65028' into PHP-5.4

* bug65028:
  fix bug #65028  Phar::buildFromDirectory creates corrupt archives for some specific contents

11 years agoExpand the ZEND_STRL macro to handle platforms where strncmp() is a macro.
Adam Harvey [Tue, 23 Jul 2013 18:15:43 +0000 (11:15 -0700)]
Expand the ZEND_STRL macro to handle platforms where strncmp() is a macro.

On most platforms, this works fine, but on Linux armhf, strncmp() is a macro
rather than a real function, ergo the macro expansion of ZEND_STRL doesn't
occur until after the compiler knows it needs three parameters for strncmp()
and we get a compile error.

Fixes the fix for bug #61697.

11 years agofix missing include
Anatol Belski [Tue, 23 Jul 2013 16:06:51 +0000 (18:06 +0200)]
fix missing include

11 years agoFix bug 65299
Johannes Schlüter [Tue, 23 Jul 2013 12:13:22 +0000 (14:13 +0200)]
Fix bug 65299

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Johannes Schlüter [Tue, 23 Jul 2013 10:57:08 +0000 (12:57 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

11 years agoFix compiler warning on redefined constant
Johannes Schlüter [Tue, 23 Jul 2013 10:50:37 +0000 (12:50 +0200)]
Fix compiler warning on redefined constant

11 years agoFix comment
Johannes Schlüter [Tue, 23 Jul 2013 10:41:24 +0000 (12:41 +0200)]
Fix comment

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Anatol Belski [Tue, 23 Jul 2013 08:00:07 +0000 (10:00 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fixed bug #65311 testsuite failure due to incomplete fix to bug28985.phpt

11 years agofixed bug #65311 testsuite failure due to incomplete fix to bug28985.phpt
Anatol Belski [Tue, 23 Jul 2013 07:59:08 +0000 (09:59 +0200)]
fixed bug #65311 testsuite failure due to incomplete fix to bug28985.phpt

11 years agoMerge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
Christopher Jones [Mon, 22 Jul 2013 17:59:01 +0000 (10:59 -0700)]
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5

# By Anatol Belski (12) and others
# Via Stanislav Malyshev (12) and others
* 'PHP-5.5' of https://git.php.net/repository/php-src: (74 commits)
  fixed possible null deref
  - addressed bug #65159, Misleading configure help text for --with-mysql-sock
  Fix bug #61697 - spl_autoload_functions returns lambda functions incorrectly
  Update news for FILTER_SANITIZE_FULL_SPECIAL_CHARS fix
  Wrong value for FILTER_SANITIZE_FULL_SPECIAL_CHARS in REGISTER_LONG_CONSTANT
  Added recursivetreeiterator::setPostfix() method
  next is 5.5.2
  add a few comment
  allow both the old and new cfg argument to work. (the old of course should contain the typo)
  mssql.compatability_mode fix
  backward compatibility
  HASH_KEY_NON_EXISTANT fix
  Update NEWS
  Fixed bug #65304 (Use of max int in array_sum)
  Updaet NEWS
  Reorder NEWS
  intl: remove extra quotes from arginfo params
  Fixed bug #65291 - get_defined_constants() crash with __CLASS__ in trait
  Fixed bug #65291 - get_defined_constants() crash with __CLASS__ in trait
  Properly fixed bug #63186 on NetBSD == 6.0
  ...

11 years agoMerge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
Christopher Jones [Mon, 22 Jul 2013 17:58:57 +0000 (10:58 -0700)]
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4

# By Anatol Belski (8) and others
# Via Anatol Belski (2) and others
* 'PHP-5.4' of https://git.php.net/repository/php-src: (44 commits)
  fixed possible null deref
  - addressed bug #65159, Misleading configure help text for --with-mysql-sock
  Update news for FILTER_SANITIZE_FULL_SPECIAL_CHARS fix
  Wrong value for FILTER_SANITIZE_FULL_SPECIAL_CHARS in REGISTER_LONG_CONSTANT
  Fixed bug #65304 (Use of max int in array_sum)
  Reorder NEWS
  Fixed bug #65291 - get_defined_constants() crash with __CLASS__ in trait
  Fixed bug #65291 - get_defined_constants() crash with __CLASS__ in trait
  Properly fixed bug #63186 on NetBSD == 6.0
  Improve php.ini-* documentation
  5.4.19 is next
  Fixed bug #50308 - session id not appended properly for empty anchor tags
  Fix bug #62129 - rfc1867 crashes php even though turned off
  add news for xml fix
  fix TS build
  added sapi check for dl() test
  Make zval2myslqnd implementations aware of inheritance
  Fixed typo ensuring header str is \0 terminated
  fix buffer overrun
  fix invalid variable name at ext/spl/internal/multipleiterator.inc (key() method, too)
  ...

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Anatol Belski [Mon, 22 Jul 2013 12:51:11 +0000 (14:51 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fixed possible null deref

11 years agofixed possible null deref
Anatol Belski [Mon, 22 Jul 2013 12:50:18 +0000 (14:50 +0200)]
fixed possible null deref

11 years agofix bug #65028 Phar::buildFromDirectory creates corrupt archives for some specific...
Stanislav Malyshev [Mon, 22 Jul 2013 07:56:45 +0000 (00:56 -0700)]
fix bug #65028  Phar::buildFromDirectory creates corrupt archives for some specific contents

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Stanislav Malyshev [Mon, 22 Jul 2013 06:14:42 +0000 (23:14 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  - addressed bug #65159, Misleading configure help text for --with-mysql-sock

11 years ago- addressed bug #65159, Misleading configure help text for --with-mysql-sock
Yoshinari Takaoka [Sun, 21 Jul 2013 17:33:56 +0000 (02:33 +0900)]
- addressed bug #65159, Misleading configure help text for --with-mysql-sock

11 years agoFix bug #61697 - spl_autoload_functions returns lambda functions incorrectly
Stanislav Malyshev [Mon, 22 Jul 2013 05:47:10 +0000 (22:47 -0700)]
Fix bug #61697 - spl_autoload_functions returns lambda functions incorrectly

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Stanislav Malyshev [Mon, 22 Jul 2013 05:30:00 +0000 (22:30 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Update news for FILTER_SANITIZE_FULL_SPECIAL_CHARS fix
  Wrong value for FILTER_SANITIZE_FULL_SPECIAL_CHARS in REGISTER_LONG_CONSTANT

11 years agoUpdate news for FILTER_SANITIZE_FULL_SPECIAL_CHARS fix
Stanislav Malyshev [Mon, 22 Jul 2013 05:28:02 +0000 (22:28 -0700)]
Update news for FILTER_SANITIZE_FULL_SPECIAL_CHARS fix

11 years agoWrong value for FILTER_SANITIZE_FULL_SPECIAL_CHARS in REGISTER_LONG_CONSTANT
Andrey [Wed, 17 Jul 2013 21:49:51 +0000 (22:49 +0100)]
Wrong value for FILTER_SANITIZE_FULL_SPECIAL_CHARS in REGISTER_LONG_CONSTANT

11 years agoAdded recursivetreeiterator::setPostfix() method
Joshua Thijssen [Mon, 21 May 2012 13:30:24 +0000 (15:30 +0200)]
Added recursivetreeiterator::setPostfix() method

11 years agonext is 5.5.2
Stanislav Malyshev [Mon, 22 Jul 2013 04:16:39 +0000 (21:16 -0700)]
next is 5.5.2

11 years agoadd a few comment
Veres Lajos [Mon, 15 Jul 2013 21:48:06 +0000 (22:48 +0100)]
add a few comment

11 years agoallow both the old and new cfg argument to work. (the old of course should contain...
Lajos Veres [Mon, 15 Jul 2013 13:05:19 +0000 (14:05 +0100)]
allow both the old and new cfg argument to work. (the old of course should contain the typo)

11 years agomssql.compatability_mode fix
Veres Lajos [Sat, 13 Jul 2013 12:14:54 +0000 (13:14 +0100)]
mssql.compatability_mode fix

11 years agobackward compatibility
Lajos Veres [Mon, 15 Jul 2013 13:01:43 +0000 (14:01 +0100)]
backward compatibility

11 years agoHASH_KEY_NON_EXISTANT fix
Veres Lajos [Mon, 8 Jul 2013 21:09:06 +0000 (22:09 +0100)]
HASH_KEY_NON_EXISTANT fix

11 years agoUpdate NEWS
Xinchen Hui [Sun, 21 Jul 2013 13:07:38 +0000 (21:07 +0800)]
Update NEWS

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Xinchen Hui [Sun, 21 Jul 2013 13:07:27 +0000 (21:07 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5

11 years agoFixed bug #65304 (Use of max int in array_sum)
Xinchen Hui [Sun, 21 Jul 2013 13:07:19 +0000 (21:07 +0800)]
Fixed bug #65304 (Use of max int in array_sum)

11 years agoUpdaet NEWS
Xinchen Hui [Sun, 21 Jul 2013 08:19:40 +0000 (16:19 +0800)]
Updaet NEWS

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Xinchen Hui [Sun, 21 Jul 2013 08:19:13 +0000 (16:19 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5

11 years agoReorder NEWS
Xinchen Hui [Sun, 21 Jul 2013 07:58:10 +0000 (15:58 +0800)]
Reorder NEWS

11 years agointl: remove extra quotes from arginfo params
Gustavo André dos Santos Lopes [Sun, 21 Jul 2013 01:29:36 +0000 (03:29 +0200)]
intl: remove extra quotes from arginfo params

11 years agoFixed bug #65291 - get_defined_constants() crash with __CLASS__ in trait
Arpad Ray [Sat, 20 Jul 2013 10:05:13 +0000 (11:05 +0100)]
Fixed bug #65291 - get_defined_constants() crash with __CLASS__ in trait

Also fix and test for get_defined_constants(true)

11 years agoFixed bug #65291 - get_defined_constants() crash with __CLASS__ in trait
Arpad Ray [Fri, 19 Jul 2013 18:19:48 +0000 (19:19 +0100)]
Fixed bug #65291 - get_defined_constants() crash with __CLASS__ in trait

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Matteo Beccati [Fri, 19 Jul 2013 07:39:53 +0000 (09:39 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Properly fixed bug #63186 on NetBSD == 6.0

11 years agoProperly fixed bug #63186 on NetBSD == 6.0
Matteo Beccati [Mon, 8 Jul 2013 17:25:03 +0000 (19:25 +0200)]
Properly fixed bug #63186 on NetBSD == 6.0

11 years agoFixed bug #65268 select() implementation uses outdated tick API
Anatol Belski [Thu, 18 Jul 2013 16:01:51 +0000 (18:01 +0200)]
Fixed bug #65268 select() implementation uses outdated tick API

11 years agofix header include
Anatol Belski [Thu, 18 Jul 2013 13:28:20 +0000 (15:28 +0200)]
fix header include

stddef.h is needed to have offsetof macros on windows (at least)

11 years agonew NEWS for next release
Julien Pauli [Thu, 18 Jul 2013 09:54:09 +0000 (11:54 +0200)]
new NEWS for next release

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Yasuo Ohgaki [Thu, 18 Jul 2013 05:10:05 +0000 (14:10 +0900)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Improve php.ini-* documentation

11 years agoImprove php.ini-* documentation
Yasuo Ohgaki [Thu, 18 Jul 2013 05:08:28 +0000 (14:08 +0900)]
Improve php.ini-* documentation

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Stanislav Malyshev [Wed, 17 Jul 2013 20:52:25 +0000 (13:52 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  5.4.19 is next

Conflicts:
configure.in
main/php_version.h

11 years ago5.4.19 is next
Stanislav Malyshev [Wed, 17 Jul 2013 20:51:15 +0000 (13:51 -0700)]
5.4.19 is next

11 years agoregenerate url scanner
Arpad Ray [Wed, 17 Jul 2013 15:28:01 +0000 (16:28 +0100)]
regenerate url scanner

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Arpad Ray [Wed, 17 Jul 2013 15:19:53 +0000 (16:19 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #50308 - session id not appended properly for empty anchor tags

11 years agoFixed bug #50308 - session id not appended properly for empty anchor tags
Arpad Ray [Wed, 17 Jul 2013 15:07:26 +0000 (16:07 +0100)]
Fixed bug #50308 - session id not appended properly for empty anchor tags

The issue was actually because a lack of space before a "/" marking the tag
as empty. This was being swallowed in the rule for unquoted values. Fixed
by making that rule exclude quotes (as per spec anyway).

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Arpad Ray [Wed, 17 Jul 2013 10:05:23 +0000 (11:05 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix bug #62129 - rfc1867 crashes php even though turned off

11 years agoFix bug #62129 - rfc1867 crashes php even though turned off
Arpad Ray [Wed, 17 Jul 2013 10:02:48 +0000 (11:02 +0100)]
Fix bug #62129 - rfc1867 crashes php even though turned off

Patch by gxd305 at gmail dot com

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Stanislav Malyshev [Tue, 16 Jul 2013 22:39:16 +0000 (15:39 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  add news for xml fix

11 years agoadd news for xml fix
Stanislav Malyshev [Tue, 16 Jul 2013 22:38:37 +0000 (15:38 -0700)]
add news for xml fix

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Anatol Belski [Tue, 16 Jul 2013 16:05:45 +0000 (18:05 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix TS build

11 years agofix TS build
Anatol Belski [Tue, 16 Jul 2013 16:05:14 +0000 (18:05 +0200)]
fix TS build

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Anatol Belski [Tue, 16 Jul 2013 13:43:37 +0000 (15:43 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  added sapi check for dl() test

11 years agoadded sapi check for dl() test
Anatol Belski [Tue, 16 Jul 2013 13:42:38 +0000 (15:42 +0200)]
added sapi check for dl() test

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Johannes Schlüter [Tue, 16 Jul 2013 11:55:32 +0000 (13:55 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

11 years agoMake zval2myslqnd implementations aware of inheritance
Johannes Schlüter [Tue, 16 Jul 2013 11:52:57 +0000 (13:52 +0200)]
Make zval2myslqnd implementations aware of inheritance

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Anatol Belski [Mon, 15 Jul 2013 22:15:29 +0000 (00:15 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed typo ensuring header str is \0 terminated

11 years agoFixed typo ensuring header str is \0 terminated
Anatol Belski [Mon, 15 Jul 2013 22:14:05 +0000 (00:14 +0200)]
Fixed typo ensuring header str is \0 terminated

This was obviously intended to send an empty header if
php_gmtime_r() fails. Currently it could send garbage.

11 years agoNEWS for 710150c and e2744f1
Gustavo Lopes [Mon, 15 Jul 2013 22:02:43 +0000 (00:02 +0200)]
NEWS for 710150c and e2744f1

11 years agosocket: support unix paths in the abstract namespace
Gustavo Lopes [Sun, 14 Jul 2013 23:51:15 +0000 (01:51 +0200)]
socket: support unix paths in the abstract namespace

Those starting with '\0'.

11 years agosocket: fix bug #65260 (SCM_RIGHTS)
Gustavo Lopes [Sun, 14 Jul 2013 23:44:38 +0000 (01:44 +0200)]
socket: fix bug #65260 (SCM_RIGHTS)

The data for messages of type SOL_SOCKET/SCM_RIGHTS was not being
passed correctly. There were actually two bugs: (1) the number of file
descriptors being passed was being read incorrectly (the length of the
cmsg array was being read instead of that of its 'data' element), as a
result it was generally being reported as always three elements
('level', 'type' and 'data') and (2) the allocated block for writing
the file descriptors was being acessed incorrectly because a 1-based
counter was being used as if it was 0-based.

Any of these two bugs would probably be enough to cause heap
corruption.

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Anatol Belski [Mon, 15 Jul 2013 15:35:29 +0000 (17:35 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix buffer overrun

11 years agofix buffer overrun
Anatol Belski [Mon, 15 Jul 2013 15:34:36 +0000 (17:34 +0200)]
fix buffer overrun

11 years agokick unused var
Anatol Belski [Mon, 15 Jul 2013 15:23:16 +0000 (17:23 +0200)]
kick unused var