Changeset 216

Timestamp:

06/16/10 22:11:26 (20 months ago)

Author:

lars

Message:

Support for large files

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• mogilefs.c (modified) (4 diffs)
• php_mogilefs.h (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+php-mogilefs 0.7.6:
+    * Support for large files (Alayn Gortazar <alayn@irontec.com>)
+
 php-mogilefs 0.7.5 beta3:
     * New API: MogileFs::isConnected()

trunk/mogilefs.c

@@ -469 +469 @@
 /* }}} */
 
-PHPAPI char *mogilefs_file_to_mem(char *filename, int *file_buffer_len TSRMLS_DC) /* {{{ */
-{
-    php_stream *stream;
-    char *data = NULL;
-
-    if ((stream = php_stream_open_wrapper(filename, "rb", USE_PATH | ENFORCE_SAFE_MODE, NULL)) != NULL) {
-        *file_buffer_len = php_stream_copy_to_mem(stream, &data, PHP_STREAM_COPY_ALL, 0);
-        if (*file_buffer_len == 0) {
-            data = estrdup("");
-        }
-        php_stream_close(stream);
-    }
-    return data;
-}
-/* }}} */
-
 PHPAPI char *mogilefs_create_open(MogilefsSock *mogilefs_sock, const char * const key,  const char * const class, int multi_dest TSRMLS_DC) /* {{{ */
 {
@@ -671 +655 @@
     ne_session *sess;
     ne_request *req;
-    int multi_dest = 1, use_file = 1, key_len, class_len, file_buffer_len, filename_len, ret, alloc_file = 0, alloc_url = 0;
+    int multi_dest = 1, use_file = 1, key_len, class_len, file_buffer_len, filename_len, ret, alloc_file = 0, alloc_url = 0, fd = 0;
     char *key = NULL, *class = NULL, *file_buffer, *filename, *close_request;
+    FILE *f;
 
     if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(),
@@ -688 +673 @@
     }
 
+    if ((close_request = mogilefs_create_open(mogilefs_sock, key, class, multi_dest TSRMLS_CC)) == NULL) {
+        RETVAL_FALSE;
+        goto end;
+    }
+
+    if (mogilefs_get_uri_path(close_request, &url TSRMLS_CC) < 0) {
+        RETVAL_FALSE;
+        goto end;
+    }
+
+    alloc_url = 1;
+
+    if (url->port == 0) {
+        url->port = ne_uri_defaultport(url->scheme);
+    }
+    if (url->scheme == NULL) {
+        url->scheme = "http";
+    }
+
+    if ((sess = ne_session_create(url->scheme, url->host, url->port)) == NULL) {
+        RETVAL_FALSE;
+        goto end;
+    }
+
+    ne_set_read_timeout(sess, (int) MOGILEFS_DAV_SESSION_TIMEOUT);
+
     if (use_file) {
-        if ((file_buffer = mogilefs_file_to_mem(filename, &file_buffer_len TSRMLS_CC)) == NULL) {
-            RETURN_FALSE;
-        }
-        alloc_file = 1;
+        f = php_stream_open_wrapper_as_file(filename, "rb", USE_PATH | ENFORCE_SAFE_MODE, NULL);
+        if (f != NULL) {
+            fd = fileno(f);
+            ret = ne_put(sess, url->path, fd);
+            close(fd);
+        } else {
+            RETVAL_FALSE;
+            goto end;
+        }
     } else {
         file_buffer = filename;
         file_buffer_len = filename_len;
-    }
-
-    if ((close_request = mogilefs_create_open(mogilefs_sock, key, class, multi_dest TSRMLS_CC)) == NULL) {
-        RETVAL_FALSE;
-        goto end;
-    }
-
-    if (mogilefs_get_uri_path(close_request, &url TSRMLS_CC) < 0) {
-        RETVAL_FALSE;
-        goto end;
-    }
-
-    alloc_url = 1;
-
-    if (url->port == 0) {
-        url->port = ne_uri_defaultport(url->scheme);
-    }
-    if (url->scheme == NULL) {
-        url->scheme = "http";
-    }
-
-    if ((sess = ne_session_create(url->scheme, url->host, url->port)) == NULL) {
-        RETVAL_FALSE;
-        goto end;
-    }
-
-    ne_set_read_timeout(sess, (int) MOGILEFS_DAV_SESSION_TIMEOUT);
-    req = ne_request_create(sess, "PUT", url->path);
-    ne_set_request_body_buffer(req, file_buffer, file_buffer_len);
-    ret = ne_request_dispatch(req);
-
-    ne_request_destroy(req);
+        req = ne_request_create(sess, "PUT", url->path);
+        ne_set_request_body_buffer(req, file_buffer, file_buffer_len);
+        ret = ne_request_dispatch(req);
+        ne_request_destroy(req);
+    }
+
     ne_session_destroy(sess);
 
@@ -746 +736 @@
     if (close_request) {
         efree(close_request);
-    }
-    if (alloc_file) {
-        efree(file_buffer);
     }
     if (alloc_url) {

trunk/php_mogilefs.h

@@ -115 +115 @@
 PHPAPI int mogilefs_sock_write(MogilefsSock *mogilefs_sock, char *cmd, int cmd_len, short free_cmd TSRMLS_DC);
 PHPAPI char * mogilefs_sock_read(MogilefsSock *mogilefs_sock, int *buf_len TSRMLS_DC);
-PHPAPI char * mogilefs_file_to_mem(char *filename, int *file_buffer_len TSRMLS_DC);
 PHPAPI char * mogilefs_create_open(MogilefsSock *mogilefs_sock, const char * const key, const char * const class, int multi_dest TSRMLS_DC);
 PHPAPI int mogilefs_create_close(MogilefsSock *mogilefs_sock, const char * const m_key, const char * const class, const char * const close_request TSRMLS_DC);