Daniel Lowrey 3e0a1a71e9 Merge branch 'PHP-5.6' ...

* PHP-5.6:
  Fixed bug (#69195 Inconsistent stream crypto values across versions)

Conflicts:
	ext/standard/http_fopen_wrapper.c

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

..

cast.c

Use zend_string* instead of char* for opened_patch handling. Avoid reallocations and improve string reuse.

2015-03-04 02:05:28 +03:00

filter.c

Merge branch 'PHP-5.6'

2015-01-26 22:53:36 +01:00

glob_wrapper.c

Use zend_string* instead of char* for opened_patch handling. Avoid reallocations and improve string reuse.

2015-03-04 02:05:28 +03:00

memory.c

Use zend_string* instead of char* for opened_patch handling. Avoid reallocations and improve string reuse.

2015-03-04 02:05:28 +03:00

mmap.c

Fixed wrong parameter type of php_stream_mmap_range()

2015-03-04 11:28:14 +08:00

php_stream_context.h

Cleanup resource handling APIs

2015-02-02 13:23:16 +08:00

php_stream_filter_api.h

bump year

2015-01-15 23:27:30 +08:00

php_stream_glob_wrapper.h

bump year

2015-01-15 23:27:30 +08:00

php_stream_mmap.h

Fixed wrong parameter type of php_stream_mmap_range()

2015-03-04 11:28:14 +08:00

php_stream_plain_wrapper.h

Use zend_string* instead of char* for opened_patch handling. Avoid reallocations and improve string reuse.

2015-03-04 02:05:28 +03:00

php_stream_transport.h

Merge branch 'PHP-5.6'

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

php_stream_userspace.h

bump year

2015-01-15 23:27:30 +08:00

php_streams_int.h

bump year

2015-01-15 23:27:30 +08:00

plain_wrapper.c

Avoid repeatable strlen() calls

2015-03-05 18:18:39 +03:00

streams.c

Merge branch 'PHP-5.6'

2015-03-05 17:53:04 -07:00

transports.c

Add stream_socket_crypto_info() function

2015-02-28 17:41:29 -05:00

userspace.c

Use zend_string* instead of char* for opened_patch handling. Avoid reallocations and improve string reuse.

2015-03-04 02:05:28 +03:00

xp_socket.c

bump year

2015-01-15 23:27:30 +08:00