Merge branch 'master' into multi_app_dir

Conflicts:
	apps/bookmarks/ajax/addBookmark.php
	config/config.sample.php
	lib/app.php
	remote.php

1 files changed, 5 insertions, 2 deletions

diff --git a/remote.php b/remote.php
index e1e11c5773f..9fb73c4ce1d 100644
--- a/remote.php
+++ b/remote.php
@@ -7,13 +7,17 @@ if (array_key_exists('PATH_INFO', $_SERVER)){
 }else{
 	$path_info = substr($_SERVER['PHP_SELF'], strpos($_SERVER['PHP_SELF'], basename(__FILE__)) + strlen(basename(__FILE__)));
 }
+if ($path_info === false) {
+	OC_Response::setStatus(OC_Response::STATUS_NOT_FOUND);
+	exit;
+}
 if (!$pos = strpos($path_info, '/', 1)) {
 	$pos = strlen($path_info);
 }
 $service=substr($path_info, 1, $pos-1);
 $file = OC_AppConfig::getValue('core', 'remote_' . $service);
 if(is_null($file)){
-	header('HTTP/1.0 404 Not Found');
+	OC_Response::setStatus(OC_Response::STATUS_NOT_FOUND);
 	exit;
 }
 
@@ -23,7 +27,6 @@ if(count(explode('/',$file)) == 3) {
 	OC_App::loadApp($app);
 	$baseuri = OC::$WEBROOT . '/remote.php/'.$service.'/';
 	require_once( OC::$SERVERROOT.$file);
-
 } else {
 	$parts=explode('/', $file, 2);
 	$app=$parts[0];