diff options
| author | Michael Wallner <mike@php.net> | 2014-07-03 20:43:12 +0200 |
|---|---|---|
| committer | Michael Wallner <mike@php.net> | 2014-07-03 20:43:12 +0200 |
| commit | f9fda21667cf6c93d75402bcd4cca224115ca195 (patch) | |
| tree | cf37d352927fceccfeedda3db3a0507ea10e9d40 /main/php_memory_streams.h | |
| parent | a99e7eeab9bddbbd548660e53f129084a1650dea (diff) | |
| parent | 88c1ce3203608d85a18db823729f3d7034b01660 (diff) | |
| download | php-git-f9fda21667cf6c93d75402bcd4cca224115ca195.tar.gz | |
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
Diffstat (limited to 'main/php_memory_streams.h')
| -rw-r--r-- | main/php_memory_streams.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/main/php_memory_streams.h b/main/php_memory_streams.h index 3c4c3280eb..229ed1902e 100644 --- a/main/php_memory_streams.h +++ b/main/php_memory_streams.h @@ -36,6 +36,7 @@ #define php_stream_temp_new() php_stream_temp_create(TEMP_STREAM_DEFAULT, PHP_STREAM_MAX_MEM) #define php_stream_temp_create(mode, max_memory_usage) _php_stream_temp_create((mode), (max_memory_usage) STREAMS_CC TSRMLS_CC) +#define php_stream_temp_create_ex(mode, max_memory_usage, tmpdir) _php_stream_temp_create_ex((mode), (max_memory_usage), (tmpdir) STREAMS_CC TSRMLS_CC) #define php_stream_temp_create_rel(mode, max_memory_usage) _php_stream_temp_create((mode), (max_memory_usage) STREAMS_REL_CC TSRMLS_CC) #define php_stream_temp_open(mode, max_memory_usage, buf, length) _php_stream_temp_open((mode), (max_memory_usage), (buf), (length) STREAMS_CC TSRMLS_CC) @@ -45,6 +46,7 @@ PHPAPI php_stream *_php_stream_memory_open(int mode, char *buf, size_t length ST PHPAPI char *_php_stream_memory_get_buffer(php_stream *stream, size_t *length STREAMS_DC TSRMLS_DC); PHPAPI php_stream *_php_stream_temp_create(int mode, size_t max_memory_usage STREAMS_DC TSRMLS_DC); +PHPAPI php_stream *_php_stream_temp_create_ex(int mode, size_t max_memory_usage, const char *tmpdir STREAMS_DC TSRMLS_DC); PHPAPI php_stream *_php_stream_temp_open(int mode, size_t max_memory_usage, char *buf, size_t length STREAMS_DC TSRMLS_DC); END_EXTERN_C() |