fixes to zend_ini and output
fixes to xp_socket.c
fixes to plain stream wrapper
fixes to SAPI.c
more fixes to streams
fixes to zend
Merge branch 'master' of https://github.com/php/php-src into string_size_refactor_take_2

Conflicts:
	Zend/zend_vm_def.h
	Zend/zend_vm_execute.h
fixes after merging master
Merge branch 'master' of https://github.com/php/php-src into string_size_refactor_take_2

Conflicts:
	Zend/zend_constants.h
	ext/standard/info.c
fixes to main/
more for cli sapi
more fixes to string.c
fixes for types to ext/standard with types ... some stuff is broken now
Merge branch 'master' of https://github.com/php/php-src into string_size_refactor_take_2

Conflicts:
	Zend/zend_operators.h
	main/SAPI.h
	main/rfc1867.c
	main/streams/php_stream_transport.h
	main/streams/streams.c
	main/streams/transports.c
	main/streams/xp_socket.c
changes to dns.c
Merge pull request #4 from weltling/string_size_refactor_take_2

String size refactor take 2
fix conflicts