diff options
| author | Christian Weiske <cweiske@cweiske.de> | 2014-03-21 22:20:07 +0100 |
|---|---|---|
| committer | Christian Weiske <cweiske@cweiske.de> | 2014-03-21 22:20:07 +0100 |
| commit | e394bfda538b21674a2eb3a2a0cde6a841568912 (patch) | |
| tree | 8419c9e934ddf4d3482104a719d1d7051c66f624 | |
| parent | 64fce51f660808abe186edb5ebbaa9228628ee4c (diff) | |
| download | bdrem-e394bfda538b21674a2eb3a2a0cde6a841568912.tar.gz bdrem-e394bfda538b21674a2eb3a2a0cde6a841568912.zip | |
fixes for lighttpd and php 5.4v0.5.0
| -rw-r--r-- | build.xml | 1 | ||||
| -rw-r--r-- | src/bdrem/Renderer/Html.php | 3 | ||||
| -rw-r--r-- | src/phar-stub.php | 7 |
3 files changed, 11 insertions, 0 deletions
@@ -62,6 +62,7 @@ <pearPackageFileset id="dep-PEAR" package="pear.php.net/PEAR"> <include name="PEAR/Exception.php"/> <include name="PEAR.php"/> + <include name="PEAR5.php"/> </pearPackageFileset> <copy todir="${libdir}"> diff --git a/src/bdrem/Renderer/Html.php b/src/bdrem/Renderer/Html.php index 91f059d..e802faf 100644 --- a/src/bdrem/Renderer/Html.php +++ b/src/bdrem/Renderer/Html.php @@ -55,6 +55,9 @@ class Renderer_Html extends Renderer { $links = ''; if (isset($_SERVER['HTTP_HOST'])) { + if (!isset($_SERVER['REQUEST_SCHEME'])) { + $_SERVER['REQUEST_SCHEME'] = 'http'; + } $links = ' <link rel="alternate" type="text/calendar" href="' . $_SERVER['REQUEST_SCHEME'] . '://' . $_SERVER['HTTP_HOST'] diff --git a/src/phar-stub.php b/src/phar-stub.php index 64c463e..8535a6f 100644 --- a/src/phar-stub.php +++ b/src/phar-stub.php @@ -41,6 +41,13 @@ set_include_path( . PATH_SEPARATOR . 'phar://' . __FILE__ . '/lib/' ); Phar::webPhar(null, $web, null, array(), 'rewritePath'); + +//work around https://bugs.php.net/bug.php?id=52322 +if (php_sapi_name() == 'cgi-fcgi') { + require 'phar://' . __FILE__ . '/' . $web; + exit(); +} + require 'phar://' . __FILE__ . '/' . $cli; __HALT_COMPILER(); ?> |