summaryrefslogtreecommitdiff
path: root/main/php_variables.c
diff options
context:
space:
mode:
authorMichael Wallner <mike@php.net>2013-09-17 13:52:25 +0200
committerMichael Wallner <mike@php.net>2013-09-17 13:52:25 +0200
commit423c70fb4d79b7831b1db41ea217c8e1afd5cf8e (patch)
tree7c78b090a462749e567e29a668cf8c750aa60b20 /main/php_variables.c
parent0f78d8612a7b16f1bbe3fb80a99896d7163c0aa7 (diff)
parent71bee63fad5418642c87c588cc9e22ca44186ce6 (diff)
downloadphp-git-423c70fb4d79b7831b1db41ea217c8e1afd5cf8e.tar.gz
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
Diffstat (limited to 'main/php_variables.c')
0 files changed, 0 insertions, 0 deletions