Permalink
Commits on Oct 16, 2012
  1. Merge branch 'master' of ssh://git.php.net/php-src

    Andrey Hristov committed Oct 16, 2012
  2. fix newly introduced segfault

    Andrey Hristov committed Oct 16, 2012
  3. Fixed bug #63248 Load multiple magic files on win

    - adapt config.w32 to not to use dirent lib anymore
    - prevent libmagic from opening a dir handle under win
    - reimplement the dir iteration functionality with streams
    weltling committed Oct 16, 2012
  4. updated NEWS

    weltling committed Oct 16, 2012
  5. Merge branch 'PHP-5.4'

    * PHP-5.4:
      Fixed bug #63248 Load multiple magic files on win
    
    Conflicts:
    	NEWS
    weltling committed Oct 16, 2012
  6. Merging in Password Hashing API into master

    This implements the accepted RFC password_hash https://wiki.php.net/rfc/password_hash
    ircmaxell committed Oct 16, 2012
Commits on Oct 12, 2012
  1. - BFN

    felipensp committed Oct 12, 2012
  2. Merge branch 'PHP-5.3' into PHP-5.4

    * PHP-5.3:
      Fix bug #63240 on stream_get_line()
    cataphract committed Oct 12, 2012
  3. Fix bug #63240 on stream_get_line()

    stream_get_line() could contain the delimiter string if that string
    had more than one character. The bug manifested itself when a read on
    the stream ended with part of the delimiter string and the read after
    would start with the rest of the delimiter string; provided that
    the data of first read did not complete the max length result of the
    call to stream_get_line() with the partial delimiter used in that max
    length return. In that case, the delimiter will still appear in
    the result, divided in two subsequent return values. That is not a bug.
    
    See <http://www.mail-archive.com/internals@lists.php.net/msg61325.html>
    cataphract committed Oct 12, 2012
  4. Merge branch 'PHP-5.3' into PHP-5.4

    * PHP-5.3:
      extended the SKIPIF section with ICU 49 (sync with 5.4 branch)
    weltling committed Oct 12, 2012
  5. Merge branch 'PHP-5.3' into PHP-5.4

    * PHP-5.3:
      fixed tests for gd having freetype >= 2.4.10
    weltling committed Oct 12, 2012
  6. Fixed bug #63258 (seg fault with PDO and dblib using DBSETOPT(H->link…

    …, DBQUOTEDIDENT, 1))
    
    The exists test should has covered this bug
    laruence committed Oct 12, 2012
Commits on Oct 10, 2012
  1. Implemented FR #63242 (Default error page in PHP built-in web server …

    …uses outdated html/css)
    laruence committed Oct 10, 2012
Commits on Oct 7, 2012
Commits on Oct 6, 2012
Commits on Oct 5, 2012
Commits on Sep 29, 2012
  1. Merge branch 'PHP-5.4'

    * PHP-5.4:
      Cover have_ssl=NO and have_ssl=DISABLED
    ULF WENDEL committed Sep 29, 2012
  2. Merge branch 'PHP-5.3' into PHP-5.4

    * PHP-5.3:
      Cover have_ssl=NO and have_ssl=DISABLED
    ULF WENDEL committed Sep 29, 2012
  3. Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4

    * 'PHP-5.4' of git.php.net:php-src:
      Fixed bug #63248 Load multiple magic files on win
    ULF WENDEL committed Sep 29, 2012
  4. Cover have_ssl=NO and have_ssl=DISABLED

    ULF WENDEL committed Sep 29, 2012
  5. Merge branch 'master' of git.php.net:php-src

    * 'master' of git.php.net:php-src: (47 commits)
      Updating expected output in anticipation of mysqlnd_auth.c path
      updated NEWS
      Fixed bug #63248 Load multiple magic files on win
      Refactor to using a stack based zval instead of dynamic allocation
      Clean up unreported memory leak by switching to zval_ptr_dtor
      fix allocation and copy issue
      Really fix leaks, add test cases to prove it...
      Fix issue with possible memory leak
      Fix some double free issues, and more cleanup work
      Refactor  slightly to enable cleaner readability
      Fix arg info for required params passed to needs_rehash
      Fix ucwords error casing
      A bunch of naming convention fixes. No functionality changes
      Switch to using an ENUM for algorithms instead of a constant
      Fix incorrect arg info required param count for password_hash
      Add news entry for password API
      Expose PASSWORD_BCRYPT_DEFAULT_COST constant and update test to use it
      Remove bcrypt_cost ini entry from declaration
      Switch test to using strict comparison for crypt fallback
      Add tests for password_get_info and password_needs_rehash
      ...
    ULF WENDEL committed Sep 29, 2012
  6. Merge branch 'master' of git.php.net:php-src

    * 'master' of git.php.net:php-src: (46 commits)
      updated NEWS
      Fixed bug #63248 Load multiple magic files on win
      Refactor to using a stack based zval instead of dynamic allocation
      Clean up unreported memory leak by switching to zval_ptr_dtor
      fix allocation and copy issue
      Really fix leaks, add test cases to prove it...
      Fix issue with possible memory leak
      Fix some double free issues, and more cleanup work
      Refactor  slightly to enable cleaner readability
      Fix arg info for required params passed to needs_rehash
      Fix ucwords error casing
      A bunch of naming convention fixes. No functionality changes
      Switch to using an ENUM for algorithms instead of a constant
      Fix incorrect arg info required param count for password_hash
      Add news entry for password API
      Expose PASSWORD_BCRYPT_DEFAULT_COST constant and update test to use it
      Remove bcrypt_cost ini entry from declaration
      Switch test to using strict comparison for crypt fallback
      Add tests for password_get_info and password_needs_rehash
      Refactoring to use size_t instead of int most places
      ...
    ULF WENDEL committed Sep 29, 2012
  7. Merge branch 'master' of git.php.net:php-src

    * 'master' of git.php.net:php-src:
      - BFN
      Minor changes for MySQL 5.6
      NEWS for 76601c4
    ULF WENDEL committed Sep 29, 2012
  8. Merge branch 'PHP-5.4'

    * PHP-5.4:
      - BFN
      Minor changes for MySQL 5.6
      NEWS for 76601c4
    ULF WENDEL committed Sep 29, 2012
  9. Merge branch 'PHP-5.3' into PHP-5.4

    * PHP-5.3:
      Minor changes for MySQL 5.6
      NEWS for 76601c4
    
    Conflicts:
    	NEWS
    ULF WENDEL committed Sep 29, 2012