]> granicus.if.org Git - php/log
php
12 years agoExpose zend_parse_arg() as zend_parse_parameter()
Gustavo André dos Santos Lopes [Wed, 18 Jul 2012 20:05:42 +0000 (22:05 +0200)]
Expose zend_parse_arg() as zend_parse_parameter()

Sometimes, one wants to accept several types for a given parameter. zpp
has special functionality for detecting the NULL type, since the NULL
type is frequently used to skip parameters.

However, supporting several types is otherwise very tedious. There are
many cases where this situation arises -- for instance one may want
to accept an arbitrary number of integer and expect them in an array,
but allow a bare integer too; one may want to accept something that
will be used as an array key (which can be either and int or a string);
one may want to accept integer and double numbers. A search for IS_LONG
reveals many situations where this need arises.

The usual solution is to fetch the argument with 'z'/'Z', check its
type, and then convert the argument, e.g. with convert_to_long_ex().
As explain in the last commit, this has different behavior and
generates inconsistency.

Another -- even more flawed strategy --, is to try zpp with a specific
format, forcing it quiet, and if it fails retrying with another form.
But because zpp changes the arguments directly in the stack (for
instance, using "l" converts the zval in the stack to IS_LONG), the
arguments may look different after the first zpp, leaving subtle bugs.

This commit also allows more complex scenarios, for instance where the
expected type of one parameter depends on other parameters.

12 years agozend_parse_parameters: allow ! for non pointers
Gustavo André dos Santos Lopes [Wed, 18 Jul 2012 19:42:36 +0000 (21:42 +0200)]
zend_parse_parameters: allow ! for non pointers

This commit allows getting information about whether a certain value
was a NULL value by using the ! modifier together with the l/L, d and
b.

Example:
long l;
zend_bool is_null;
zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l!", &l, &is_null)

For the specifiers l/L, d and b, NULL values are reported as 0, 0., or
false. But sometimes one wants to distinguish NULL from those other
values -- for instance, to give NULL the same effect as the argument
not having been passed.

The usual way this problem is handled is by fetching the parameter
with 'z' or 'Z', check if it is NULL and if not use
convert_to_long_ex()/convert_to_double_ex(), etc. Unfortunately, this
is not equivalent. convert_to_long_ex() does a cast, while zpp() is
stricter. For instance, zpp will not accept 'foo' for a long argument,
and it will emit a notice when encountering '5foo'.

In fact, the only way to otherwise zpp semantics (without duplicating
its logic) is to fetch the raw zval from the stack and check whether
it's NULL (with zpp itself or its relatives) and then run zpp again.
That is not an elegant solution.

12 years agoRevert "fix test"
Xinchen Hui [Wed, 18 Jul 2012 14:35:03 +0000 (22:35 +0800)]
Revert "fix test"

This reverts commit cea3f0f3635179c052ba2d13d889a82b5a327ddb.

seems the behavior is different between certain versions

