Permalink
Commits on Aug 22, 2012
  1. Merge branch 'PHP-5.4'

    * PHP-5.4:
      - Fixed ZTS build
    felipensp committed Aug 22, 2012
  2. - Fixed ZTS build

    felipensp committed Aug 22, 2012
  3. Fix handling of several uinitialized intl objects

    Master specific changes. Not having this in the merge commit helps
    porting to pecl/intl
    cataphract committed Aug 21, 2012
  4. 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
    cataphract committed Aug 22, 2012
  5. Fix handling of several uinitialized intl objects

    PHP 5.4 specific changes. Not having this in the merge commit helps
    porting to pecl/intl
    cataphract committed Aug 22, 2012
  6. Merge branch 'PHP-5.3' into PHP-5.4

    * PHP-5.3:
      Fix handling of several uinitialized intl objects
    cataphract committed Aug 22, 2012
  7. 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
    andrey committed Aug 22, 2012
  8. - Fix NEWS

    felipensp committed Aug 22, 2012
  9. WTF?

    sebastianbergmann committed Aug 22, 2012
  10. - BFN

    felipensp committed Aug 22, 2012
  11. Merge branch 'PHP-5.4'

    * PHP-5.4:
      - Fixed bug #62892 (ReflectionClass::getTraitAliases crashes on importing trait methods as private)
    felipensp committed Aug 22, 2012
  12. - Fixed bug #62892 (ReflectionClass::getTraitAliases crashes on impor…

    …ting trait methods as private)
    felipensp committed Aug 22, 2012
  13. Merge branch 'finally'

    laruence committed Aug 22, 2012
  14. Fixed bug that jmp in try block jmp over finally block

    Refactor the implemention,  make codes clear
    laruence committed Aug 22, 2012
  15. Merge branch 'PHP-5.4'

    * PHP-5.4:
      Fixed bug #62313 Zend\tests\errmsg_021.phpt fails
    weltling committed Aug 22, 2012
  16. Merge branch 'PHP-5.4'

    laruence committed Aug 22, 2012
  17. stash

    laruence committed Aug 22, 2012
Commits on Aug 21, 2012
  1. Merge branch 'PHP-5.4'

    * PHP-5.4:
      - Removed PHP 6 checks
    felipensp committed Aug 21, 2012
  2. Merge branch 'PHP-5.3' into PHP-5.4

    * PHP-5.3:
      - Removed PHP 6 checks
    felipensp committed Aug 21, 2012
  3. - Removed PHP 6 checks

    felipensp committed Aug 21, 2012
  4. Merge branch 'PHP-5.4'

    laruence committed Aug 21, 2012
  5. skip test properly

    laruence committed Aug 21, 2012
  6. skip test properly

    laruence committed Aug 21, 2012
  7. Bump version.

    sebastianbergmann committed Aug 21, 2012
  8. 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
    weltling committed Aug 21, 2012
  9. 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.
    weltling committed Aug 21, 2012