Fixed conflick

Merge branch 'master' of projects.vdr-developer.org:istreamdev

* 'master' of projects.vdr-developer.org:istreamdev:
  updated README
  default to no compression if browser don't support gzip
  removed warning in php
  fix min

Conflicts:
	bin/backend.php

6 files changed, 11 insertions, 4 deletions

diff --git a/HISTORY b/HISTORY
index 176e87b..f9683eb 100755
--- a/HISTORY
+++ b/HISTORY
@@ -1,5 +1,9 @@
 iStreamdev History
 ------------------
+xx.xx.2010 - 1.0.1
+
+- Added fix for PHP version < 5.2.0
+
 
 03.29.2010 - 1.0.0
 
diff --git a/README b/README
index 713e917..6bc474b 100644
--- a/README
+++ b/README
@@ -74,6 +74,8 @@ iStreamdev generate a playlist from the requested file to the last file of the f
 
 - an http server with PHP5 (PHP 5 >= 5.2.0)  enabled like apache or lighthttpd
 
+- for some php installation you need to install php5-json & php5-zlib extension.
+
 - having "at" package.
 
 - www-data user should allowed to use "at".
diff --git a/bin/backend.php b/bin/backend.php
index 4de6601..b69fb0d 100644
--- a/bin/backend.php
+++ b/bin/backend.php
@@ -9,8 +9,9 @@ if (function_exists('dl'))
 		dl(zlib.so);
 }
 
-
-ob_start("ob_gzhandler"); 
+if(!ob_start("ob_gzhandler"))
+	ob_start(); 
+ob_start("ob_gzhandler");
 
 header('Content-Type: application/json; charset: utf-8'); 
 header('Content-Encoding: gzip');
diff --git a/bin/svdrp.php b/bin/svdrp.php
index da83b49..386ecf9 100644
--- a/bin/svdrp.php
+++ b/bin/svdrp.php
@@ -29,7 +29,7 @@ class SVDRP
 		if($this->handle) Disconnect();
 		$errno = 0;
 		$errstr = "";
-		$this->handle = fsockopen($this->cfgServer, $this->cfgPort, &$errno, &$errstr, $this->cfgTimeOut);
+		$this->handle = fsockopen($this->cfgServer, $this->cfgPort, $errno, $errstr, $this->cfgTimeOut);
 
 		if(!$this->handle)
 		{
diff --git a/min/config.php b/min/config.php
index 12dce09..1c30344 100644
--- a/min/config.php
+++ b/min/config.php
@@ -123,7 +123,7 @@ $min_serveOptions['minApp']['maxFiles'] = 10;
  * array('//static' => 'D:\\staticStorage')  // Windows
  * </code>
  */
-//$min_symlinks = array();
+$min_symlinks = array();
 
 
 /**
diff --git a/ram/RAMDIR b/ram/RAMDIR
deleted file mode 100644
index e69de29..0000000
--- a/ram/RAMDIR
+++ /dev/null