Permalink
Switch branches/tags
Commits on Apr 5, 2012
Commits on Apr 4, 2012
  1. Merge branch 'PHP-5.4'

    * PHP-5.4:
      Fix bug #61480 test bug - ext/gd/tests/bug48555.phpt
      updated the NEWS with the latest fileinfo changes
    weltling committed Apr 4, 2012
  2. Merge branch 'PHP-5.3' into PHP-5.4

    * PHP-5.3:
      Fix bug #61480 test bug - ext/gd/tests/bug48555.phpt
      updated the NEWS with the latest fileinfo changes
    
    Conflicts:
    	NEWS
    weltling committed Apr 4, 2012
  3. Fix bug #61480 test bug - ext/gd/tests/bug48555.phpt

    Matt Ficken committed with weltling Apr 4, 2012
  4. Merge branch 'PHP-5.4'

    * PHP-5.4:
      fix typo
    laruence committed Apr 4, 2012
  5. fix typo

    laruence committed Apr 4, 2012
  6. Merge branch 'PHP-5.4'

    * PHP-5.4:
      Update NEWS for #61617
    laruence committed Apr 4, 2012
  7. Update NEWS for #61617

    laruence committed Apr 4, 2012
  8. Merge branch 'PHP-5.4'

    * PHP-5.4:
      Fixed bug #61617 (Libxml tests failed(ht is already destroyed))
      Cherry-pick 4cc7476
    laruence committed Apr 4, 2012
  9. Merge branch 'PHP-5.3' into PHP-5.4

    * PHP-5.3:
      Fixed bug #61617 (Libxml tests failed(ht is already destroyed))
      Cherry-pick 4cc7476
    
    Conflicts:
    	NEWS
    laruence committed Apr 4, 2012
  10. Cherry-pick 4cc7476

    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
    cataphract committed Apr 4, 2012
  11. Merge branch 'PHP-5.4'

    * PHP-5.4:
      Fix warning "suggest parentheses around assignment"
    laruence committed Apr 4, 2012
  12. Merge branch 'PHP-5.3' into PHP-5.4

    * PHP-5.3:
      Fix warning "suggest parentheses around assignment"
    
    Conflicts:
    	main/SAPI.c
    laruence committed Apr 4, 2012
  13. Merge branch 'PHP-5.4'

    * PHP-5.4:
      Fixed bug #61605 (header_remove() does not remove all headers)
    
    Conflicts:
    	NEWS
    laruence committed Apr 4, 2012
  14. Merge branch 'PHP-5.4'

    laruence committed Apr 4, 2012
  15. Fix test

    cherry-pick from php-5.4
    laruence committed with laruence Mar 24, 2012
Commits on Apr 3, 2012
  1. Merge branch 'PHP-5.4'

    * PHP-5.4:
      Fixed bug #61423 (gzip compression fails).
    Ilia Alshanetsky committed Apr 3, 2012
  2. Fixed bug #61423 (gzip compression fails).

    Ilia Alshanetsky committed Apr 3, 2012
  3. Merge branch 'PHP-5.4'

    * PHP-5.4:
      Fix bug #61460 popen_close_error-win32 expected output is wrong
      Fix bug #61454 ext\standard\tests\general_functions\bug49847.phpt fails
      Fix bug #61481 Test Bug - ext/com_dotnet/tests/bug49192
      Fix bug #61517 random test failure - ext/standard/tests/misc/time_sleep_until_basic.phpt
    weltling committed Apr 3, 2012
  4. Merge branch 'PHP-5.3' into PHP-5.4

    * PHP-5.3:
      Fix bug #61460 popen_close_error-win32 expected output is wrong
    
    Conflicts:
    	ext/standard/tests/file/popen_pclose_error-win32.phpt
    weltling committed Apr 3, 2012
  5. Merge branch 'PHP-5.3' into PHP-5.4

    * PHP-5.3:
      Fix bug #61454 ext\standard\tests\general_functions\bug49847.phpt fails
    weltling committed Apr 3, 2012
  6. Merge branch 'PHP-5.3' into PHP-5.4

    * PHP-5.3:
      Fix bug #61481 Test Bug - ext/com_dotnet/tests/bug49192
    weltling committed Apr 3, 2012