[PHP-CVS] com php-src: Merge remote branch 'upstream/master' into hash_password: ext/standard/basic_functions.c main/main.c

2012-10-16 Thread Anthony Ferrara
Commit:824f1f45818096eff0e022ba2a1cbc2071343c9a
Author:Anthony Ferrara ircmax...@gmail.com Tue, 4 Sep 2012 
10:29:22 -0400
Parents:   e05413ca594ff10fd93d40429cb598c2e109edf4 
4b206126aca2ad9181abe65d70367680a4bc4c03
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=824f1f45818096eff0e022ba2a1cbc2071343c9a

Log:
Merge remote branch 'upstream/master' into hash_password

* upstream/master: (393 commits)
  forked two tests for windows
  Fixed bug #50997 (SOAP Error when trying to submit 2nd Element of a choice)
  Fixed bug #50997 (SOAP Error when trying to submit 2nd Element of a choice).
  Fixed bug #50997 (SOAP Error when trying to submit 2nd Element of a choice).
  Fixed bug #50997 (SOAP Error when trying to submit 2nd Element of a choice)
  Fixed bug #50997 (SOAP Error when trying to submit 2nd Element of a choice)
  Bug #49510: Boolean validation fails with FILTER_NULL_ON_FAILURE with empty 
string or false
  Implemented ReflectionFunction::isGenerator()
  Allow null as a default value for length in mb_substr() and mb_strcut()
  Allow null as a default value for length in mb_substr() and mb_strcut()
  folder
  Initializing optional argument description in assert()
  Initializing optional argument description in assert()
  Fix test failed due to new Token T_YIELD
  fix NEWS
  Fix leak when yielding array as key
  Drop obsolete test
  Remove extra blank in notice message, should act as same as vm
  Fixed bug #62987 (Assigning to ArrayObject[null][something] overrides all 
undefined variables)
  assert() user message
  ...

Bugs:
https://bugs.php.net/50997
https://bugs.php.net/49510
https://bugs.php.net/62987

Changed paths:
  MM  ext/standard/basic_functions.c
  MM  main/main.c


Diff:



--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



[PHP-CVS] com php-src: Merge remote branch 'upstream/master' into hash_password: ext/standard/basic_functions.c

2012-10-16 Thread Anthony Ferrara
Commit:99b7956ad58395853f7950ae01a43139413d348d
Author:Anthony Ferrara ircmax...@gmail.com Tue, 10 Jul 2012 
10:33:51 -0400
Parents:   9d3630b5dc8fa066dc4212ead2fffc8635f5bc0a 
b210766084cbd00b0e479d2800e1920271a3faba
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=99b7956ad58395853f7950ae01a43139413d348d

Log:
Merge remote branch 'upstream/master' into hash_password

* upstream/master: (34 commits)
  Fixed Bug #62500 (Segfault in DateInterval class when extended)
  Fixed test bug #62312 (warnings changed one more time)
  fix valgrind warning
  fix valgrind warning
  fixed #62433 test for win
  update NEWS
  Fixed bug #62499 (curl_setopt($ch, CURLOPT_COOKIEFILE, ) returns false)
  appease MSVC (doesnt like unary minus of unsigned ints)
  appease MSVC (doesnt like unary minus of unsigned ints)
  appease MSVC (doesnt like unary minus of unsigned ints)
  - Fixed bug #62507 (['REQUEST_TIME'] under mod_php5 returns miliseconds 
instead of seconds)
  Fixed Bug #62500 (Segfault in DateInterval class when extended)
  Added in NEWS and UPGRADING for feature 55218
  Fix two issues with run-tests.php
  Fix potential integer overflow in nl2br
  Fix potential integer overflow in bin2hex
  This wil be PHP 5.3.16
  Revert change 3f3ad30c50: There shouldn't be new features in 5.3, especially 
not if they aren't in 5.4, too.
  fix (signed) integer overflow (part of bug #52550
  fix (signed) integer overflow (part of bug #52550
  ...

Bugs:
https://bugs.php.net/62500
https://bugs.php.net/62312
https://bugs.php.net/62433
https://bugs.php.net/62499
https://bugs.php.net/62507
https://bugs.php.net/52550

Changed paths:
  MM  ext/standard/basic_functions.c


Diff:



--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php