Merge remote-tracking branch 'ispc/master' into new-layout-3.1

Marius Cramer

2014-12-19 62e25488daa4f857f717d2687e820091ffaa8a13

 server/conf/php-cgi-starter.master

@@ -4,6 +4,10 @@
export PHPRC="<tmpl_var name='php_ini_path'>"
</tmpl_if>

export TMP=<tmpl_var name='document_root'>/tmp
export TMPDIR=<tmpl_var name='document_root'>/tmp
export TEMP=<tmpl_var name='document_root'>/tmp

exec <tmpl_var name='php_cgi_bin'> \
-d open_basedir=<tmpl_var name='open_basedir'> \
-d upload_tmp_dir=<tmpl_var name='document_root'>/tmp \