From 33091b0db24ec32b62c806dce55e8b8afb6caa19 Mon Sep 17 00:00:00 2001 From: Ian Lin Date: Thu, 29 Dec 2016 12:55:57 +0800 Subject: [PATCH 1/3] Update CI_VERSION 3.1 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c9bc82f..8454862 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ php: - hhvm env: - - CI_VERSION=3.0.0 + - CI_VERSION=3.1.0 # install vanilla CI before anything before_install: From 1ef5af16dfbd40bb9d7b6b328f86ef3d9f00aae7 Mon Sep 17 00:00:00 2001 From: Ian Lin Date: Thu, 29 Dec 2016 12:57:08 +0800 Subject: [PATCH 2/3] Update CodeIgniter 3.1 --- system/core/CodeIgniter.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/system/core/CodeIgniter.php b/system/core/CodeIgniter.php index 107830e..5754f83 100644 --- a/system/core/CodeIgniter.php +++ b/system/core/CodeIgniter.php @@ -6,7 +6,7 @@ * * This content is released under the MIT License (MIT) * - * Copyright (c) 2014 - 2015, British Columbia Institute of Technology + * Copyright (c) 2014 - 2016, British Columbia Institute of Technology * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -28,10 +28,10 @@ * * @package CodeIgniter * @author EllisLab Dev Team - * @copyright Copyright (c) 2008 - 2014, EllisLab, Inc. (http://ellislab.com/) - * @copyright Copyright (c) 2014 - 2015, British Columbia Institute of Technology (http://bcit.ca/) + * @copyright Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/) + * @copyright Copyright (c) 2014 - 2016, British Columbia Institute of Technology (http://bcit.ca/) * @license http://opensource.org/licenses/MIT MIT License - * @link http://codeigniter.com + * @link https://codeigniter.com * @since Version 1.0.0 * @filesource */ @@ -46,7 +46,7 @@ * @subpackage CodeIgniter * @category Front-controller * @author EllisLab Dev Team - * @link http://codeigniter.com/user_guide/ + * @link https://codeigniter.com/user_guide/ */ /** @@ -55,7 +55,7 @@ * @var string * */ - define('CI_VERSION', '3.0.0'); + define('CI_VERSION', '3.1.0'); /* * ------------------------------------------------------ @@ -359,7 +359,7 @@ * * Returns current CI instance object * - * @return object + * @return CI_Controller */ function &get_instance() { From 4a85d67bbf8276ce1133a585a27c1ad1242b9ae8 Mon Sep 17 00:00:00 2001 From: Ian Lin Date: Thu, 29 Dec 2016 12:57:41 +0800 Subject: [PATCH 3/3] Update codeigniter 3.1 --- system/core/URI.php | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/system/core/URI.php b/system/core/URI.php index 4fff95f..ad47df4 100644 --- a/system/core/URI.php +++ b/system/core/URI.php @@ -6,7 +6,7 @@ * * This content is released under the MIT License (MIT) * - * Copyright (c) 2014 - 2015, British Columbia Institute of Technology + * Copyright (c) 2014 - 2016, British Columbia Institute of Technology * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -28,10 +28,10 @@ * * @package CodeIgniter * @author EllisLab Dev Team - * @copyright Copyright (c) 2008 - 2014, EllisLab, Inc. (http://ellislab.com/) - * @copyright Copyright (c) 2014 - 2015, British Columbia Institute of Technology (http://bcit.ca/) + * @copyright Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/) + * @copyright Copyright (c) 2014 - 2016, British Columbia Institute of Technology (http://bcit.ca/) * @license http://opensource.org/licenses/MIT MIT License - * @link http://codeigniter.com + * @link https://codeigniter.com * @since Version 1.0.0 * @filesource */ @@ -46,7 +46,7 @@ * @subpackage Libraries * @category URI * @author EllisLab Dev Team - * @link http://codeigniter.com/user_guide/libraries/uri.html + * @link https://codeigniter.com/user_guide/libraries/uri.html */ class CI_URI { @@ -205,7 +205,9 @@ protected function _parse_request_uri() return ''; } - $uri = parse_url($_SERVER['REQUEST_URI']); + // parse_url() returns false if no host is present, but the path or query string + // contains a colon followed by a number + $uri = parse_url('http://dummy'.$_SERVER['REQUEST_URI']); $query = isset($uri['query']) ? $uri['query'] : ''; $uri = isset($uri['path']) ? $uri['path'] : ''; @@ -296,7 +298,7 @@ protected function _parse_argv() * * Do some final cleaning of the URI and return it, currently only used in self::_parse_request_uri() * - * @param string $url + * @param string $uri * @return string */ protected function _remove_relative_directory($uri)