X-Git-Url: http://git.roojs.org/?p=app.webkitpdf;a=blobdiff_plain;f=webkitpdf.php;h=4c470b51e303e4f487026ab73dc2ef2ada23b8f6;hp=a62dd69299f0f55b6778562c4e54eff78192a70b;hb=6d6cb84a885a8451e33b64bed99ad3a82a13efe6;hpb=f033e4321fb13fcaff2b36a7ba6a9bbcd49742f5

diff --git a/webkitpdf.php b/webkitpdf.php
index a62dd69..4c470b5 100644
--- a/webkitpdf.php
+++ b/webkitpdf.php
@@ -54,7 +54,9 @@ class WebkitPdf
         unlink($outpr);
         $out = $outpr .'.pdf';
         
-        $cmd = "timeout 30s $xvfb --auto-servernum $webkitpdf  " .
+        // can take 2-5 minutes... 
+        
+        $cmd = "timeout 300s $xvfb --auto-servernum $webkitpdf  " .
                 " --url " . escapeshellarg($_REQUEST['url']) . ' ' .
                 " --pdf " . $out . ' ';
                 
@@ -69,22 +71,14 @@ class WebkitPdf
         header("Expires: ");
         header("Cache-Control: must-revalidate, post-check=0,pre-check=0");
         header("Pragma: public");     
-        header("Last-Modified: " . gmdate("D, d M Y H:i:s",  $ts) . " GMT");
+        header("Last-Modified: " . gmdate("D, d M Y H:i:s",  time()) . " GMT");
 
-        header('Content-length: '. filesize($out));
-        header('Content-Disposition: '.$type.'; filename="' . htmlspecialchars($filename).  '"');
+        //header('Content-length: '. filesize($out));
+        header('Content-Disposition: attachment; filename="' . htmlspecialchars(basename($out)).  '"');
         ini_set('display_errors', 0);
         
         $fh = fopen($out, 'rb');
-        //fpassthru($fh);
-        
-        // passthrough seems to have problems -- trying fread
-        while(!feof($fh))
-        {
-            echo @fread($fh, 1024*8);
-            ob_flush();
-            flush();
-        }
+        fpassthru($fh);
         
         fclose($fh);