12 years agoMerge branch 'PHP-5.4'
Xinchen Hui [Wed, 18 Jul 2012 13:49:46 +0000 (21:49 +0800)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  this initialization is unnecessary anymore after commit 2d9d2cadadf0fdf12a01b4a689d0554e1450904f

12 years agothis initialization is unnecessary anymore after commit 2d9d2cadadf0fdf12a01b4a689d05...
Xinchen Hui [Wed, 18 Jul 2012 13:45:37 +0000 (21:45 +0800)]
this initialization is unnecessary anymore after commit 2d9d2cadadf0fdf12a01b4a689d0554e1450904f

12 years agoMerge branch 'PHP-5.4'
Xinchen Hui [Wed, 18 Jul 2012 12:17:42 +0000 (20:17 +0800)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  Fixed bug #62597 (segfault in php_stream_wrapper_log_error with ZTS build)

12 years agoFixed bug #62597 (segfault in php_stream_wrapper_log_error with ZTS build)
Xinchen Hui [Wed, 18 Jul 2012 12:16:27 +0000 (20:16 +0800)]
Fixed bug #62597 (segfault in php_stream_wrapper_log_error with ZTS build)

12 years agoMerge branch 'PHP-5.4'
Xinchen Hui [Wed, 18 Jul 2012 11:50:59 +0000 (19:50 +0800)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  Fix test (no charset outputed)

12 years agoFix test (no charset outputed)
Xinchen Hui [Wed, 18 Jul 2012 11:50:30 +0000 (19:50 +0800)]
Fix test (no charset outputed)

12 years agoMerge branch 'PHP-5.4'
Xinchen Hui [Wed, 18 Jul 2012 11:48:27 +0000 (19:48 +0800)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  skip for ZTS

12 years agoskip for ZTS
Xinchen Hui [Wed, 18 Jul 2012 11:47:54 +0000 (19:47 +0800)]
skip for ZTS

12 years agoMerge branch 'PHP-5.4'
Xinchen Hui [Wed, 18 Jul 2012 11:25:56 +0000 (19:25 +0800)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  fix test (dos2unix, typo)

12 years agofix test (dos2unix, typo)
Xinchen Hui [Wed, 18 Jul 2012 11:25:22 +0000 (19:25 +0800)]
fix test (dos2unix, typo)

12 years agoMerge branch 'PHP-5.4'
Xinchen Hui [Wed, 18 Jul 2012 11:22:13 +0000 (19:22 +0800)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  fix test, the key may be a float value

12 years agofix test, the key may be a float value
Xinchen Hui [Wed, 18 Jul 2012 11:21:25 +0000 (19:21 +0800)]
fix test, the key may be a float value

12 years agotest script for bug #61697
Xinchen Hui [Wed, 18 Jul 2012 11:19:31 +0000 (19:19 +0800)]
test script for bug #61697

12 years agoMerge branch 'PHP-5.4'
Xinchen Hui [Wed, 18 Jul 2012 11:06:58 +0000 (19:06 +0800)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  Fixed bug #62594 (segfault in mysqlnd_res_meta::set_mode)

12 years agoFixed bug #62594 (segfault in mysqlnd_res_meta::set_mode)
Xinchen Hui [Wed, 18 Jul 2012 11:06:27 +0000 (19:06 +0800)]
Fixed bug #62594 (segfault in mysqlnd_res_meta::set_mode)

12 years agofix test
Xinchen Hui [Wed, 18 Jul 2012 10:50:42 +0000 (18:50 +0800)]
fix test

All input characters that are not a-z, A-Z or 0-9 will be converted to their "URL escaped" version

see http://curl.haxx.se/libcurl/c/curl_escape.html

12 years agoMerge branch 'PHP-5.4'
Xinchen Hui [Wed, 18 Jul 2012 10:00:58 +0000 (18:00 +0800)]
Merge branch 'PHP-5.4'

12 years agoBug doesn't exists in any release
Xinchen Hui [Wed, 18 Jul 2012 10:00:09 +0000 (18:00 +0800)]
Bug doesn't exists in any release

12 years agoMerge branch '5.4'
Gustavo André dos Santos Lopes [Tue, 17 Jul 2012 21:13:43 +0000 (23:13 +0200)]
Merge branch '5.4'

* 5.4:
  NEWS for b47d6b32
  Fix test fails: ext/standard/tests/general_functions/bug27678.phpt

12 years agoNEWS for b47d6b32
Gustavo André dos Santos Lopes [Tue, 17 Jul 2012 21:12:25 +0000 (23:12 +0200)]
NEWS for b47d6b32

12 years agoFix test fails: ext/standard/tests/general_functions/bug27678.phpt
Reeze Xia [Tue, 17 Jul 2012 15:01:20 +0000 (23:01 +0800)]
Fix test fails: ext/standard/tests/general_functions/bug27678.phpt

After commit 3e62aae1, number_format() returns string with length,
but _php_math_number_format_ex_len() didn't set string length
on nan and inf. This cause segfault when destruct the return value.

12 years agoMerge branch 'PHP-5.4'
Anatoliy Belsky [Tue, 17 Jul 2012 15:53:02 +0000 (17:53 +0200)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  Fix for bug #62379 was missing in 5.3

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Anatoliy Belsky [Tue, 17 Jul 2012 15:52:25 +0000 (17:52 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fix for bug #62379 was missing in 5.3

12 years agoFix for bug #62379 was missing in 5.3
Anatoliy Belsky [Tue, 17 Jul 2012 15:50:05 +0000 (17:50 +0200)]
Fix for bug #62379 was missing in 5.3

12 years agoMerge branch 'PHP-5.4'
Hannes Magnusson [Tue, 17 Jul 2012 09:06:02 +0000 (10:06 +0100)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  Do not unload shared extensions when checking for leaks

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Hannes Magnusson [Tue, 17 Jul 2012 09:05:42 +0000 (10:05 +0100)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Do not unload shared extensions when checking for leaks

12 years agoDo not unload shared extensions when checking for leaks
Hannes Magnusson [Tue, 17 Jul 2012 09:04:56 +0000 (10:04 +0100)]
Do not unload shared extensions when checking for leaks

12 years agotypo
Stanislav Malyshev [Sun, 15 Jul 2012 22:35:16 +0000 (15:35 -0700)]
typo

12 years agoMerge branch 'PHP-5.4'
Xinchen Hui [Sun, 15 Jul 2012 10:27:29 +0000 (18:27 +0800)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  Update libmagic.patch

12 years agoUpdate libmagic.patch
Xinchen Hui [Sun, 15 Jul 2012 10:25:58 +0000 (18:25 +0800)]
Update libmagic.patch

12 years agoMerge branch 'PHP-5.4'
Stanislav Malyshev [Sun, 15 Jul 2012 06:10:00 +0000 (23:10 -0700)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  Implemented FR #61602 Allow access to name of constant used as default value

12 years agoMerge branch 'pull-request/96' into PHP-5.4
Stanislav Malyshev [Sun, 15 Jul 2012 06:07:11 +0000 (23:07 -0700)]
Merge branch 'pull-request/96' into PHP-5.4

* pull-request/96:
  Implemented FR #61602 Allow access to name of constant used as default value

12 years agoMerge branch 'PHP-5.4'
Stanislav Malyshev [Sun, 15 Jul 2012 05:41:18 +0000 (22:41 -0700)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  update NEWS

12 years agoupdate NEWS
Stanislav Malyshev [Sun, 15 Jul 2012 05:41:08 +0000 (22:41 -0700)]
update NEWS

12 years agoMerge branch 'PHP-5.4'
Stanislav Malyshev [Sun, 15 Jul 2012 05:35:47 +0000 (22:35 -0700)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  Fixed bug #61527 (Recursive/ArrayIterator gives misleading notice when array empty or moved to the end)

12 years agoFixed bug #61527 (Recursive/ArrayIterator gives misleading notice when array empty...
Stanislav Malyshev [Sun, 15 Jul 2012 05:34:28 +0000 (22:34 -0700)]
Fixed bug #61527 (Recursive/ArrayIterator gives misleading notice when array empty or moved to the end)

12 years agoMerge branch 'PHP-5.4'
Stanislav Malyshev [Sun, 15 Jul 2012 05:08:27 +0000 (22:08 -0700)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  Typofix in test-description

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Stanislav Malyshev [Sun, 15 Jul 2012 05:08:19 +0000 (22:08 -0700)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Typofix in test-description

12 years agoTypofix in test-description
Jille Timmermans [Thu, 12 Jul 2012 14:41:07 +0000 (16:41 +0200)]
Typofix in test-description

12 years agoimprove code in zend_operators
Stanislav Malyshev [Sun, 15 Jul 2012 04:06:40 +0000 (21:06 -0700)]
improve code in zend_operators

12 years agoMerge branch 'PHP-5.4'
Stanislav Malyshev [Sun, 15 Jul 2012 02:25:16 +0000 (19:25 -0700)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  removed unneccesary arrat and ini settings
  addition SplFileObject tests
  new tests from PHP TestFest June 2012

12 years agoremoved unneccesary arrat and ini settings
donnut [Thu, 28 Jun 2012 11:13:47 +0000 (11:13 +0000)]
removed unneccesary arrat and ini settings

12 years agoaddition SplFileObject tests
donnut [Sun, 24 Jun 2012 10:41:29 +0000 (10:41 +0000)]
addition SplFileObject tests

12 years agonew tests from PHP TestFest June 2012
donnut [Sun, 24 Jun 2012 06:30:24 +0000 (06:30 +0000)]
new tests from PHP TestFest June 2012

12 years agoMerge branch 'PHP-5.4'
Stanislav Malyshev [Sun, 15 Jul 2012 02:00:35 +0000 (19:00 -0700)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  Fixing up closing tag
  Testing variation on input parameters of http_build_query() function

12 years agoFixing up closing tag
Adam Gegotek [Sat, 23 Jun 2012 13:10:16 +0000 (15:10 +0200)]
Fixing up closing tag

12 years agoTesting variation on input parameters of http_build_query() function
Adam Gegotek [Sat, 23 Jun 2012 12:58:58 +0000 (14:58 +0200)]
Testing variation on input parameters of http_build_query() function

12 years agoMerge branch 'PHP-5.4'
Stanislav Malyshev [Sun, 15 Jul 2012 01:53:30 +0000 (18:53 -0700)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  Fixed bug #61964 (finfo_open with directory cause invalid free)

12 years agoMerge branch 'pull-request/91' into PHP-5.4
Stanislav Malyshev [Sun, 15 Jul 2012 01:28:41 +0000 (18:28 -0700)]
Merge branch 'pull-request/91' into PHP-5.4

* pull-request/91:
  Fixed bug #61964 (finfo_open with directory cause invalid free)

12 years agoadd NEWS/UPGRADING
Stanislav Malyshev [Sat, 14 Jul 2012 22:03:51 +0000 (15:03 -0700)]
add NEWS/UPGRADING

12 years agofix comment
Stanislav Malyshev [Wed, 11 Jul 2012 05:31:24 +0000 (22:31 -0700)]
fix comment

12 years agoadd test
Stanislav Malyshev [Wed, 11 Jul 2012 04:47:56 +0000 (21:47 -0700)]
add test

12 years agofix for bug#18556 - use simple tolower() function for internal things
Stanislav Malyshev [Wed, 11 Jul 2012 01:12:13 +0000 (18:12 -0700)]
fix for bug#18556 - use simple tolower() function for internal things

12 years agoMerge branch 'PHP-5.4'
Felipe Pena [Sat, 14 Jul 2012 18:15:42 +0000 (15:15 -0300)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  - Fixed bug #62525 (sigabrt while converting floating point to string)

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Felipe Pena [Sat, 14 Jul 2012 18:15:24 +0000 (15:15 -0300)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  - Fixed bug #62525 (sigabrt while converting floating point to string)

12 years ago- Fixed bug #62525 (sigabrt while converting floating point to string)
Felipe Pena [Sat, 14 Jul 2012 18:15:11 +0000 (15:15 -0300)]
- Fixed bug #62525 (sigabrt while converting floating point to string)

12 years agoMerge branch 'PHP-5.4'
Felipe Pena [Sat, 14 Jul 2012 16:17:09 +0000 (13:17 -0300)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  - Fixed memory leak when extending DOMXPath
  - BFN

12 years ago- Fixed conflict
Felipe Pena [Sat, 14 Jul 2012 16:16:35 +0000 (13:16 -0300)]
- Fixed conflict

12 years ago- Fixed memory leak when extending DOMXPath
Felipe Pena [Sat, 14 Jul 2012 16:13:31 +0000 (13:13 -0300)]
- Fixed memory leak when extending DOMXPath

12 years ago- BFN
Felipe Pena [Sat, 14 Jul 2012 15:27:44 +0000 (12:27 -0300)]
- BFN

12 years ago- Fix conflict
Felipe Pena [Sat, 14 Jul 2012 15:23:24 +0000 (12:23 -0300)]
- Fix conflict

12 years ago- Fixed bug #62565 (Crashes due non-initialized internal properties_table)
Felipe Pena [Sat, 14 Jul 2012 15:16:16 +0000 (12:16 -0300)]
- Fixed bug #62565 (Crashes due non-initialized internal properties_table)

12 years agoMerge branch 'PHP-5.4'
Felipe Pena [Sat, 14 Jul 2012 14:37:20 +0000 (11:37 -0300)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  - Fixed bug #62564 (Extending MessageFormatter and adding property causes crash)

12 years ago- Fixed bug #62564 (Extending MessageFormatter and adding property causes crash)
Felipe Pena [Sat, 14 Jul 2012 14:37:08 +0000 (11:37 -0300)]
- Fixed bug #62564 (Extending MessageFormatter and adding property causes crash)

12 years agoMerge branch 'PHP-5.4'
Anatoliy Belsky [Fri, 13 Jul 2012 13:38:38 +0000 (15:38 +0200)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  Fixed bug #62379 failing ODBC long column functionality

12 years agoFixed bug #62379 failing ODBC long column functionality
Matt Ficken [Fri, 13 Jul 2012 13:34:00 +0000 (15:34 +0200)]
Fixed bug #62379 failing ODBC long column functionality

12 years agoMerge branch 'PHP-5.4'
Anatoliy Belsky [Fri, 13 Jul 2012 09:46:49 +0000 (11:46 +0200)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  Fixed bug #61677 ext\zlib\tests\bug_52944.phpt fails

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Anatoliy Belsky [Fri, 13 Jul 2012 09:46:14 +0000 (11:46 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fixed bug #61677 ext\zlib\tests\bug_52944.phpt fails

12 years agoFixed bug #61677 ext\zlib\tests\bug_52944.phpt fails
Anatoliy Belsky [Fri, 13 Jul 2012 09:39:57 +0000 (11:39 +0200)]
Fixed bug #61677 ext\zlib\tests\bug_52944.phpt fails

The test is known to fail on windows with zlib version < 1.2.7 (current dep is 1.2.5),
with 1.2.7 it works. As it's primarily a zlib 1.2.5 issue on windows, skip it for now.

12 years agoMerge branch 'PHP-5.4'
Anatoliy Belsky [Thu, 12 Jul 2012 16:30:09 +0000 (18:30 +0200)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  fixed the test for warnings changed

12 years agofixed the test for warnings changed
Anatoliy Belsky [Thu, 12 Jul 2012 16:24:38 +0000 (18:24 +0200)]
fixed the test for warnings changed

12 years agoMerge branch 'PHP-5.4'
Anatoliy Belsky [Thu, 12 Jul 2012 09:02:33 +0000 (11:02 +0200)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  reverted news about #62477
  reverted changes for #62477

Conflicts:
NEWS

12 years agoreverted news about #62477
Anatoliy Belsky [Thu, 12 Jul 2012 08:57:56 +0000 (10:57 +0200)]
reverted news about #62477

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Anatoliy Belsky [Thu, 12 Jul 2012 08:57:26 +0000 (10:57 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  reverted changes for #62477

12 years agoreverted changes for #62477
Anatoliy Belsky [Thu, 12 Jul 2012 08:54:14 +0000 (10:54 +0200)]
reverted changes for #62477

12 years agoMerge branch 'PHP-5.4'
Anatoliy Belsky [Wed, 11 Jul 2012 20:38:38 +0000 (22:38 +0200)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  updated NEWS

12 years agoupdated NEWS
Anatoliy Belsky [Wed, 11 Jul 2012 20:37:39 +0000 (22:37 +0200)]
updated NEWS

12 years agoMerge branch 'PHP-5.4'
Anatoliy Belsky [Wed, 11 Jul 2012 20:35:29 +0000 (22:35 +0200)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  updated NEWS

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Anatoliy Belsky [Wed, 11 Jul 2012 20:35:00 +0000 (22:35 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  updated NEWS

12 years agoupdated NEWS
Anatoliy Belsky [Wed, 11 Jul 2012 20:33:42 +0000 (22:33 +0200)]
updated NEWS

12 years agoMerge branch 'PHP-5.4'
Anatoliy Belsky [Wed, 11 Jul 2012 20:30:40 +0000 (22:30 +0200)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  Fixed bug #62477 LimitIterator int overflow

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Anatoliy Belsky [Wed, 11 Jul 2012 20:29:45 +0000 (22:29 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fixed bug #62477 LimitIterator int overflow

12 years agoFixed bug #62477 LimitIterator int overflow
Anatoliy Belsky [Wed, 11 Jul 2012 20:25:31 +0000 (22:25 +0200)]
Fixed bug #62477 LimitIterator int overflow

12 years agofix windows build
Anatoliy Belsky [Wed, 11 Jul 2012 11:32:19 +0000 (13:32 +0200)]
fix windows build

- there should be no trailing white spaces after \ in multiline macros

12 years agoAdd new function hash_pbkdf2() to UGRAPDING doc
Anthony Ferrara [Tue, 10 Jul 2012 17:13:30 +0000 (13:13 -0400)]
Add new function hash_pbkdf2() to UGRAPDING doc

12 years agoMerge remote branch 'upstream/master' into hash_pbkdf2
Anthony Ferrara [Tue, 10 Jul 2012 14:31:25 +0000 (10:31 -0400)]
Merge remote branch 'upstream/master' into hash_pbkdf2

* upstream/master: (101 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
  ...

12 years agoMerge branch 'PHP-5.4'
Xinchen Hui [Tue, 10 Jul 2012 10:46:20 +0000 (18:46 +0800)]
Merge branch 'PHP-5.4'

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Xinchen Hui [Tue, 10 Jul 2012 10:45:16 +0000 (18:45 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4

12 years agoFixed Bug #62500 (Segfault in DateInterval class when extended)
Xinchen Hui [Tue, 10 Jul 2012 10:43:11 +0000 (18:43 +0800)]
Fixed Bug #62500 (Segfault in DateInterval class when extended)

12 years agoMerge branch 'PHP-5.4'
Anatoliy Belsky [Mon, 9 Jul 2012 16:51:27 +0000 (18:51 +0200)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  Fixed test bug #62312 (warnings changed one more time)
  fix valgrind warning

Conflicts:
ext/mysqlnd/mysqlnd.c

12 years agoFixed test bug #62312 (warnings changed one more time)
Anatoliy Belsky [Mon, 9 Jul 2012 16:21:51 +0000 (18:21 +0200)]
Fixed test bug #62312 (warnings changed one more time)

12 years agofix valgrind warning
andrey [Mon, 9 Jul 2012 15:13:35 +0000 (18:13 +0300)]
fix valgrind warning

12 years agoMerge branch 'PHP-5.4' of ssh://git.php.net/php-src into PHP-5.4
andrey [Mon, 9 Jul 2012 14:59:42 +0000 (17:59 +0300)]
Merge branch 'PHP-5.4' of ssh://git.php.net/php-src into PHP-5.4

12 years agofix valgrind warning
andrey [Mon, 9 Jul 2012 14:59:23 +0000 (17:59 +0300)]
fix valgrind warning

12 years agoMerge branch 'PHP-5.4'
Anatoliy Belsky [Mon, 9 Jul 2012 10:45:56 +0000 (12:45 +0200)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  fixed #62433 test for win

12 years agofixed #62433 test for win
Anatoliy Belsky [Mon, 9 Jul 2012 10:42:10 +0000 (12:42 +0200)]
fixed #62433 test for win

12 years agoMerge branch 'PHP-5.4'
Xinchen Hui [Mon, 9 Jul 2012 00:46:38 +0000 (08:46 +0800)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  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)