mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix missing path info on nginx.

Browse Source 
Update nginx documentation to set the PATH_INFO variable.
Avoid hacks in index.php if it PATH_INFO is already set for both nginx and apache.
This commit is contained in:
Tony Murray
2015-12-03 13:23:37 -06:00
parent 04b887ef97
commit e8d5756467
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
doc/Installation/Installation-(RHEL-CentOS).md
View File

@@ -186,6 +186,7 @@ server {
try_files $uri $uri/ @librenms; try_files $uri $uri/ @librenms;
} }
location ~ \.php { location ~ \.php {
fastcgi_param PATH_INFO $fastcgi_path_info;
include fastcgi.conf; include fastcgi.conf;
fastcgi_split_path_info ^(.+\.php)(/.+)$; fastcgi_split_path_info ^(.+\.php)(/.+)$;
fastcgi_pass unix:/var/run/php5-fpm.sock; fastcgi_pass unix:/var/run/php5-fpm.sock;

10
html/index.php
View File

@@ -12,11 +12,13 @@
* *
*/ */
if( strstr($_SERVER['SERVER_SOFTWARE'],"nginx") ) { if (empty($_SERVER['PATH_INFO'])) {
if( strstr($_SERVER['SERVER_SOFTWARE'],"nginx") ) {
$_SERVER['PATH_INFO'] = str_replace($_SERVER['PATH_TRANSLATED'].$_SERVER['PHP_SELF'],"",$_SERVER['ORIG_SCRIPT_FILENAME']); $_SERVER['PATH_INFO'] = str_replace($_SERVER['PATH_TRANSLATED'].$_SERVER['PHP_SELF'],"",$_SERVER['ORIG_SCRIPT_FILENAME']);
} }
else { else {
$_SERVER['PATH_INFO'] = !empty($_SERVER['PATH_INFO']) ? $_SERVER['PATH_INFO'] : (!empty($_SERVER['ORIG_PATH_INFO']) ? $_SERVER['ORIG_PATH_INFO'] : ''); $_SERVER['PATH_INFO'] = !empty($_SERVER['ORIG_PATH_INFO']) ? $_SERVER['ORIG_PATH_INFO'] : '';
}
} }
function logErrors($errno, $errstr, $errfile, $errline) { function logErrors($errno, $errstr, $errfile, $errline) {