archive/phabricator
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Fix conduit host check

Browse Source 
Summary:
conduit was using getProductionURI instead of getURI for checking that the
request was sent to the correct host, which causes problems in some dev
environments

Test Plan:
  echo '{}' | arc call-conduit --conduit-uri=mydevserver

where my dev server is configured with phabricator.production-uri pointing to
prod instead of my devserver

Reviewers: epriestley, btrahan, jungejason

Reviewed By: epriestley

CC: aran, epriestley

Differential Revision: https://secure.phabricator.com/D1543
This commit is contained in:
Nick Harper
2012-02-01 22:11:49 -08:00
parent 82c6f275bd
commit c3543c80cd
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/applications/conduit/method/base/ConduitAPIMethod.php
View File

@@ -1,7 +1,7 @@
<?php <?php
/* /*
* Copyright 2011 Facebook, Inc. * Copyright 2012 Facebook, Inc.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -85,7 +85,7 @@ abstract class ConduitAPIMethod {
$host->setPath('/'); $host->setPath('/');
$host = (string)$host; $host = (string)$host;
$self = PhabricatorEnv::getProductionURI('/'); $self = PhabricatorEnv::getURI('/');
if ($self !== $host) { if ($self !== $host) {
throw new Exception( throw new Exception(
"Your client is connecting to this install as '{$host}', but it is ". "Your client is connecting to this install as '{$host}', but it is ".