Page MenuHomePhabricator
Files F15331759

D21607.diff
No OneTemporary
Actions

D21607.diff
View Options

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -4689,9 +4689,11 @@
'PhabricatorRequestExceptionHandler' => 'aphront/handler/PhabricatorRequestExceptionHandler.php',
'PhabricatorResetPasswordUserLogType' => 'applications/people/userlog/PhabricatorResetPasswordUserLogType.php',
'PhabricatorResourceSite' => 'aphront/site/PhabricatorResourceSite.php',
- 'PhabricatorRobotsController' => 'applications/system/controller/PhabricatorRobotsController.php',
- 'PhabricatorRobotsPlatformController' => 'applications/system/controller/PhabricatorRobotsPlatformController.php',
- 'PhabricatorRobotsResourceController' => 'applications/system/controller/PhabricatorRobotsResourceController.php',
+ 'PhabricatorRobotsBlogController' => 'applications/system/controller/robots/PhabricatorRobotsBlogController.php',
+ 'PhabricatorRobotsController' => 'applications/system/controller/robots/PhabricatorRobotsController.php',
+ 'PhabricatorRobotsPlatformController' => 'applications/system/controller/robots/PhabricatorRobotsPlatformController.php',
+ 'PhabricatorRobotsResourceController' => 'applications/system/controller/robots/PhabricatorRobotsResourceController.php',
+ 'PhabricatorRobotsShortController' => 'applications/system/controller/robots/PhabricatorRobotsShortController.php',
'PhabricatorS3FileStorageEngine' => 'applications/files/engine/PhabricatorS3FileStorageEngine.php',
'PhabricatorSMSAuthFactor' => 'applications/auth/factor/PhabricatorSMSAuthFactor.php',
'PhabricatorSQLPatchList' => 'infrastructure/storage/patch/PhabricatorSQLPatchList.php',
@@ -11474,9 +11476,11 @@
'PhabricatorRequestExceptionHandler' => 'AphrontRequestExceptionHandler',
'PhabricatorResetPasswordUserLogType' => 'PhabricatorUserLogType',
'PhabricatorResourceSite' => 'PhabricatorSite',
+ 'PhabricatorRobotsBlogController' => 'PhabricatorRobotsController',
'PhabricatorRobotsController' => 'PhabricatorController',
'PhabricatorRobotsPlatformController' => 'PhabricatorRobotsController',
'PhabricatorRobotsResourceController' => 'PhabricatorRobotsController',
+ 'PhabricatorRobotsShortController' => 'PhabricatorRobotsController',
'PhabricatorS3FileStorageEngine' => 'PhabricatorFileStorageEngine',
'PhabricatorSMSAuthFactor' => 'PhabricatorAuthFactor',
'PhabricatorSQLPatchList' => 'Phobject',
diff --git a/src/applications/phame/application/PhabricatorPhameApplication.php b/src/applications/phame/application/PhabricatorPhameApplication.php
--- a/src/applications/phame/application/PhabricatorPhameApplication.php
+++ b/src/applications/phame/application/PhabricatorPhameApplication.php
@@ -70,7 +70,11 @@
}
public function getBlogRoutes() {
- return $this->getLiveRoutes();
+ return $this->getLiveRoutes() + array(
+ '/status/' => 'PhabricatorStatusController',
+ '/favicon.ico' => 'PhabricatorFaviconController',
+ '/robots.txt' => 'PhabricatorRobotsBlogController',
+ );
}
private function getLiveRoutes() {
diff --git a/src/applications/phurl/application/PhabricatorPhurlApplication.php b/src/applications/phurl/application/PhabricatorPhurlApplication.php
--- a/src/applications/phurl/application/PhabricatorPhurlApplication.php
+++ b/src/applications/phurl/application/PhabricatorPhurlApplication.php
@@ -55,6 +55,10 @@
public function getShortRoutes() {
return array(
+ '/status/' => 'PhabricatorStatusController',
+ '/favicon.ico' => 'PhabricatorFaviconController',
+ '/robots.txt' => 'PhabricatorRobotsShortController',
+
'/u/(?P<append>[^/]+)' => 'PhabricatorPhurlShortURLController',
'.*' => 'PhabricatorPhurlShortURLDefaultController',
);
diff --git a/src/applications/system/controller/PhabricatorRobotsResourceController.php b/src/applications/system/controller/robots/PhabricatorRobotsBlogController.php
rename from src/applications/system/controller/PhabricatorRobotsResourceController.php
rename to src/applications/system/controller/robots/PhabricatorRobotsBlogController.php
--- a/src/applications/system/controller/PhabricatorRobotsResourceController.php
+++ b/src/applications/system/controller/robots/PhabricatorRobotsBlogController.php
@@ -1,15 +1,15 @@
<?php
-final class PhabricatorRobotsResourceController
+final class PhabricatorRobotsBlogController
extends PhabricatorRobotsController {
protected function newRobotsRules() {
$out = array();
- // See T13636. Prevent indexing of any content on resource domains.
+ // Allow everything on blog domains to be indexed.
$out[] = 'User-Agent: *';
- $out[] = 'Disallow: /';
+ $out[] = 'Crawl-delay: 1';
return $out;
}
diff --git a/src/applications/system/controller/PhabricatorRobotsController.php b/src/applications/system/controller/robots/PhabricatorRobotsController.php
rename from src/applications/system/controller/PhabricatorRobotsController.php
rename to src/applications/system/controller/robots/PhabricatorRobotsController.php
--- a/src/applications/system/controller/PhabricatorRobotsController.php
+++ b/src/applications/system/controller/robots/PhabricatorRobotsController.php
@@ -9,13 +9,6 @@
final public function processRequest() {
$out = $this->newRobotsRules();
- // Add a small crawl delay (number of seconds between requests) for spiders
- // which respect it. The intent here is to prevent spiders from affecting
- // performance for users. The possible cost is slower indexing, but that
- // seems like a reasonable tradeoff, since most Phabricator installs are
- // probably not hugely concerned about cutting-edge SEO.
- $out[] = 'Crawl-delay: 1';
-
$content = implode("\n", $out)."\n";
return id(new AphrontPlainTextResponse())
diff --git a/src/applications/system/controller/PhabricatorRobotsPlatformController.php b/src/applications/system/controller/robots/PhabricatorRobotsPlatformController.php
rename from src/applications/system/controller/PhabricatorRobotsPlatformController.php
rename to src/applications/system/controller/robots/PhabricatorRobotsPlatformController.php
--- a/src/applications/system/controller/PhabricatorRobotsPlatformController.php
+++ b/src/applications/system/controller/robots/PhabricatorRobotsPlatformController.php
@@ -19,6 +19,13 @@
$out[] = 'Disallow: /diffusion/';
$out[] = 'Disallow: /source/';
+ // Add a small crawl delay (number of seconds between requests) for spiders
+ // which respect it. The intent here is to prevent spiders from affecting
+ // performance for users. The possible cost is slower indexing, but that
+ // seems like a reasonable tradeoff, since most Phabricator installs are
+ // probably not hugely concerned about cutting-edge SEO.
+ $out[] = 'Crawl-delay: 1';
+
return $out;
}
diff --git a/src/applications/system/controller/PhabricatorRobotsResourceController.php b/src/applications/system/controller/robots/PhabricatorRobotsResourceController.php
copy from src/applications/system/controller/PhabricatorRobotsResourceController.php
copy to src/applications/system/controller/robots/PhabricatorRobotsResourceController.php
--- a/src/applications/system/controller/PhabricatorRobotsResourceController.php
+++ b/src/applications/system/controller/robots/PhabricatorRobotsResourceController.php
@@ -10,6 +10,7 @@
$out[] = 'User-Agent: *';
$out[] = 'Disallow: /';
+ $out[] = 'Crawl-delay: 1';
return $out;
}
diff --git a/src/applications/system/controller/PhabricatorRobotsResourceController.php b/src/applications/system/controller/robots/PhabricatorRobotsShortController.php
rename from src/applications/system/controller/PhabricatorRobotsResourceController.php
rename to src/applications/system/controller/robots/PhabricatorRobotsShortController.php
--- a/src/applications/system/controller/PhabricatorRobotsResourceController.php
+++ b/src/applications/system/controller/robots/PhabricatorRobotsShortController.php
@@ -1,15 +1,16 @@
<?php
-final class PhabricatorRobotsResourceController
+final class PhabricatorRobotsShortController
extends PhabricatorRobotsController {
protected function newRobotsRules() {
$out = array();
- // See T13636. Prevent indexing of any content on resource domains.
+ // See T13636. Prevent indexing of any content on short domains.
$out[] = 'User-Agent: *';
$out[] = 'Disallow: /';
+ $out[] = 'Crawl-delay: 1';
return $out;
}

File Metadata

Mime Type
text/plain
Expires
Sat, Mar 8, 1:26 PM (2 w, 6 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7382520
Default Alt Text
D21607.diff (8 KB)

Event Timeline

Phabricator · Built by Phacility