]> granicus.if.org Git - php/log
php
12 years agoMerge branch 'PHP-5.4'
Xinchen Hui [Tue, 18 Sep 2012 02:50:24 +0000 (10:50 +0800)]
Merge branch 'PHP-5.4'

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

12 years agoFixed Bug #63103 (ext\curl\tests\bug62839.phpt broken)
Xinchen Hui [Tue, 18 Sep 2012 02:46:58 +0000 (10:46 +0800)]
Fixed Bug #63103 (ext\curl\tests\bug62839.phpt broken)

12 years agoMerge branch 'PHP-5.4'
Stanislav Malyshev [Mon, 17 Sep 2012 22:58:48 +0000 (15:58 -0700)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  update news
  Support building PHP with the native client toolchain.
  test should fail

12 years agoupdate news
Stanislav Malyshev [Mon, 17 Sep 2012 22:58:27 +0000 (15:58 -0700)]
update news

12 years agoSupport building PHP with the native client toolchain.
Stuart Langley [Thu, 13 Sep 2012 15:37:37 +0000 (17:37 +0200)]
Support building PHP with the native client toolchain.

The native client compiler defines the C macro __x86_64__, but the size
of an unsigned int is only 4 bytes. This causes the compile to fail
because the inline asm code compiled is for an 8 byte unsigned int. Add
the correct defines to fix this.

As detailed in:
http://code.google.com/p/nativeclient/issues/detail?id=2255

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Xinchen Hui [Mon, 17 Sep 2012 03:21:14 +0000 (11:21 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4

12 years agotest should fail
Xinchen Hui [Mon, 17 Sep 2012 03:20:24 +0000 (11:20 +0800)]
test should fail

12 years agoAdd NEWS for generators
Nikita Popov [Sun, 16 Sep 2012 20:02:47 +0000 (22:02 +0200)]
Add NEWS for generators

12 years agoFix two op_array -> function cast warnings
Nikita Popov [Sun, 16 Sep 2012 20:01:07 +0000 (22:01 +0200)]
Fix two op_array -> function cast warnings

12 years agoReplace code with zend_clean_and_cache_symbol_table() call
Nikita Popov [Sun, 16 Sep 2012 19:54:48 +0000 (21:54 +0200)]
Replace code with zend_clean_and_cache_symbol_table() call

I replaced other instances of this code with the function call, but missed
this one.

12 years agoFix invalid read / remove useless code
Nikita Popov [Sun, 16 Sep 2012 19:48:57 +0000 (21:48 +0200)]
Fix invalid read / remove useless code

Generators follow a different cleanup path, so the extra check for freeing
the execute_data is unnecessary there. It actually caused problems because
op_array->fn_flags could be in freed memory at that time (in case op_array
came from a closure in an ArrayAccess container).

This fixes the valgrind warning in Zend/tests/bug54367.phpt.

12 years agoMerge branch 'PHP-5.4'
Stanislav Malyshev [Sun, 16 Sep 2012 06:11:55 +0000 (23:11 -0700)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  Respond with 501 to unknown request methods

12 years agoRespond with 501 to unknown request methods
Niklas Lindgren [Wed, 12 Sep 2012 16:34:59 +0000 (19:34 +0300)]
Respond with 501 to unknown request methods

Fixed typo

Moved 501 response from dispatch to event_read_request

Return return value of send_error_page

12 years agoMerge branch 'PHp-5.4'
Stanislav Malyshev [Sun, 16 Sep 2012 06:02:44 +0000 (23:02 -0700)]
Merge branch 'PHp-5.4'

* PHp-5.4:
  news for bug #61421
  commit for php bug 61421 enabling SHA2 and RMD160 for openssl signature verification

12 years agonews for bug #61421
Stanislav Malyshev [Sun, 16 Sep 2012 06:02:10 +0000 (23:02 -0700)]
news for bug #61421

12 years agocommit for php bug 61421
Mark Jones [Fri, 14 Sep 2012 14:59:14 +0000 (08:59 -0600)]
commit for php bug 61421
enabling SHA2 and RMD160 for openssl signature verification

12 years agoMerge branch 'PHP-5.4'
Xinchen Hui [Sat, 15 Sep 2012 03:51:48 +0000 (11:51 +0800)]
Merge branch 'PHP-5.4'

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Xinchen Hui [Sat, 15 Sep 2012 03:50:49 +0000 (11:50 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4

12 years agoFixed bug #63093 (Segfault while load extension failed in zts-build).
Xinchen Hui [Sat, 15 Sep 2012 03:50:16 +0000 (11:50 +0800)]
Fixed bug #63093 (Segfault while load extension failed in zts-build).

12 years agoMerge branch 'PHP-5.4'
Xinchen Hui [Sat, 15 Sep 2012 03:33:26 +0000 (11:33 +0800)]
Merge branch 'PHP-5.4'

12 years agoRemove bug fixed entry
Xinchen Hui [Sat, 15 Sep 2012 03:32:44 +0000 (11:32 +0800)]
Remove bug fixed entry

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Xinchen Hui [Sat, 15 Sep 2012 03:32:08 +0000 (11:32 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4

12 years agoAdd XFAIL test for bug #62852
Xinchen Hui [Sat, 15 Sep 2012 03:29:47 +0000 (11:29 +0800)]
Add XFAIL test for bug #62852

12 years agoRevert "Fixed bug #62852 (Unserialize invalid DateTime causes crash)"
Xinchen Hui [Sat, 15 Sep 2012 03:26:21 +0000 (11:26 +0800)]
Revert "Fixed bug #62852 (Unserialize invalid DateTime causes crash)"

see: http://news.php.net/php.bugs/173451

This reverts commit 46a3f257724df7b85cc8c3e6374c36ed9ee783b4.

12 years agoMerge branch 'PHP-5.4'
Christopher Jones [Fri, 14 Sep 2012 05:45:54 +0000 (22:45 -0700)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  Change package.xml fix description
  Fixed bug #60901 (Improve "tail" syntax for AIX installation)

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Christopher Jones [Fri, 14 Sep 2012 05:44:12 +0000 (22:44 -0700)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Change package.xml fix description
  Fixed bug #60901 (Improve "tail" syntax for AIX installation)

12 years agoMerge branch 'bug60901' into PHP-5.3
Christopher Jones [Fri, 14 Sep 2012 05:43:37 +0000 (22:43 -0700)]
Merge branch 'bug60901' into PHP-5.3

* bug60901:
  Change package.xml fix description
  Fixed bug #60901 (Improve "tail" syntax for AIX installation)

12 years agoChange package.xml fix description
Christopher Jones [Fri, 14 Sep 2012 05:43:10 +0000 (22:43 -0700)]
Change package.xml fix description

12 years agoFixed bug #60901 (Improve "tail" syntax for AIX installation)
Christopher Jones [Fri, 14 Sep 2012 05:40:55 +0000 (22:40 -0700)]
Fixed bug #60901 (Improve "tail" syntax for AIX installation)

12 years agoMerge branch 'master' of https://git.php.net/repository/php-src
Christopher Jones [Fri, 14 Sep 2012 01:09:16 +0000 (18:09 -0700)]
Merge branch 'master' of https://git.php.net/repository/php-src

* 'master' of https://git.php.net/repository/php-src:
  This will become 5.3.18
  Update RELEASE PROCESS

12 years agoMerge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
Christopher Jones [Fri, 14 Sep 2012 01:09:12 +0000 (18:09 -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:
  This will become 5.3.18
  Update RELEASE PROCESS

12 years agoMerge branch 'PHP-5.4'
Johannes Schlüter [Thu, 13 Sep 2012 21:10:59 +0000 (23:10 +0200)]
Merge branch 'PHP-5.4'

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Johannes Schlüter [Thu, 13 Sep 2012 21:10:22 +0000 (23:10 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

Conflicts:
configure.in
main/php_version.h

12 years agoThis will become 5.3.18
Johannes Schlüter [Thu, 13 Sep 2012 21:08:30 +0000 (23:08 +0200)]
This will become 5.3.18

12 years agoMerge branch 'PHP-5.4'
David Soria Parra [Thu, 13 Sep 2012 18:24:09 +0000 (20:24 +0200)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  Update RELEASE PROCESS

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
David Soria Parra [Thu, 13 Sep 2012 18:23:05 +0000 (20:23 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Update RELEASE PROCESS

12 years agoUpdate RELEASE PROCESS
David Soria Parra [Thu, 13 Sep 2012 18:19:23 +0000 (20:19 +0200)]
Update RELEASE PROCESS

Some parts of the release process are outdated, not needed anymore
or still reference cvs.

12 years agoMerge branch 'master' of https://git.php.net/repository/php-src
Christopher Jones [Thu, 13 Sep 2012 01:14:37 +0000 (18:14 -0700)]
Merge branch 'master' of https://git.php.net/repository/php-src

* 'master' of https://git.php.net/repository/php-src:
  fix NEWS after releses
  Generators & UPGRADING
  Merge 5.3.16 NEWS in.

12 years agoMerge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
Christopher Jones [Thu, 13 Sep 2012 01:14:33 +0000 (18:14 -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:
  fix NEWS after releses
  Merge 5.3.16 NEWS in.

12 years agoMerge branch 'PHP-5.4'
Johannes Schlüter [Wed, 12 Sep 2012 21:35:40 +0000 (23:35 +0200)]
Merge branch 'PHP-5.4'

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Johannes Schlüter [Wed, 12 Sep 2012 21:35:29 +0000 (23:35 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

12 years agofix NEWS after releses
Johannes Schlüter [Wed, 12 Sep 2012 21:35:05 +0000 (23:35 +0200)]
fix NEWS after releses

12 years agoMerge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4
Johannes Schlüter [Wed, 12 Sep 2012 21:05:24 +0000 (23:05 +0200)]
Merge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4

12 years agoMerge branch 'master' of git.php.net:/php-src
Johannes Schlüter [Wed, 12 Sep 2012 21:01:11 +0000 (23:01 +0200)]
Merge branch 'master' of git.php.net:/php-src

12 years agoGenerators & UPGRADING
Gustavo André dos Santos Lopes [Wed, 12 Sep 2012 08:05:28 +0000 (09:05 +0100)]
Generators & UPGRADING

12 years agoMerge branch 'master' of https://git.php.net/repository/php-src
Christopher Jones [Tue, 11 Sep 2012 23:39:43 +0000 (16:39 -0700)]
Merge branch 'master' of https://git.php.net/repository/php-src

* 'master' of https://git.php.net/repository/php-src:
  Capitalize the warning message
  Rearrange the codes, remove empty lines
  Provide a specific error message if date.timezone value is invalid.
  regenerate patch, and save a strlen
  Fix the wrong use of snprintf which is introduced in 1d2f61904987133d542c68cd349cf313d0bef1c8
  Fixed unintendent clearance of PHP_OUTPUT_ACTIVATED flag

12 years agoMerge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
Christopher Jones [Tue, 11 Sep 2012 23:39:39 +0000 (16:39 -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:
  regenerate patch, and save a strlen
  Fix the wrong use of snprintf which is introduced in 1d2f61904987133d542c68cd349cf313d0bef1c8
  Fixed unintendent clearance of PHP_OUTPUT_ACTIVATED flag

12 years agoCapitalize the warning message
Xinchen Hui [Tue, 11 Sep 2012 10:09:47 +0000 (18:09 +0800)]
Capitalize the warning message

12 years agoRearrange the codes, remove empty lines
Xinchen Hui [Tue, 11 Sep 2012 10:02:19 +0000 (18:02 +0800)]
Rearrange the codes, remove empty lines

12 years agoMerge branch 'invalid-timezone' of https://github.com/simonwelsh/php-src
Xinchen Hui [Tue, 11 Sep 2012 09:58:20 +0000 (17:58 +0800)]
Merge branch 'invalid-timezone' of https://github.com/simonwelsh/php-src

12 years agoProvide a specific error message if date.timezone value is invalid.
Simon Welsh [Tue, 11 Sep 2012 09:14:51 +0000 (21:14 +1200)]
Provide a specific error message if date.timezone value is invalid.

12 years agoMerge branch 'PHP-5.4'
Xinchen Hui [Tue, 11 Sep 2012 03:44:33 +0000 (11:44 +0800)]
Merge branch 'PHP-5.4'

12 years agoregenerate patch, and save a strlen
Xinchen Hui [Tue, 11 Sep 2012 03:43:47 +0000 (11:43 +0800)]
regenerate patch, and save a strlen

12 years agoMerge branch 'PHP-5.4'
Xinchen Hui [Mon, 10 Sep 2012 15:11:28 +0000 (23:11 +0800)]
Merge branch 'PHP-5.4'

12 years agoFix the wrong use of snprintf which is introduced in 1d2f61904987133d542c68cd349cf313...
Xinchen Hui [Mon, 10 Sep 2012 15:08:54 +0000 (23:08 +0800)]
Fix the wrong use of snprintf which is introduced in 1d2f61904987133d542c68cd349cf313d0bef1c8

12 years agoMerge branch 'PHP-5.4'
Dmitry Stogov [Mon, 10 Sep 2012 10:57:45 +0000 (14:57 +0400)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  Fixed unintendent clearance of PHP_OUTPUT_ACTIVATED flag

12 years agoFixed unintendent clearance of PHP_OUTPUT_ACTIVATED flag
Dmitry Stogov [Mon, 10 Sep 2012 10:54:18 +0000 (14:54 +0400)]
Fixed unintendent clearance of PHP_OUTPUT_ACTIVATED flag

12 years agoMerge branch 'master' of https://git.php.net/repository/php-src
Christopher Jones [Mon, 10 Sep 2012 07:04:42 +0000 (00:04 -0700)]
Merge branch 'master' of https://git.php.net/repository/php-src

* 'master' of https://git.php.net/repository/php-src: (157 commits)
  Fix doc bug #63032 (Number of release in documentation).
  fixed test for bug #52944 also for darwin
  -enable VC11 (vc2012)
  - Fixed bug #61767 (Shutdown functions not called in certain error situation) - Fixed bug #60909 (custom error handler throwing Exception + fatal error = no shutdown function)
  year++
  correct PHP version & year++
  Correct PHP version
  year++
  - fix build, there was no tsrm context there, doing a fetch but this is horribly slow, this fix needs improvement (or simply add a TSRM context in the signature in master
  - fix build, declarations must be 1st in a contextgit checkout -f master
  Fixed bug #62907 (Double free when use traits)
  Fixed bug #62991 (Segfault with generator and closure)
  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()
  ...

12 years agoMerge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
Christopher Jones [Mon, 10 Sep 2012 07:04:38 +0000 (00:04 -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: (54 commits)
  Fix doc bug #63032 (Number of release in documentation).
  fixed test for bug #52944 also for darwin
  - Fixed bug #61767 (Shutdown functions not called in certain error situation) - Fixed bug #60909 (custom error handler throwing Exception + fatal error = no shutdown function)
  year++
  correct PHP version & year++
  Correct PHP version
  year++
  - fix build, there was no tsrm context there, doing a fetch but this is horribly slow, this fix needs improvement (or simply add a TSRM context in the signature in master
  Fixed bug #62907 (Double free when use traits)
  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)
  Bug #49510: Boolean validation fails with FILTER_NULL_ON_FAILURE with empty string or false
  Allow null as a default value for length in mb_substr() and mb_strcut()
  folder
  Initializing optional argument description in assert()
  fix NEWS
  Remove extra blank in notice message, should act as same as vm
  Fixed bug #62987 (Assigning to ArrayObject[null][something] overrides all undefined variables)
  ...

12 years agoMerge branch 'PHP-5.4'
Adam Harvey [Mon, 10 Sep 2012 02:06:23 +0000 (10:06 +0800)]
Merge branch 'PHP-5.4'

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Adam Harvey [Mon, 10 Sep 2012 02:06:10 +0000 (10:06 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4

12 years agoFix doc bug #63032 (Number of release in documentation).
Adam Harvey [Mon, 10 Sep 2012 02:05:15 +0000 (10:05 +0800)]
Fix doc bug #63032 (Number of release in documentation).

Also add a bonus grammar fix.

12 years agoMerge branch 'PHP-5.4'
Anatoliy Belsky [Sun, 9 Sep 2012 21:03:47 +0000 (23:03 +0200)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  fixed test for bug #52944 also for darwin

12 years agofixed test for bug #52944 also for darwin
Reeze Xia [Sun, 9 Sep 2012 21:02:50 +0000 (23:02 +0200)]
fixed test for bug #52944 also for darwin

12 years agoMerge branch 'PHP-5.4'
unknown [Sat, 8 Sep 2012 16:48:32 +0000 (18:48 +0200)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  -enable VC11 (vc2012)

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
unknown [Sat, 8 Sep 2012 16:47:32 +0000 (18:47 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  -enable VC11 (vc2012)

12 years ago-enable VC11 (vc2012)
unknown [Sat, 8 Sep 2012 16:46:33 +0000 (18:46 +0200)]
-enable VC11 (vc2012)

12 years agoMerge branch 'PHP-5.4'
Dmitry Stogov [Thu, 6 Sep 2012 10:03:22 +0000 (14:03 +0400)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  - Fixed bug #61767 (Shutdown functions not called in certain error situation) - Fixed bug #60909 (custom error handler throwing Exception + fatal error = no shutdown function)

Conflicts:
NEWS

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Dmitry Stogov [Thu, 6 Sep 2012 08:14:29 +0000 (12:14 +0400)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  - Fixed bug #61767 (Shutdown functions not called in certain error situation) - Fixed bug #60909 (custom error handler throwing Exception + fatal error = no shutdown function)

Conflicts:
NEWS
Zend/zend_object_handlers.c

12 years ago- Fixed bug #61767 (Shutdown functions not called in certain error situation)
Dmitry Stogov [Thu, 6 Sep 2012 07:26:40 +0000 (11:26 +0400)]
- Fixed bug #61767 (Shutdown functions not called in certain error situation)
- Fixed bug #60909 (custom error handler throwing Exception + fatal error = no shutdown function)

12 years agoMerge branch 'PHP-5.4'
Xinchen Hui [Wed, 5 Sep 2012 15:48:54 +0000 (23:48 +0800)]
Merge branch 'PHP-5.4'

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Xinchen Hui [Wed, 5 Sep 2012 15:48:27 +0000 (23:48 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4

12 years agoyear++
Xinchen Hui [Wed, 5 Sep 2012 15:47:21 +0000 (23:47 +0800)]
year++

missed the .re files in 5.3

12 years agoMerge branch 'PHP-5.4'
Xinchen Hui [Wed, 5 Sep 2012 15:44:41 +0000 (23:44 +0800)]
Merge branch 'PHP-5.4'

12 years agocorrect PHP version & year++
Xinchen Hui [Wed, 5 Sep 2012 15:43:59 +0000 (23:43 +0800)]
correct PHP version & year++

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Xinchen Hui [Wed, 5 Sep 2012 15:42:45 +0000 (23:42 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4

12 years agoCorrect PHP version
Xinchen Hui [Wed, 5 Sep 2012 15:41:42 +0000 (23:41 +0800)]
Correct PHP version

12 years agoMerge branch 'PHP-5.4'
Xinchen Hui [Wed, 5 Sep 2012 15:20:42 +0000 (23:20 +0800)]
Merge branch 'PHP-5.4'

Conflicts:
sapi/litespeed/lsapi_main.c

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Xinchen Hui [Wed, 5 Sep 2012 15:11:19 +0000 (23:11 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4

Conflicts:
ext/interbase/interbase.rc

12 years agoyear++
Xinchen Hui [Wed, 5 Sep 2012 15:08:05 +0000 (23:08 +0800)]
year++

12 years agoMerge branch 'PHP-5.4'
Pierre Joye [Wed, 5 Sep 2012 11:00:41 +0000 (13:00 +0200)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  - fix build, there was no tsrm context there, doing a fetch but this is horribly slow, this fix needs improvement (or simply add a TSRM context in the signature in master

12 years ago- fix build, there was no tsrm context there, doing a fetch but this is horribly...
Pierre Joye [Wed, 5 Sep 2012 11:00:04 +0000 (13:00 +0200)]
- fix build, there was no tsrm context there, doing a fetch but this is horribly slow, this fix needs improvement (or simply add a TSRM context in the signature in master

12 years ago- fix build, declarations must be 1st in a contextgit checkout -f master
Pierre Joye [Wed, 5 Sep 2012 10:53:29 +0000 (12:53 +0200)]
- fix build, declarations must be 1st in a contextgit checkout -f master

12 years agoMerge branch 'PHP-5.4'
Dmitry Stogov [Wed, 5 Sep 2012 06:01:04 +0000 (10:01 +0400)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  Fixed bug #62907 (Double free when use traits)

Conflicts:
NEWS

12 years agoFixed bug #62907 (Double free when use traits)
Dmitry Stogov [Wed, 5 Sep 2012 05:58:22 +0000 (09:58 +0400)]
Fixed bug #62907 (Double free when use traits)

12 years agoMerge branch 'master' of git.php.net:php-src
Dmitry Stogov [Wed, 5 Sep 2012 05:55:14 +0000 (09:55 +0400)]
Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src:
  forked two tests for windows

12 years agoFixed bug #62991 (Segfault with generator and closure)
Dmitry Stogov [Wed, 5 Sep 2012 05:50:55 +0000 (09:50 +0400)]
Fixed bug #62991 (Segfault with generator and closure)

12 years agoMerge branch 'PHP-5.4'
Anatoliy Belsky [Mon, 3 Sep 2012 11:48:02 +0000 (13:48 +0200)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  forked two tests for windows

12 years agoforked two tests for windows
Anatoliy Belsky [Mon, 3 Sep 2012 11:37:34 +0000 (13:37 +0200)]
forked two tests for windows

* bug55544.phpt - VT vs. EXT at the start of the data block,
but the data can still be decoded correctly
* bug_52944.phpt works with the corrupted data and has some
different out

Most likely the ASM optimization under windows is responsible
for this behaviour.

12 years agoMerge branch 'PHP-5.4'
Dmitry Stogov [Mon, 3 Sep 2012 08:00:19 +0000 (12:00 +0400)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  Fixed bug #50997 (SOAP Error when trying to submit 2nd Element of a choice).

12 years agoFixed bug #50997 (SOAP Error when trying to submit 2nd Element of a choice)
Dmitry Stogov [Mon, 3 Sep 2012 07:52:42 +0000 (11:52 +0400)]
Fixed bug #50997 (SOAP Error when trying to submit 2nd Element of a choice)

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Dmitry Stogov [Mon, 3 Sep 2012 07:51:17 +0000 (11:51 +0400)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fixed bug #50997 (SOAP Error when trying to submit 2nd Element of a choice).

12 years agoFixed bug #50997 (SOAP Error when trying to submit 2nd Element of a choice).
Dmitry Stogov [Mon, 3 Sep 2012 07:51:08 +0000 (11:51 +0400)]
Fixed bug #50997 (SOAP Error when trying to submit 2nd Element of a choice).

12 years agoFixed bug #50997 (SOAP Error when trying to submit 2nd Element of a choice).
Dmitry Stogov [Mon, 3 Sep 2012 07:49:58 +0000 (11:49 +0400)]
Fixed bug #50997 (SOAP Error when trying to submit 2nd Element of a choice).

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Dmitry Stogov [Mon, 3 Sep 2012 07:47:59 +0000 (11:47 +0400)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fixed bug #50997 (SOAP Error when trying to submit 2nd Element of a choice)

12 years agoFixed bug #50997 (SOAP Error when trying to submit 2nd Element of a choice)
Dmitry Stogov [Mon, 3 Sep 2012 07:46:47 +0000 (11:46 +0400)]
Fixed bug #50997 (SOAP Error when trying to submit 2nd Element of a choice)

12 years agoFixed bug #50997 (SOAP Error when trying to submit 2nd Element of a choice)
Dmitry Stogov [Mon, 3 Sep 2012 07:38:08 +0000 (11:38 +0400)]
Fixed bug #50997 (SOAP Error when trying to submit 2nd Element of a choice)

12 years agoMerge branch 'PHP-5.4'
Lars Strojny [Sun, 2 Sep 2012 20:11:47 +0000 (22:11 +0200)]
Merge branch 'PHP-5.4'

12 years agoBug #49510: Boolean validation fails with FILTER_NULL_ON_FAILURE with empty string...
Lars Strojny [Sun, 2 Sep 2012 20:10:23 +0000 (22:10 +0200)]
Bug #49510: Boolean validation fails with FILTER_NULL_ON_FAILURE with empty string or false