Permalink
Switch branches/tags
Commits on Aug 24, 2012
  1. Merge branch 'PHP-5.4'

    laruence committed Aug 24, 2012
  2. better fix

    laruence committed Aug 24, 2012
  3. Merge branch 'PHP-5.3' into PHP-5.4

    laruence committed Aug 24, 2012
    Conflicts:
    	ext/phar/tests/phpinfo_003.phpt
  4. Fix test

    laruence committed Aug 24, 2012
Commits on Aug 23, 2012
  1. Merge branch 'PHP-5.4'

    laruence committed Aug 23, 2012
  2. Merge branch 'PHP-5.4'

    weltling committed Aug 23, 2012
    * PHP-5.4:
      fixing test for upcoming mpir upgrade
  3. fixing test for upcoming mpir upgrade

    weltling committed Aug 23, 2012
    - mpir is going to be upgraded up to 2.5.1 on windows
  4. Merge branch 'PHP-5.4'

    weltling committed Aug 23, 2012
    * PHP-5.4:
      ZTS fix introduced by Felipe must also go into 5.3
      Updated INSTALL. Generated from the XML Docs.
      Update NEWS given a5d0c1e
  5. Merge branch 'PHP-5.3' into PHP-5.4

    weltling committed Aug 23, 2012
    * PHP-5.3:
      ZTS fix introduced by Felipe must also go into 5.3
      Updated INSTALL. Generated from the XML Docs.
      Update NEWS given a5d0c1e
    
    Conflicts:
    	NEWS
  6. Merge branch '5.4'

    cataphract committed Aug 23, 2012
    * 5.4:
      Fix SPOOFCHECKER_METHOD_FETCH_OBJECT definition
  7. Merge branch 'PHP-5.4'

    laruence committed Aug 23, 2012
  8. tabs

    laruence committed Aug 23, 2012
  9. Merge branch 'PHP-5.4'

    laruence committed Aug 23, 2012
  10. Merge branch 'PHP-5.4'

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

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

    felipensp committed Aug 22, 2012
  3. Update NEWS given a5d0c1e

    cataphract committed Aug 22, 2012
  4. Fix handling of several uinitialized intl objects

    cataphract committed Aug 21, 2012
    Master specific changes. Not having this in the merge commit helps
    porting to pecl/intl
  5. Merge branch 'PHP-5.4'

    cataphract committed Aug 22, 2012
    * 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
  6. Fix handling of several uinitialized intl objects

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

    cataphract committed Aug 22, 2012
    * PHP-5.3:
      Fix handling of several uinitialized intl objects
  8. plug a leak when the server ask the client for a auth protocol, that

    andrey
    andrey committed Aug 22, 2012
    the client doesn't understand. This is 5.5 specific bug, as a result
    of a refactoring in 5.5
  9. - Fix NEWS

    felipensp committed Aug 22, 2012
  10. WTF?

    sebastianbergmann committed Aug 22, 2012