Skip to content
Commits on Jul 14, 2012
  1. @felipensp

    Merge branch 'PHP-5.4'

    felipensp committed Jul 14, 2012
    * PHP-5.4:
      - Fixed bug #62525 (sigabrt while converting floating point to string)
  2. @felipensp

    Merge branch 'PHP-5.3' into PHP-5.4

    felipensp committed Jul 14, 2012
    * PHP-5.3:
      - Fixed bug #62525 (sigabrt while converting floating point to string)
  3. @felipensp
Commits on Jul 4, 2012
  1. @johannes

    This wil be PHP 5.3.16

    johannes committed Jul 5, 2012
Commits on Jun 27, 2012
  1. @nikic

    Merge branch 'PHP-5.3' into PHP-5.4

    nikic committed Jun 27, 2012
    * PHP-5.3:
      Improve JSON error handling
    
    Conflicts:
    	ext/json/tests/bug54058.phpt
    	ext/json/tests/bug61537.phpt
Commits on Jun 11, 2012
  1. @smalyshev

    Merge branch 'PHP-5.4'

    smalyshev committed Jun 10, 2012
    * PHP-5.4:
      typo fix
  2. @smalyshev

    typo fix

    smalyshev committed Jun 10, 2012
Commits on Jun 8, 2012
  1. @smalyshev

    Merge branch 'PHP-5.4'

    smalyshev committed Jun 8, 2012
    * PHP-5.4:
      improve overflow checks
      add NEWS
      fix potential overflow in _php_stream_scandir
  2. @smalyshev

    Merge branch 'PHP-5.3' into PHP-5.4

    smalyshev committed Jun 8, 2012
    * PHP-5.3:
      improve overflow checks
      fix potential overflow in _php_stream_scandir
  3. @smalyshev

    improve overflow checks

    smalyshev committed Jun 8, 2012
  4. @smalyshev

    Merge branch 'PHP-5.4'

    smalyshev committed Jun 7, 2012
    * PHP-5.4:
      fix potential overflow in _php_stream_scandir
  5. @smalyshev
  6. @smalyshev
Commits on May 16, 2012
  1. @johannes

    PHP 5.3.15-dev

    johannes committed May 16, 2012
  2. @smalyshev

    to 5.4.5-dev

    smalyshev committed May 15, 2012
Commits on May 15, 2012
  1. @m6w6

    cleanup merge

    m6w6 committed May 15, 2012
  2. @m6w6
Commits on May 14, 2012
  1. Bump to 5.4.4-dev

    Christopher Jones committed May 14, 2012
Commits on May 8, 2012
  1. @johannes

    This will be PHP 5.3.14

    johannes committed May 8, 2012
Commits on May 6, 2012
  1. @nikic

    Merge branch 'PHP-5.4'

    nikic committed May 6, 2012
    * PHP-5.4:
      Add NEWS entry for bug #61961
      Fixed Bug #61961 (file_get_content leaks when access empty file with max length)
  2. @nikic

    Merge branch 'PHP-5.3' into PHP-5.4

    nikic committed May 6, 2012
    * PHP-5.3:
      Add NEWS entry for bug #61961
      Fixed Bug #61961 (file_get_content leaks when access empty file with max length)
  3. @reeze
Commits on May 3, 2012
  1. Merge branch 'PHP-5.3' into PHP-5.4

    Christopher Jones committed May 3, 2012
    * PHP-5.3:
      Bump to next version
    
    Conflicts:
    	configure.in
    	main/php_version.h
  2. Bump to next version

    Christopher Jones committed May 3, 2012
    Bump PHP version number
Commits on Apr 19, 2012
  1. @smalyshev

    Update to 5.4.2-dev

    Christopher Jones committed with smalyshev Apr 16, 2012
    After PHP-5.4.1 was branched, the PHP-5.4 branch should have been 5.4.2-dev.
Commits on Apr 14, 2012
  1. @laruence

    Merge branch 'PHP-5.4'

    laruence committed Apr 15, 2012
  2. @laruence
Commits on Apr 7, 2012
  1. @cataphract

    Merge branch '5.4'

    cataphract committed Apr 7, 2012
  2. @cataphract

    Merge branch '5.3' into 5.4

    cataphract committed Apr 7, 2012
  3. @cataphract

    Fixed bug in new stream_get_line() when using NUL as a delimiter.

    cataphract committed Apr 7, 2012
    This is the issue Derick spotted a few days ago..
Commits on Apr 6, 2012
  1. @laruence

    Merge branch 'PHP-5.4'

    laruence committed Apr 6, 2012
    * PHP-5.4:
      Update NEWS
      Fixed bug #61650 (ini parser crashes when using ${xxxx} ini variables (without apache2))
  2. @laruence

    Merge branch 'PHP-5.3' into PHP-5.4

    laruence committed Apr 6, 2012
    * PHP-5.3:
      Fixed bug #61650 (ini parser crashes when using ${xxxx} ini variables (without apache2))
  3. @laruence
Commits on Apr 4, 2012
  1. @cataphract

    Cherry-pick 4cc7476

    cataphract committed Apr 4, 2012
    Headers: forbid \r and \n also after \0, allow CRLF followed by HT or SP and forbid \0. See bug #60227.
    
    Conflicts:
    
    	ext/standard/tests/general_functions/bug60227.phpt
    	ext/standard/tests/general_functions/bug60227_1.phpt
    	ext/standard/tests/general_functions/bug60227_2.phpt
    	main/SAPI.c
  2. @laruence
Something went wrong with that request. Please try again.