]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 23f089a fc90456)
Merge branch 'PHP-5.6'
authorAnatol Belski <ab@php.net>
Wed, 29 Oct 2014 19:04:56 +0000 (20:04 +0100)
committerAnatol Belski <ab@php.net>
Wed, 29 Oct 2014 19:04:56 +0000 (20:04 +0100)
commitd77ce317636919a87daa7f8ffb2979474f9cade7
treec9ebe2c7ad01661e7696a8f15d6d4842870f03eatree | snapshot
parent23f089a6b3586d524e8709d75262029bc8fa7ad4commit | diff
parentfc904569ea5c5513925a69bf43820845eb3db104commit | diff
Merge branch 'PHP-5.6'

* PHP-5.6:
  fix output globals importing
  export output globals
  use portable strndup implementation
  unix sockets aren't available on windows
  dll export APIs needed by phpdbg
  fix sapi/phpdbg/config.w32
  Don't treat warnings as failures in the junit output
ext/standard/basic_functions.c diff1 | diff2 | blob | history
ext/standard/basic_functions.h diff1 | diff2 | blob | history
main/output.c diff1 | diff2 | blob | history
main/php_main.h diff1 | diff2 | blob | history
main/php_output.h diff1 | diff2 | blob | history
sapi/phpdbg/phpdbg.c diff1 | diff2 | blob | history
sapi/phpdbg/phpdbg_frame.c diff1 | diff2 | blob | history
sapi/phpdbg/phpdbg_prompt.c diff1 | diff2 | blob | history
sapi/phpdbg/phpdbg_wait.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.