Changeset 3239

Timestamp:

Apr 15, 2009, 12:49:04 AM (15 years ago)

Author:

plg

Message:

bug 949 fixed: to avoid memory limit on server side, base64 encode chunks one
by one on client side and base64 decode chunks one by one on server side.

Location:

branches/2.0

Files:

• include/ws_functions.inc.php (modified) (2 diffs)
• tools/piwigo_remote.pl (modified) (2 diffs)

branches/2.0/include/ws_functions.inc.php

@@ -924 +924 @@
     );
 
+  ws_logfile('[ws_images_add_chunk] data length : '.strlen($params['data']));
+
   $bytes_written = file_put_contents(
     $upload_dir.'/'.$filename,
-    $params['data']
+    base64_decode($params['data'])
     );
 
@@ -959 +961 @@
 
   sort($chunks);
+
+  ws_logfile('[merge_chunks] memory_get_usage before loading chunks: '.memory_get_usage());
   
-  $string = null;
-  foreach ($chunks as $chunk) {
-    $string.= file_get_contents($chunk);
+  foreach ($chunks as $chunk)
+  {
+    $string = file_get_contents($chunk);
+    
+    ws_logfile('[merge_chunks] memory_get_usage on chunk '.++$i.': '.memory_get_usage());
+    
+    if (!file_put_contents($output_filepath, $string, FILE_APPEND))
+    {
+      return new PwgError(500, 'error while writting chunks for '.$output_filepath);
+    }
+    
     unlink($chunk);
   }
-  if (!file_put_contents($output_filepath, base64_decode($string)))
-  {
-    return new PwgError(500, 'error while merging chunks for '.$output_filepath);
-  }
-  
+
+  ws_logfile('[merge_chunks] memory_get_usage after loading chunks: '.memory_get_usage());
 }
 

branches/2.0/tools/piwigo_remote.pl

@@ -256 +256 @@
     my %params = @_;
 
-    my $content = encode_base64(read_file($params{filepath}));
+    my $content = read_file($params{filepath});
     my $content_length = length($content);
     my $nb_chunks = ceil($content_length / $conf{chunk_size});
@@ -274 +274 @@
             {
                 method => 'pwg.images.addChunk',
-                data => $chunk,
+                data => encode_base64($chunk),
                 original_sum => $params{original_sum},
                 position => $chunk_id,