Further sanity checks, output consistency fixes

commit 0ce0ef3
Author: Stan Hutcheon <[email protected]>
Date:   Wed Feb 18 13:04:46 2015 +0000

    Add fixes for file not returning

commit b4ac30f
Author: Stan Hutcheon <[email protected]>
Date:   Wed Feb 18 12:56:08 2015 +0000

    Add missing breaks in method selection

commit 43f469a
Author: Stan Hutcheon <[email protected]>
Date:   Wed Feb 18 11:52:24 2015 +0000

    Add Accept-Ranges checks

commit be449ec
Author: Alexander Mikhailov <[email protected]>
Date:   Tue Feb 17 23:14:27 2015 +0300

    fix php 5.3 incompatibility

Author: Stan Hutcheon

src/Stnvh/Partial/Data/PartialData.php

@@ -48,13 +48,15 @@ public function get() {
 		switch($this->method) {
 			case 8:
 				$_method = 'gzinflate';
+				break;
 			case 12:
 				if(!extension_loaded('bz2')){
 					@dl((strtolower(substr(PHP_OS, 0, 3)) == 'win') ? 'php_bz2.dll' : 'bz2.so');
 				}
 
 				if(extension_loaded('bz2')) {
 					$_method = 'bzdecompress';
+					break;
 				} else {
 					user_error('Unable to decompress, failed to load bz2 extension', E_USER_ERROR);
 					exit;
@@ -110,7 +112,8 @@ public function format($raw, $map = false) {
 
 			$sect = substr($raw, (isset($pos[2]) ? $pos[2] : $i), $pos[0]);
 			if($pos[1]) {
-				$sect = unpack($pos[1], $sect)[1];
+				$sect = unpack($pos[1], $sect);
+				$sect = $sect[1];
 			}
 			$this->$name = $sect;
 
@@ -131,7 +134,5 @@ public function format($raw, $map = false) {
 			$this->format($this->extra, $_map);
 			$this->compressedSize = $this->size;
 		}
-
-		ob_clean(); # clean output
 	}
 }

src/Stnvh/Partial/Zip.php

@@ -64,7 +64,6 @@ private function receiveData($ch, $data) {
 	 * @return void
 	 */
 	public function __construct($url, $file = false) {
-		set_time_limit(15);
 		ob_start();
 
 		$this->info = new Data\ZipInfo();
@@ -82,12 +81,19 @@ public function init() {
 		$request = $this->httpRequest(array(
 			CURLOPT_URL => $this->info->url,
 			CURLOPT_FOLLOWLOCATION => true,
-			CURLOPT_NOBODY => true
+			CURLOPT_NOBODY => true,
+			CURLOPT_HEADER => true,
+			CURLOPT_RETURNTRANSFER => true
 		));
 
 		if($request['http_code'] > 400) {
 			user_error(sprintf('Initial request failed, got HTTP status code: %d', $request['http_code']) , E_USER_ERROR);
-			die;
+			exit;
+		}
+
+		if(!$request['headers']['Accept-Ranges']) {
+			user_error('Server does not support HTTP range requests', E_USER_ERROR);
+			exit;
 		}
 
 		$this->info->length = intval($request['download_content_length']);
@@ -113,7 +119,7 @@ public function init() {
 			$this->info->centralDirectoryDesc = new Data\EOCD($_EOCD);
 		} else {
 			user_error('End of central directory not found', E_USER_ERROR);
-			die;
+			exit;
 		}
 
 		if($cdEnd = $this->info->centralDirectoryDesc) {
@@ -230,6 +236,7 @@ public function get(Data\CDFile $file, $output = false) {
 		));
 
 		if($output) {
+			ob_clean(); # clean output
 			header(sprintf('Content-Disposition: attachment; filename="%s"', $file->filename));
 			header(sprintf('Content-Length: %d', $file->size));
 			header('Pragma: public');
@@ -254,6 +261,17 @@ protected function httpRequest($conf) {
 		$out = curl_exec($ch);
 
 		$info = curl_getinfo($ch);
+
+		if($conf[CURLOPT_HEADER] && preg_match_all('/(.*): (.*)\r?\n/', $out, $match)) {
+			$_headers = substr($out, 0, $info['header_size']);
+			$headers = array();
+			foreach($match[1] as $i => $header) {
+				$headers[$header] = $match[2][$i];
+			}
+			$info['headers'] = $headers;
+			$out = substr($out, $info['header_size']);
+		}
+
 		$info['response'] = $out;
 
 		curl_close($ch);