helly Sat Feb 3 16:40:05 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/main/streams memory.c
/php-src/main php_memory_streams.h
Log:
- MFH Add PHPAPI to stuff needed by streams API for shared exts
- MFH Readonly issue fix to memory streams option handling (still not
activated in 5.2.1 though)
http://cvs.php.net/viewvc.cgi/php-src/main/streams/memory.c?r1=1.8.2.6.2.14&r2=1.8.2.6.2.15&diff_format=u
Index: php-src/main/streams/memory.c
diff -u php-src/main/streams/memory.c:1.8.2.6.2.14
php-src/main/streams/memory.c:1.8.2.6.2.15
--- php-src/main/streams/memory.c:1.8.2.6.2.14 Sat Jan 27 20:31:51 2007
+++ php-src/main/streams/memory.c Sat Feb 3 16:40:05 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: memory.c,v 1.8.2.6.2.14 2007/01/27 20:31:51 helly Exp $ */
+/* $Id: memory.c,v 1.8.2.6.2.15 2007/02/03 16:40:05 helly Exp $ */
#define _GNU_SOURCE
#include "php.h"
@@ -253,6 +253,9 @@
return PHP_STREAM_OPTION_RETURN_OK;
case PHP_STREAM_TRUNCATE_SET_SIZE:
+ if (ms->mode & TEMP_STREAM_READONLY) {
+ return
PHP_STREAM_OPTION_RETURN_ERR;
+ }
newsize = *(size_t*)ptrparam;
if (newsize <= ms->fsize) {
if (newsize < ms->fpos) {
@@ -272,7 +275,7 @@
}
/* }}} */
-php_stream_ops php_stream_memory_ops = {
+PHPAPI php_stream_ops php_stream_memory_ops = {
php_stream_memory_write, php_stream_memory_read,
php_stream_memory_close, php_stream_memory_flush,
"MEMORY",
@@ -532,7 +535,7 @@
}
/* }}} */
-php_stream_ops php_stream_temp_ops = {
+PHPAPI php_stream_ops php_stream_temp_ops = {
php_stream_temp_write, php_stream_temp_read,
php_stream_temp_close, php_stream_temp_flush,
"TEMP",
@@ -585,7 +588,7 @@
}
/* }}} */
-php_stream_ops php_stream_rfc2397_ops = {
+PHPAPI php_stream_ops php_stream_rfc2397_ops = {
php_stream_temp_write, php_stream_temp_read,
php_stream_temp_close, php_stream_temp_flush,
"RFC2397",
http://cvs.php.net/viewvc.cgi/php-src/main/php_memory_streams.h?r1=1.13.2.1.2.2&r2=1.13.2.1.2.3&diff_format=u
Index: php-src/main/php_memory_streams.h
diff -u php-src/main/php_memory_streams.h:1.13.2.1.2.2
php-src/main/php_memory_streams.h:1.13.2.1.2.3
--- php-src/main/php_memory_streams.h:1.13.2.1.2.2 Mon Jan 1 09:36:11 2007
+++ php-src/main/php_memory_streams.h Sat Feb 3 16:40:05 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_memory_streams.h,v 1.13.2.1.2.2 2007/01/01 09:36:11 sebastian Exp
$ */
+/* $Id: php_memory_streams.h,v 1.13.2.1.2.3 2007/02/03 16:40:05 helly Exp $ */
#ifndef PHP_MEMORY_STREAM_H
#define PHP_MEMORY_STREAM_H
@@ -48,10 +48,10 @@
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()
-extern php_stream_ops php_stream_memory_ops;
-extern php_stream_ops php_stream_temp_ops;
-extern php_stream_ops php_stream_rfc2397_ops;
-extern php_stream_wrapper php_stream_rfc2397_wrapper;
+extern PHPAPI php_stream_ops php_stream_memory_ops;
+extern PHPAPI php_stream_ops php_stream_temp_ops;
+extern PHPAPI php_stream_ops php_stream_rfc2397_ops;
+extern PHPAPI php_stream_wrapper php_stream_rfc2397_wrapper;
#define PHP_STREAM_IS_MEMORY &php_stream_memory_ops
#define PHP_STREAM_IS_TEMP &php_stream_temp_ops
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
