]> granicus.if.org Git - php/log
php
12 years agoFix handling of several uinitialized intl objects
Gustavo Lopes [Tue, 21 Aug 2012 21:21:59 +0000 (23:21 +0200)]
Fix handling of several uinitialized intl objects

Master specific changes. Not having this in the merge commit helps
porting to pecl/intl

12 years agoMerge branch 'PHP-5.4'
Gustavo Lopes [Wed, 22 Aug 2012 20:53:07 +0000 (22:53 +0200)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  Fix handling of several uinitialized intl objects
  Fix handling of several uinitialized intl objects
  - Fix NEWS
  - BFN

Conflicts:
ext/intl/dateformat/dateformat.c

12 years agoFix handling of several uinitialized intl objects
Gustavo Lopes [Wed, 22 Aug 2012 20:38:31 +0000 (22:38 +0200)]
Fix handling of several uinitialized intl objects

PHP 5.4 specific changes. Not having this in the merge commit helps
porting to pecl/intl

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Gustavo Lopes [Wed, 22 Aug 2012 20:37:52 +0000 (22:37 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fix handling of several uinitialized intl objects

12 years agoFix handling of several uinitialized intl objects
Gustavo Lopes [Tue, 21 Aug 2012 21:21:59 +0000 (23:21 +0200)]
Fix handling of several uinitialized intl objects

12 years agoplug a leak when the server ask the client for a auth protocol, that
andrey [Wed, 22 Aug 2012 18:04:42 +0000 (20:04 +0200)]
plug a leak when the server ask the client for a auth protocol, that
the client doesn't understand. This is 5.5 specific bug, as a result
of a refactoring in 5.5

12 years ago- Fix NEWS
Felipe Pena [Wed, 22 Aug 2012 14:19:42 +0000 (11:19 -0300)]
- Fix NEWS

12 years agoWTF?
Sebastian Bergmann [Wed, 22 Aug 2012 09:19:29 +0000 (11:19 +0200)]
WTF?

12 years ago- BFN
Felipe Pena [Wed, 22 Aug 2012 13:54:14 +0000 (10:54 -0300)]
- BFN

12 years agoMerge branch 'PHP-5.4'
Felipe Pena [Wed, 22 Aug 2012 13:51:06 +0000 (10:51 -0300)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  - Fixed bug #62892 (ReflectionClass::getTraitAliases crashes on importing trait methods as private)

12 years ago- Fixed bug #62892 (ReflectionClass::getTraitAliases crashes on importing trait metho...
Felipe Pena [Wed, 22 Aug 2012 13:50:50 +0000 (10:50 -0300)]
- Fixed bug #62892 (ReflectionClass::getTraitAliases crashes on importing trait methods as private)

12 years agoMerge branch 'finally'
Xinchen Hui [Wed, 22 Aug 2012 10:33:37 +0000 (18:33 +0800)]
Merge branch 'finally'

12 years agoFixed bug that jmp in try block jmp over finally block
Xinchen Hui [Wed, 22 Aug 2012 10:32:03 +0000 (18:32 +0800)]
Fixed bug that jmp in try block jmp over finally block

Refactor the implemention,  make codes clear

12 years agoMerge branch 'master' into finally
Xinchen Hui [Wed, 22 Aug 2012 10:12:11 +0000 (18:12 +0800)]
Merge branch 'master' into finally

12 years agoMerge branch 'PHP-5.4'
Anatoliy Belsky [Wed, 22 Aug 2012 09:45:32 +0000 (11:45 +0200)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  Fixed bug #62313 Zend\tests\errmsg_021.phpt fails

12 years agoFixed bug #62313 Zend\tests\errmsg_021.phpt fails
Anatoliy Belsky [Wed, 22 Aug 2012 09:43:12 +0000 (11:43 +0200)]
Fixed bug #62313 Zend\tests\errmsg_021.phpt fails

12 years agoMerge branch 'PHP-5.4'
Xinchen Hui [Wed, 22 Aug 2012 05:52:04 +0000 (13:52 +0800)]
Merge branch 'PHP-5.4'

12 years agostash
Xinchen Hui [Wed, 22 Aug 2012 05:51:44 +0000 (13:51 +0800)]
stash

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Xinchen Hui [Wed, 22 Aug 2012 05:49:04 +0000 (13:49 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4

12 years agoFixed bug #62885 (mysqli_poll - Segmentation fault)
Xinchen Hui [Wed, 22 Aug 2012 05:41:47 +0000 (13:41 +0800)]
Fixed bug #62885 (mysqli_poll - Segmentation fault)

12 years agoMerge branch 'PHP-5.4'
Felipe Pena [Tue, 21 Aug 2012 23:16:12 +0000 (20:16 -0300)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  - Removed PHP 6 checks

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Felipe Pena [Tue, 21 Aug 2012 23:15:48 +0000 (20:15 -0300)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  - Removed PHP 6 checks

12 years ago- Removed PHP 6 checks
Felipe Pena [Tue, 21 Aug 2012 23:15:34 +0000 (20:15 -0300)]
- Removed PHP 6 checks

12 years agoMerge branch 'PHP-5.4'
Xinchen Hui [Tue, 21 Aug 2012 14:19:23 +0000 (22:19 +0800)]
Merge branch 'PHP-5.4'

12 years agoskip test properly
Xinchen Hui [Tue, 21 Aug 2012 14:15:54 +0000 (22:15 +0800)]
skip test properly

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Xinchen Hui [Tue, 21 Aug 2012 14:14:17 +0000 (22:14 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4

12 years agoskip test properly
Xinchen Hui [Tue, 21 Aug 2012 14:11:11 +0000 (22:11 +0800)]
skip test properly

12 years agoBump version.
Sebastian Bergmann [Tue, 21 Aug 2012 11:36:58 +0000 (13:36 +0200)]
Bump version.

12 years agoMerge branch 'PHP-5.4'
Anatoliy Belsky [Tue, 21 Aug 2012 11:27:52 +0000 (13:27 +0200)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  Added test for bug #51353. It'll be skipped by default and must be activated manually.
  Bug 62462: adjusting test

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Anatoliy Belsky [Tue, 21 Aug 2012 11:24:54 +0000 (13:24 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Added test for bug #51353. It'll be skipped by default and must be activated manually.

12 years agoAdded test for bug #51353. It'll be skipped by default and must be
Anatoliy Belsky [Tue, 21 Aug 2012 11:22:00 +0000 (13:22 +0200)]
Added test for bug #51353. It'll be skipped by default and must be
activated manually.

12 years agoMerge branch 'master' of git://github.com/php/php-src
Lars Strojny [Tue, 21 Aug 2012 08:09:56 +0000 (10:09 +0200)]
Merge branch 'master' of git://github.com/php/php-src

12 years agoMerge branch 'PHP-5.4' of git://github.com/php/php-src into PHP-5.4
Lars Strojny [Tue, 21 Aug 2012 08:09:23 +0000 (10:09 +0200)]
Merge branch 'PHP-5.4' of git://github.com/php/php-src into PHP-5.4

12 years agoBug 62462: adjusting test
Lars Strojny [Tue, 21 Aug 2012 08:08:46 +0000 (10:08 +0200)]
Bug 62462: adjusting test

12 years agoBug 62462: adjusting test
Lars Strojny [Tue, 21 Aug 2012 08:08:46 +0000 (10:08 +0200)]
Bug 62462: adjusting test

12 years agoMerge branch 'PHP-5.4'
Xinchen Hui [Tue, 21 Aug 2012 07:23:53 +0000 (15:23 +0800)]
Merge branch 'PHP-5.4'

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Xinchen Hui [Tue, 21 Aug 2012 07:23:09 +0000 (15:23 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4

12 years agoMove test files to tests dir
Reeze Xia [Tue, 21 Aug 2012 06:32:39 +0000 (14:32 +0800)]
Move test files to tests dir

There are 7 files duplicated, so those files was deleted

12 years agoMerge branch 'PHP-5.4'
Xinchen Hui [Tue, 21 Aug 2012 05:33:23 +0000 (13:33 +0800)]
Merge branch 'PHP-5.4'

12 years agoImplemented FR #62840 (Add sort flag to ArrayObject::ksort)
Xinchen Hui [Tue, 21 Aug 2012 05:32:15 +0000 (13:32 +0800)]
Implemented FR #62840 (Add sort flag to ArrayObject::ksort)

12 years agoBug 62462: Prevent multibyte characters from being split between the lines
Lars Strojny [Mon, 20 Aug 2012 21:42:31 +0000 (23:42 +0200)]
Bug 62462: Prevent multibyte characters from being split between the lines

Merged from https://github.com/php/php-src/pull/120

12 years agoBug 62462: Prevent multibyte characters from being split between the lines
Lars Strojny [Mon, 20 Aug 2012 21:42:31 +0000 (23:42 +0200)]
Bug 62462: Prevent multibyte characters from being split between the lines

Merged from https://github.com/php/php-src/pull/120

12 years agoMerge branch 'PHP-5.4'
Xinchen Hui [Mon, 20 Aug 2012 15:44:43 +0000 (23:44 +0800)]
Merge branch 'PHP-5.4'

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Xinchen Hui [Mon, 20 Aug 2012 15:44:21 +0000 (23:44 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4

12 years agoskip test for bug 43130 on firebird , not relevant
Popa Marius Adrian [Mon, 20 Aug 2012 14:25:56 +0000 (17:25 +0300)]
skip test for bug 43130 on firebird , not relevant

12 years agoskip test for bug 43130 on firebird , not relevant
Popa Adrian Marius [Mon, 20 Aug 2012 13:56:37 +0000 (16:56 +0300)]
skip test for bug 43130 on firebird , not relevant

12 years agoMerge branch 'PHP-5.4'
Stanislav Malyshev [Mon, 20 Aug 2012 05:20:30 +0000 (22:20 -0700)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  Fix for #62844
  relative-scheme
  bug #62844; relative URL schemes in parse_url()

12 years agoFix for #62844
Stanislav Malyshev [Mon, 20 Aug 2012 05:19:57 +0000 (22:19 -0700)]
Fix for #62844

12 years agorelative-scheme
Andrew Faulds [Sun, 19 Aug 2012 23:29:18 +0000 (00:29 +0100)]
relative-scheme

12 years agobug #62844; relative URL schemes in parse_url()
Andrew Faulds [Sun, 19 Aug 2012 23:03:55 +0000 (00:03 +0100)]
bug #62844; relative URL schemes in parse_url()

12 years agoadd heredoc parsing fix
Stanislav Malyshev [Mon, 20 Aug 2012 04:46:29 +0000 (21:46 -0700)]
add heredoc parsing fix

12 years agoadd finally
Stanislav Malyshev [Mon, 20 Aug 2012 04:43:16 +0000 (21:43 -0700)]
add finally

12 years agoMerge branch 'pull-request/31'
Stanislav Malyshev [Mon, 20 Aug 2012 04:42:28 +0000 (21:42 -0700)]
Merge branch 'pull-request/31'

* pull-request/31:
  Fix lexing of nested heredoc strings in token_get_all()

12 years agoMerge branch 'PHP-5.4'
Stanislav Malyshev [Mon, 20 Aug 2012 03:40:52 +0000 (20:40 -0700)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  update NEWS

12 years agoupdate NEWS
Stanislav Malyshev [Mon, 20 Aug 2012 03:37:44 +0000 (20:37 -0700)]
update NEWS

12 years agoMerge branch 'PHP-5.4'
Felipe Pena [Sun, 19 Aug 2012 18:09:20 +0000 (15:09 -0300)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  - Value stored to var is never used

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Felipe Pena [Sun, 19 Aug 2012 18:09:18 +0000 (15:09 -0300)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  - Value stored to var is never used

12 years ago- Value stored to var is never used
Felipe Pena [Sun, 19 Aug 2012 18:09:14 +0000 (15:09 -0300)]
- Value stored to var is never used

12 years agoMerge branch 'PHP-5.4'
Felipe Pena [Sun, 19 Aug 2012 17:50:54 +0000 (14:50 -0300)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  - Value stored to var is never used

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Felipe Pena [Sun, 19 Aug 2012 17:50:52 +0000 (14:50 -0300)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  - Value stored to var is never used

12 years ago- Value stored to var is never used
Felipe Pena [Sun, 19 Aug 2012 17:50:49 +0000 (14:50 -0300)]
- Value stored to var is never used

12 years agoMerge branch 'PHP-5.4'
Felipe Pena [Sun, 19 Aug 2012 17:34:46 +0000 (14:34 -0300)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  - Value stored to var is never used

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Felipe Pena [Sun, 19 Aug 2012 17:34:42 +0000 (14:34 -0300)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  - Value stored to var is never used

12 years ago- Value stored to var is never used
Felipe Pena [Sun, 19 Aug 2012 17:34:38 +0000 (14:34 -0300)]
- Value stored to var is never used

12 years agoMerge branch 'PHP-5.4'
Felipe Pena [Sun, 19 Aug 2012 15:55:46 +0000 (12:55 -0300)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  - Value stored to var is never used

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Felipe Pena [Sun, 19 Aug 2012 15:55:43 +0000 (12:55 -0300)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  - Value stored to var is never used

12 years ago- Value stored to var is never used
Felipe Pena [Sun, 19 Aug 2012 15:55:38 +0000 (12:55 -0300)]
- Value stored to var is never used

12 years agoMerge branch 'PHP-5.4'
Felipe Pena [Sun, 19 Aug 2012 15:44:54 +0000 (12:44 -0300)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  - Value stored to var is never used

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Felipe Pena [Sun, 19 Aug 2012 15:44:49 +0000 (12:44 -0300)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  - Value stored to var is never used

12 years ago- Value stored to var is never used
Felipe Pena [Sun, 19 Aug 2012 15:44:44 +0000 (12:44 -0300)]
- Value stored to var is never used

12 years agoMerge branch 'PHP-5.4'
Felipe Pena [Sun, 19 Aug 2012 15:14:12 +0000 (12:14 -0300)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  - Value stored to var is never read

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Felipe Pena [Sun, 19 Aug 2012 15:13:59 +0000 (12:13 -0300)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  - Value stored to var is never read

12 years ago- Value stored to var is never read
Felipe Pena [Sun, 19 Aug 2012 15:13:48 +0000 (12:13 -0300)]
- Value stored to var is never read

12 years agoMerge branch 'master' of git.php.net:php-src
Felipe Pena [Sun, 19 Aug 2012 14:44:31 +0000 (11:44 -0300)]
Merge branch 'master' of git.php.net:php-src

12 years ago- Remove unused variable
Felipe Pena [Sun, 19 Aug 2012 14:35:18 +0000 (11:35 -0300)]
- Remove unused variable

12 years agoMerge branch 'master' of git.php.net:php-src
Xinchen Hui [Sun, 19 Aug 2012 10:34:58 +0000 (18:34 +0800)]
Merge branch 'master' of git.php.net:php-src

12 years agoMerge branch 'PHP-5.4'
Xinchen Hui [Sun, 19 Aug 2012 10:34:17 +0000 (18:34 +0800)]
Merge branch 'PHP-5.4'

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Xinchen Hui [Sun, 19 Aug 2012 10:33:37 +0000 (18:33 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4

12 years agoUpdate NEWS
Xinchen Hui [Sun, 19 Aug 2012 10:33:06 +0000 (18:33 +0800)]
Update NEWS

12 years agoFixed bug #62852 (Unserialize invalid DateTime causes crash)
Reeze Xia [Sun, 19 Aug 2012 09:57:45 +0000 (17:57 +0800)]
Fixed bug #62852 (Unserialize invalid DateTime causes crash)

12 years ago- Remove unused vars
Felipe Pena [Sat, 18 Aug 2012 14:28:00 +0000 (11:28 -0300)]
- Remove unused vars

12 years agoMerge branch 'PHP-5.4'
Xinchen Hui [Sat, 18 Aug 2012 04:22:47 +0000 (12:22 +0800)]
Merge branch 'PHP-5.4'

12 years agoFix test failed
Xinchen Hui [Sat, 18 Aug 2012 04:21:48 +0000 (12:21 +0800)]
Fix test failed

12 years agotab
Xinchen Hui [Sat, 18 Aug 2012 03:57:53 +0000 (11:57 +0800)]
tab

12 years agoMake the codes clearer, and also check continue statement
Xinchen Hui [Sat, 18 Aug 2012 03:44:09 +0000 (11:44 +0800)]
Make the codes clearer, and also check continue statement

12 years agoMerge branch 'PHP-5.4'
Anatoliy Belsky [Fri, 17 Aug 2012 18:36:07 +0000 (20:36 +0200)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  More intl tests extracted from symfony
  Update version numbers to 5.4.7-dev.

Conflicts:
configure.in
main/php_version.h

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Anatoliy Belsky [Fri, 17 Aug 2012 18:31:00 +0000 (20:31 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  More intl tests extracted from symfony

12 years agoMore intl tests extracted from symfony
Matt Ficken [Fri, 17 Aug 2012 18:29:08 +0000 (20:29 +0200)]
More intl tests extracted from symfony

12 years agoAnnother attempt at fixing the mysqli_fetch_field tests
Nikita Popov [Fri, 17 Aug 2012 13:17:29 +0000 (15:17 +0200)]
Annother attempt at fixing the mysqli_fetch_field tests

Instead of character set detection (which doesn't always work correctly)
fetch the character set info using mysqli_get_charset(). To make sure that
the returned info applies to all of client, connection and result
explicitely set utf8 as charset using mysqli_set_charset() before. I'm not
sure whether that last part is really necessary, but included it to be
safe.

12 years agoRefactor examing of jumping out of finally block
Xinchen Hui [Fri, 17 Aug 2012 16:16:34 +0000 (00:16 +0800)]
Refactor examing of jumping out of finally block

12 years agoUpdate version numbers to 5.4.7-dev.
Adam Harvey [Fri, 17 Aug 2012 15:07:54 +0000 (23:07 +0800)]
Update version numbers to 5.4.7-dev.

12 years agoFixed context info in error message
Xinchen Hui [Fri, 17 Aug 2012 13:18:20 +0000 (21:18 +0800)]
Fixed context info in error message

12 years agoMerge branch 'PHP-5.4'
Xinchen Hui [Fri, 17 Aug 2012 10:30:03 +0000 (18:30 +0800)]
Merge branch 'PHP-5.4'

12 years agoFixed bug #62836 (Seg fault or broken object references on unserialize())
Xinchen Hui [Fri, 17 Aug 2012 10:28:32 +0000 (18:28 +0800)]
Fixed bug #62836 (Seg fault or broken object references on unserialize())

12 years agoRevert "Try to fix mysqli_field tests"
Nikita Popov [Thu, 16 Aug 2012 19:30:58 +0000 (21:30 +0200)]
Revert "Try to fix mysqli_field tests"

This reverts commit 018395efafeb8cbce0b8864ca4a1eac232db1cbb.

This change didn't really make sense in hindsight. Looking for some other
fix.

12 years agoMerge branch 'PHP-5.4'
Pierrick Charron [Thu, 16 Aug 2012 18:51:28 +0000 (14:51 -0400)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  Fixed bug #62839

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Pierrick Charron [Thu, 16 Aug 2012 18:50:06 +0000 (14:50 -0400)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fixed bug #62839

12 years agoFixed bug #62839
Pierrick Charron [Thu, 16 Aug 2012 18:48:44 +0000 (14:48 -0400)]
Fixed bug #62839

curl_copy_handle segfault with CURLOPT_FILE. The refcount was incremented
before the assignement.

12 years agoMerge branch 'PHP-5.4'
Felipe Pena [Thu, 16 Aug 2012 18:45:40 +0000 (15:45 -0300)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  - Fixed bug #62829 (stdint.h included on platform where HAVE_STDINT_H is not set)

12 years ago- Fixed bug #62829 (stdint.h included on platform where HAVE_STDINT_H is not set)
Felipe Pena [Thu, 16 Aug 2012 18:45:21 +0000 (15:45 -0300)]
- Fixed bug #62829 (stdint.h included on platform where HAVE_STDINT_H is not set)