]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0f78d86 71bee63)
Merge branch 'slim-postdata-merge'
authorMichael Wallner <mike@php.net>
Tue, 17 Sep 2013 11:52:25 +0000 (13:52 +0200)
committerMichael Wallner <mike@php.net>
Tue, 17 Sep 2013 11:52:25 +0000 (13:52 +0200)
commit423c70fb4d79b7831b1db41ea217c8e1afd5cf8e
tree7c78b090a462749e567e29a668cf8c750aa60b20tree | snapshot
parent0f78d8612a7b16f1bbe3fb80a99896d7163c0aa7commit | diff
parent71bee63fad5418642c87c588cc9e22ca44186ce6commit | diff
Merge branch 'slim-postdata-merge'

* slim-postdata-merge:
  remove unused code
  tests
  make reading php://input JIT if enable_post_data_reading=0
  revert stream cast
  fix ZTS build
  slim post data

Conflicts:
ext/soap/soap.c
ext/standard/php_fopen_wrapper.c
main/SAPI.c
ext/soap/soap.c diff1 | diff2 | blob | history
ext/standard/php_fopen_wrapper.c diff1 | diff2 | blob | history
main/SAPI.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.