diff options
| author | TheTroll <trolldev@gmail.com> | 2010-03-30 11:11:15 +0200 |
|---|---|---|
| committer | TheTroll <trolldev@gmail.com> | 2010-03-30 11:11:15 +0200 |
| commit | 7c81dd98c16471700f4c2e6c7950d3f9f0c84ecf (patch) | |
| tree | 2a0fff7127036ecb46e3958725c346cdaa0e6555 /bin | |
| parent | a07e467cd3cdfb2a8aad52927586394204f78d34 (diff) | |
| parent | da45e75ffa68eb0167bf1d41f743508e2be40dc3 (diff) | |
| download | istreamdev-7c81dd98c16471700f4c2e6c7950d3f9f0c84ecf.tar.gz istreamdev-7c81dd98c16471700f4c2e6c7950d3f9f0c84ecf.tar.bz2 | |
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
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/backend.php | 5 | ||||
| -rw-r--r-- | bin/svdrp.php | 2 |
2 files changed, 4 insertions, 3 deletions
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) { |