[TASK] Remove index_re.php
authorGeorg Ringer <georg.ringer@gmail.com>
Tue, 30 Oct 2012 09:35:24 +0000 (10:35 +0100)
committerHelmut Hummel <helmut.hummel@typo3.org>
Tue, 30 Oct 2012 09:38:15 +0000 (10:38 +0100)
The "apache-trailing-slash workaround" is not needed and can be
removed

Change-Id: Ic67cd24eb6ea6de2e78a871ec4b7831b8487be8b
Resolves: #42503
Releases: 6.0
Reviewed-on: http://review.typo3.org/16032
Reviewed-by: Helmut Hummel
Tested-by: Helmut Hummel
_.htaccess
typo3/index_re.php [deleted file]

index c3efd3e..8b8b81a 100644 (file)
@@ -108,11 +108,6 @@ RewriteRule ^typo3conf/ext/[^/]+/Resources/Private/ - [F]
 # RewriteRule ^/TYPO3root/(typo3/|t3lib/|fileadmin/|typo3conf/|typo3temp/|uploads/|favicon\.ico) - [L]
 RewriteRule ^(typo3/|t3lib/|fileadmin/|typo3conf/|typo3temp/|uploads/|favicon\.ico) - [L]
 
-# Redirect http://example.com/typo3 to http://example.com/typo3/index_re.php and stop the rewrite processing.
-# For httpd.conf, use this line instead of the next one:
-# RewriteRule ^/TYPO3root/typo3$ /TYPO3root/typo3/index.php [L]
-RewriteRule ^typo3$ typo3/index_re.php [L]
-
 # If the file/symlink/directory does not exist => Redirect to index.php.
 # For httpd.conf, you need to prefix each '%{REQUEST_FILENAME}' with '%{DOCUMENT_ROOT}'.
 RewriteCond %{REQUEST_FILENAME} !-f
diff --git a/typo3/index_re.php b/typo3/index_re.php
deleted file mode 100644 (file)
index e817cd2..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-/***************************************************************
- *  Copyright notice
- *
- *  (c) 1999-2011 Kasper Skårhøj (kasperYYYY@typo3.com)
- *  All rights reserved
- *
- *  This script is part of the TYPO3 project. The TYPO3 project is
- *  free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  The GNU General Public License can be found at
- *  http://www.gnu.org/copyleft/gpl.html.
- *  A copy is found in the textfile GPL.txt and important notices to the license
- *  from the author is found in LICENSE.txt distributed with these scripts.
- *
- *
- *  This script is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  This copyright notice MUST APPEAR in all copies of the script!
- ***************************************************************/
-/**
- * Apache-trailing-slash workaround
- *
- * Meant to solve the trailing slash problem with Apache:
- *
- * Make a mod_rewrite rule like this:
- * RewriteRule   ^typo3$  typo3/index_re.php
- * ... and this document will redirect to the right script.
- *
- * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage core
- */
-define('TYPO3_PROCEED_IF_NO_USER', 1);
-require 'init.php';
-\TYPO3\CMS\Core\Utility\HttpUtility::redirect(\TYPO3\CMS\Core\Utility\GeneralUtility::getIndpEnv('TYPO3_REQUEST_DIR') . 'index.php');
-?>
\ No newline at end of file