Stanislav Malyshev 0f333fa93c Merge branch 'PHP-5.5' into PHP-5.6 ...

* PHP-5.5:
  added missing parentheses
  Fix #67626
  Fix #63486

Conflicts:
	main/streams/userspace.c

2015-03-08 23:41:30 -07:00

..

cast.c

bump year

2015-01-15 23:26:37 +08:00

filter.c

Fix call after close if multiple filters are attached

2015-01-26 22:47:35 +01:00

glob_wrapper.c

bump year

2015-01-15 23:26:37 +08:00

memory.c

Merge branch 'PHP-5.5' into PHP-5.6

2015-02-05 16:33:20 +08:00

mmap.c

bump year

2015-01-15 23:26:37 +08:00

php_stream_context.h

bump year

2015-01-15 23:26:37 +08:00

php_stream_filter_api.h

bump year

2015-01-15 23:26:37 +08:00

php_stream_glob_wrapper.h

bump year

2015-01-15 23:26:37 +08:00

php_stream_mmap.h

bump year

2015-01-15 23:26:37 +08:00

php_stream_plain_wrapper.h

bump year

2015-01-15 23:26:37 +08:00

php_stream_transport.h

Fixed bug (#69195 Inconsistent stream crypto values across versions)

2015-03-05 21:09:39 -07:00

php_stream_userspace.h

bump year

2015-01-15 23:26:37 +08:00

php_streams_int.h

bump year

2015-01-15 23:26:37 +08:00

plain_wrapper.c

Merge branch 'PHP-5.5' into PHP-5.6

2015-01-31 23:47:25 -08:00

streams.c

Fix stream_select() issue with OpenSSL buffer

2015-03-05 17:18:14 -07:00

transports.c

bump year

2015-01-15 23:26:37 +08:00

userspace.c

Merge branch 'PHP-5.5' into PHP-5.6

2015-03-08 23:41:30 -07:00

xp_socket.c

bump year

2015-01-15 23:26:37 +08:00