Michael Wallner f9fda21667 Merge branch 'PHP-5.6' ...

* PHP-5.6:
  BFN for bug #67551 (php://input temp file will be located in sys_temp_dir instead of upload_tmp_dir)
  reorder
  restore API compatibility
  finish
  refactor php_stream_temp_create{,_ex} and use it for the php://input stream
  refactor _php_stream_fopen_{temporary_,tmp}file()
  fix length overflow of HTTP_RAW_POST_DATA

Conflicts:
	main/php_content_types.c

2014-07-03 20:43:12 +02:00

..

cast.c

Bump year

2014-01-03 11:08:10 +08:00

filter.c

Bump year

2014-01-03 11:08:10 +08:00

glob_wrapper.c

Bump year

2014-01-03 11:08:10 +08:00

memory.c

restore API compatibility

2014-07-03 20:40:41 +02:00

mmap.c

Bump year

2014-01-03 11:08:10 +08:00

php_stream_context.h

Merge branch 'PHP-5.6'

2014-01-03 11:09:07 +08:00

php_stream_filter_api.h

Bump year

2014-01-03 11:08:10 +08:00

php_stream_glob_wrapper.h

Bump year

2014-01-03 11:08:10 +08:00

php_stream_mmap.h

Bump year

2014-01-03 11:08:10 +08:00

php_stream_plain_wrapper.h

restore API compatibility

2014-07-03 20:40:41 +02:00

php_stream_transport.h

Use crypto method flags; add tlsv1.0 wrapper; add wrapper tests

2014-02-20 17:10:06 -07:00

php_stream_userspace.h

Bump year

2014-01-03 11:08:10 +08:00

php_streams_int.h

Bump year

2014-01-03 11:08:10 +08:00

plain_wrapper.c

restore API compatibility

2014-07-03 20:40:41 +02:00

streams.c

Merge branch 'PHP-5.6'

2014-04-20 15:27:55 -07:00

transports.c

Merge branch 'PHP-5.6'

2014-01-03 11:09:07 +08:00

userspace.c

Merge branch 'PHP-5.6'

2014-01-03 11:09:07 +08:00

xp_socket.c

Merge branch 'PHP-5.5' into PHP-5.6

2014-04-02 11:11:23 +02:00