Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: php/php-src
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: conf/php-src
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 4 commits
  • 0 files changed
  • 1 contributor

Commits on Jul 18, 2012

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

    * 'master' of git.php.net:php-src: (623 commits)
      this initialization is unnecessary anymore after commit 2d9d2ca
      Fixed bug #62597 (segfault in php_stream_wrapper_log_error with ZTS build)
      Fix test (no charset outputed)
      skip for ZTS
      fix test (dos2unix, typo)
      fix test, the key may be a float value
      test script for bug #61697
      Fixed bug #62594 (segfault in mysqlnd_res_meta::set_mode)
      fix test
      Bug doesn't exists in any release
      NEWS for b47d6b3
      Fix test fails: ext/standard/tests/general_functions/bug27678.phpt
      Fix for bug #62379 was missing in 5.3
      Do not unload shared extensions when checking for leaks
      typo
      Update libmagic.patch
      update NEWS
      Fixed bug #61527 (Recursive/ArrayIterator gives misleading notice when array empty or moved to the end)
      Typofix in test-description
      improve code in zend_operators
      ...
    Shein Alexey committed Jul 18, 2012
    Configuration menu
    Copy the full SHA
    0435c34 View commit details
    Browse the repository at this point in the history

Commits on Jul 23, 2012

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

    * 'master' of git.php.net:php-src:
      Fix Bug #62612 readline extension compilation fails
      merge 5.3.15 NEWS
      Improve error message for ssl request
      Reflect changes made in merge 99e48d3
      Readded accidentally removed line
      Added IntlDateFormatter::formatObject(). Refactor
      missed the test script
      Fix test failed
      Fixed bug #62616 (ArrayIterator::count() from IteratorIterator instance gives Segmentation fault)
      Fixed bug #62616 (ArrayIterator::count() from IteratorIterator instance gives Segmentation fault)
      Fixed bug #55544 (ob_gzhandler always conflicts with zlib.output_compression)
      merge 9eb5cb6 to 5.3
      Revert "fix test"
      Refactored internal_get_timestamp()
      Unified zval -> UDate conversions
    Shein Alexey committed Jul 23, 2012
    Configuration menu
    Copy the full SHA
    3597abb View commit details
    Browse the repository at this point in the history

Commits on Aug 3, 2012

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

    * 'master' of git.php.net:php-src: (57 commits)
      Fixed bug #62725 (Calling exit() in a shutdown function does not return the exit value)
      Fixed bug that can not get default value of parameter if it's not `optional`
      Fixed bug that can not get default value of parameter if it's not `optional`
      Fix test, wrong exepct rule used
      fix test due to float value
      make default_exception_ce and error_exception_ce static
      make default_exception_ce and error_exception_ce static
      Fixed bug #62685 (Wrong return datatype in PDO::inTransaction())
      Fixed bug #62685 (Wrong return datatype in PDO::inTransaction())
      Fixed bug #62716 (munmap() is called with the incorrect length)
      fix NEWS
      Sleep a little bit more, in some slow machine (like gcov), it will take a little more time to setup server
      update NEWS
      Fixed bug #62715 (ReflectionParameter::isDefaultValueAvailable() wrong result)
      sync NEWS
      skip tests if ibase not present
      Implemented FR #62700 (have the console output 'Listening on http://localhost:8000')
      expect pass for 5.4
      Test for bug #62680
      Fix crashes with filenames that don't contain directory separator - generated files like scanners/parsers.
      ...
    Shein Alexey committed Aug 3, 2012
    Configuration menu
    Copy the full SHA
    6783859 View commit details
    Browse the repository at this point in the history

Commits on Dec 17, 2012

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

    * 'master' of git.php.net:php-src: (689 commits)
      dos2unix & skip on connect fail
      Fix failed test
      Ignore Zend/zend_dtrace_gen.h and Zend/zend_dtrace_gen.hbak
      Fixed bug #63706: Cannot build PHP-5.5 with --enable-dtrace on Fedora 17
      Fixed bug #63706: Cannot build PHP-5.5 with --enable-dtrace on Fedora 17
      Updating news entry to list new filetypes
      News entry for updated mime types
      update test for supported Mime Types checking
      update list of common Mime Types in PHP development server to support Web audio/video formats (Webm ,and Ogg containers) + have jpeg mime types listed together
      Fix warning of no return in non-void function
      Fixed warning of no return in non-void funciton
      Add test for bug #63741
      Add test for bug #63741
      Fixed uninitialized EX(call)->called_scope
      Need connect.inc here
      Fix broken test Need to use the configured connection parameters here. We can't assume the test user has access.
      Fix broken test This was missing a %s for the path here
      Fix #63379 - Don't reset mod_user_is_open in destroy
      Fix Bug #63762 Sigsegv when Exception::$trace is changed by user
      Fixed mysqlnd compilation in debug mode on windows
      ...
    Shein Alexey committed Dec 17, 2012
    Configuration menu
    Copy the full SHA
    fe61e34 View commit details
    Browse the repository at this point in the history
Loading