Skip to content
Permalink
Branch: curlsock
Commits on Aug 26, 2012
Commits on Aug 25, 2012
Commits on Aug 24, 2012
  1. Merge branch 'PHP-5.4'

    adoy committed Aug 24, 2012
    * PHP-5.4:
      Fixed bug #62912 (CURLINFO_PRIMARY_IP is not exposed)
  2. Fixed bug #62912 (CURLINFO_PRIMARY_IP is not exposed)

    adoy committed Aug 24, 2012
    CURLINFO_PRIMARY_* and CURLINFO_LOCAL_* where available in curl_getinfo
    but the constant itself was not exposed to php userland
  3. Merge branch 'PHP-5.4'

    laruence committed Aug 24, 2012
  4. better fix

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

    laruence committed Aug 24, 2012
    Conflicts:
    	ext/phar/tests/phpinfo_003.phpt
  6. 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
Older
You can’t perform that action at this time.