Commits on Dec 13, 2012
  1. Merge branch 'PHP-5.5'

    committed Dec 13, 2012
  2. @weltling

    Merge branch 'PHP-5.5'

    * PHP-5.5:
      Fixed mysqlnd compilation in debug mode on windows
    weltling committed Dec 13, 2012
  3. @weltling

    Merge branch 'PHP-5.4' into PHP-5.5

    * PHP-5.4:
      Fixed mysqlnd compilation in debug mode on windows
    weltling committed Dec 13, 2012
  4. @weltling
  5. @dstogov

    Merge branch 'PHP-5.5'

    * PHP-5.5:
      Removed unreachable code
    dstogov committed Dec 13, 2012
  6. @dstogov

    Removed unreachable code

    dstogov committed Dec 13, 2012
  7. @dstogov

    Merge branch 'PHP-5.5'

    * PHP-5.5:
      Removed unnecessary checks
    dstogov committed Dec 13, 2012
  8. @dstogov

    Removed unnecessary checks

    dstogov committed Dec 13, 2012
  9. @dstogov

    Merge branch 'PHP-5.5'

    * PHP-5.5:
      Removed redundand checks from release build
    dstogov committed Dec 13, 2012
  10. @dstogov
  11. @dstogov

    Merge branch 'PHP-5.5'

    * PHP-5.5:
      Fixed bug #63757 (getenv() produces memory leak with CGI SAPI)
    dstogov committed Dec 13, 2012
  12. @dstogov

    Merge branch 'PHP-5.4' into PHP-5.5

    * PHP-5.4:
      Fixed bug #63757 (getenv() produces memory leak with CGI SAPI)
    
    Conflicts:
    	NEWS
    dstogov committed Dec 13, 2012
  13. @dstogov
  14. @laruence

    Merge branch 'PHP-5.5'

    laruence committed Dec 13, 2012
  15. @laruence
  16. @laruence
  17. @laruence

    MFH

    laruence committed Dec 13, 2012
  18. @laruence
Commits on Dec 12, 2012
  1. @dstogov

    Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

    * 'PHP-5.5' of git.php.net:php-src:
      Really fix test pdo_mysql_class_constants.phpt
    dstogov committed Dec 13, 2012
  2. @dstogov

    Merge branch 'master' of git.php.net:php-src

    * 'master' of git.php.net:php-src:
      Really fix test pdo_mysql_class_constants.phpt
    dstogov committed Dec 13, 2012
  3. @dstogov

    Merge branch 'PHP-5.5'

    * PHP-5.5:
      An exception thrown in try or catch block is disacarded by return statement in finally block.
    dstogov committed Dec 13, 2012
  4. @dstogov

    An exception thrown in try or catch block is disacarded by return sta…

    …tement in finally block.
    dstogov committed Dec 13, 2012
  5. @remicollet

    Merge branch 'PHP-5.5'

    * PHP-5.5:
      Really fix test pdo_mysql_class_constants.phpt
    remicollet committed Dec 12, 2012
  6. @remicollet

    Really fix test pdo_mysql_class_constants.phpt

    - with mysqlnd, constant always present
    - with mysqli, check client library version
    - without mysqlnd and without mysqli
    	skip the test if no connection
    	use connection to check client library
    
    Note : MySQLPDOTest::getClientVersion() is broken with mysqlnd
    as PDO::ATTR_CLIENT_VERSION return "mysqlnd 5.0.11-dev - 20120503..."
    so, getClientVersion() return "11"
    remicollet committed Dec 12, 2012
  7. @dstogov

    Merge branch 'PHP-5.5'

    * PHP-5.5:
      Restored proper generators behaviour in conjunction with "finally". (Nikita)
    dstogov committed Dec 12, 2012
  8. @dstogov
  9. @lt

    Fixed license

    Looks like a find and replace gone wrong.
    lt committed Dec 12, 2012
Commits on Dec 11, 2012
  1. @remicollet

    Merge branch 'PHP-5.5'

    * PHP-5.5:
      Fixed Bug #63738 unpack: back result with Z format
    remicollet committed Dec 11, 2012
  2. @remicollet

    Fixed Bug #63738 unpack: back result with Z format

    Fix result for empty string.
    Same output as perl
    perl -e 'print unpack("Z2","\0\0");' => ""
    perl -e 'print unpack("Z2","A\0");'  => "A"
    perl -e 'print unpack("Z2","AB\0");' => "AB"
    perl -e 'print unpack("Z2","ABC\0");'=> "AB"
    remicollet committed Dec 11, 2012
  3. @dstogov

    Merge branch 'PHP-5.5'

    * PHP-5.5:
      - generators API exported for extensions - improved RETURN sequence to avoid redundant check if op_array is a generator
    dstogov committed Dec 11, 2012
  4. @dstogov

    - generators API exported for extensions

    - improved RETURN sequence to avoid redundant check if op_array is a generator
    dstogov committed Dec 11, 2012
  5. @LawnGnome

    Merge branch 'PHP-5.5'

    LawnGnome committed Dec 11, 2012