Skip to content
Commits on Sep 29, 2012
  1. @laruence

    Merge branch 'PHP-5.4'

    laruence committed
  2. @laruence
Commits on Sep 28, 2012
  1. @adoy

    Merge branch 'PHP-5.4'

    adoy committed
    * PHP-5.4:
      Update NEWS
  2. @adoy

    Merge branch 'PHP-5.3' into PHP-5.4

    adoy committed
    * PHP-5.3:
      Update NEWS
  3. @adoy

    Update NEWS

    adoy committed
  4. @adoy

    Merge branch 'PHP-5.4'

    adoy committed
    * PHP-5.4:
      FD_ZERO file descriptors before calling curl_multi_fdset
  5. @adoy

    Merge branch 'PHP-5.3' into PHP-5.4

    adoy committed
    * PHP-5.3:
      FD_ZERO file descriptors before calling curl_multi_fdset
  6. @adoy

    FD_ZERO file descriptors before calling curl_multi_fdset

    adoy committed
    As per curl documentation http://curl.haxx.se/libcurl/c/curl_multi_fdset.html
    we need to FD_ZERO file descriptors before calling the curl_multi_fdset function
  7. Merge branch 'master' of ssh://git.php.net/php-src

    Andrey Hristov committed
  8. Merge branch 'PHP-5.4'

    Jerome Loyet committed
    * PHP-5.4:
      Add missing NEWS entry
      Fixed bug #62216
  9. Add missing NEWS entry

    Jerome Loyet committed
  10. Merge branch 'PHP-5.3' into PHP-5.4

    Jerome Loyet committed
    * PHP-5.3:
      Fixed bug #62216
  11. Merge branch 'bug62216' into PHP-5.3

    Jerome Loyet committed
    * bug62216:
      Fixed bug #62216
  12. Fixed bug #62216

    Jerome Loyet committed
    Add PID to php-fpm init.d script
  13. @laruence

    Merge branch 'PHP-5.4'

    laruence committed
  14. @laruence
Commits on Sep 27, 2012
  1. Merge branch 'fuckgit' into PHP-5.4

    Jerome Loyet committed
    * fuckgit:
      - Fixed bug #62947 (Unneccesary warnings on FPM)
      - Fixed bug #63085 (Systemd integration and daemonize)
    
    Conflicts:
    	sapi/fpm/config.m4
  2. - Fixed bug #62947 (Unneccesary warnings on FPM)

    Jerome Loyet committed
  3. - Fixed bug #62947 (Unneccesary warnings on FPM)

    Jerome Loyet committed
  4. - Fixed bug #62947 (Unneccesary warnings on FPM)

    Jerome Loyet committed
  5. - fix merge (fucking git merging system ... :( )

    Jerome Loyet committed
  6. Merge branch 'PHP-5.4'

    Jerome Loyet committed
    * PHP-5.4:
      - Fixed bug #63085 (Systemd integration and daemonize)
      - Fixed bug #62954 (startup problems fpm / php-fpm) - Fixed bug #62886 (PHP-FPM may segfault/hang on startup)
  7. - Fixed bug #63085 (Systemd integration and daemonize)

    Jerome Loyet committed
  8. - add missing php-fpm.service.in

    Jerome Loyet committed
  9. Merge branch 'PHP-5.3' into PHP-5.4

    Jerome Loyet committed
    * PHP-5.3:
      - Fixed bug #63085 (Systemd integration and daemonize)
      - Fixed bug #62954 (startup problems fpm / php-fpm) - Fixed bug #62886 (PHP-FPM may segfault/hang on startup)
    
    Conflicts:
    	sapi/fpm/config.m4
  10. - Fixed bug #63085 (Systemd integration and daemonize)

    Jerome Loyet committed
  11. Merge branch 'PHP-5.4'

    Jerome Loyet committed
    * PHP-5.4:
      - Fixed bug #62954 (startup problems fpm / php-fpm) - Fixed bug #62886 (PHP-FPM may segfault/hang on startup)
  12. Merge branch 'master' of git.php.net:php-src

    Jerome Loyet committed
    * 'master' of git.php.net:php-src: (641 commits)
      fix unix/win dir separators
      Fix bug #63173: Crash when invoking invalid array callback
      compile out example plugin in a release build
      change public key setting to PERDIR and finish code that allows to set the key file programatically per mysqli_options()
      remove old unicode code, that is was compiled out by using a macro
      Add SHA256 authentication support - password hashing to mysqlnd Automatic switchover to SSL with plain-text password is not part of this
      Correct the test summary
      Fixed bug #60723 (error_log error time has changed to UTC ignoring default timezo)
      Fixed bug #60723 (error_log error time has changed to UTC ignoring default timezo)
      Add NEWS/UPGRADING for previous change
      Simplify set_error_handler/set_exception_handler code
      Return previous error handler when resetting the error handler
      Allow resetting the error handler
      Revert error/exception handler changes
      Fixed bug #63132
      Avoid calling select if maxfd returned by curl_multi_fdset is -1
      Add CURLOPT_READDATA which was removed by mistake
      Fixing NEWS file
      Fixed bug #63111 (is_callable() lies for abstract static method)
      updated lib versions
      ...
  13. - Fixed bug #62954 (startup problems fpm / php-fpm)

    Jerome Loyet committed
    - Fixed bug #62886 (PHP-FPM may segfault/hang on startup)
  14. Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4

    Jerome Loyet committed
    * 'PHP-5.4' of git.php.net:php-src: (367 commits)
      fix unix/win dir separators
      Fix bug #63173: Crash when invoking invalid array callback
      Correct the test summary
      Fixed bug #60723 (error_log error time has changed to UTC ignoring default timezo)
      Fixed bug #60723 (error_log error time has changed to UTC ignoring default timezo)
      Avoid calling select if maxfd returned by curl_multi_fdset is -1
      Fixing NEWS file
      Fixed bug #63111 (is_callable() lies for abstract static method)
      updated lib versions
      Fix folding
      fix bug #63015 (Incorrect arginfo for DOMErrorHandler)
      Bug #63000: MCAST_JOIN_GROUP on OSX is broken
      Fixed bug #61442 (exception threw in __autoload can not be catched)
      Merging PR #116
      Merged GitHub PR #190: Support for the HTTP PATCH method in CLI webserver
      updated libary versions
      split tests for the new zlib version on win
      Fixed Bug #63103 (ext\curl\tests\bug62839.phpt broken)
      update news
      Support building PHP with the native client toolchain.
      ...
  15. - Fixed bug #62954 (startup problems fpm / php-fpm)

    Jerome Loyet committed
    - Fixed bug #62886 (PHP-FPM may segfault/hang on startup)
Something went wrong with that request. Please try again.