Commit ebe31c5f by Qiang Xue

Fixes issue 380: invalid route exception should be 404.

parent 0884a70b
...@@ -8,6 +8,8 @@ ...@@ -8,6 +8,8 @@
namespace yii\web; namespace yii\web;
use Yii; use Yii;
use yii\base\HttpException;
use yii\base\InvalidRouteException;
/** /**
* Application is the base class for all application classes. * Application is the base class for all application classes.
...@@ -25,6 +27,7 @@ class Application extends \yii\base\Application ...@@ -25,6 +27,7 @@ class Application extends \yii\base\Application
/** /**
* Processes the request. * Processes the request.
* @return integer the exit status of the controller action (0 means normal, non-zero values mean abnormal) * @return integer the exit status of the controller action (0 means normal, non-zero values mean abnormal)
* @throws HttpException if the request cannot be resolved.
*/ */
public function processRequest() public function processRequest()
{ {
...@@ -32,7 +35,11 @@ class Application extends \yii\base\Application ...@@ -32,7 +35,11 @@ class Application extends \yii\base\Application
Yii::setAlias('@wwwroot', dirname($request->getScriptFile())); Yii::setAlias('@wwwroot', dirname($request->getScriptFile()));
Yii::setAlias('@www', $request->getBaseUrl()); Yii::setAlias('@www', $request->getBaseUrl());
list ($route, $params) = $request->resolve(); list ($route, $params) = $request->resolve();
return $this->runAction($route, $params); try {
return $this->runAction($route, $params);
} catch (InvalidRouteException $e) {
throw new HttpException(404, $e->getMessage(), $e->getCode(), $e);
}
} }
private $_homeUrl; private $_homeUrl;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment