Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F15515905
D15712.id37855.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
1 KB
Referenced Files
None
Subscribers
None
D15712.id37855.diff
View Options
diff --git a/src/applications/diffusion/ssh/DiffusionSubversionServeSSHWorkflow.php b/src/applications/diffusion/ssh/DiffusionSubversionServeSSHWorkflow.php
--- a/src/applications/diffusion/ssh/DiffusionSubversionServeSSHWorkflow.php
+++ b/src/applications/diffusion/ssh/DiffusionSubversionServeSSHWorkflow.php
@@ -21,6 +21,7 @@
private $externalBaseURI;
private $peekBuffer;
private $command;
+ private $isProxying;
private function getCommand() {
return $this->command;
@@ -146,6 +147,7 @@
if ($this->shouldProxy()) {
$command = $this->getProxyCommand();
+ $this->isProxying = true;
} else {
$command = csprintf(
'svnserve -t --tunnel-user=%s',
@@ -372,6 +374,10 @@
}
private function makeInternalURI($uri_string) {
+ if ($this->isProxying) {
+ return $uri_string;
+ }
+
$uri = new PhutilURI($uri_string);
$repository = $this->getRepository();
@@ -409,6 +415,10 @@
}
private function makeExternalURI($uri) {
+ if ($this->isProxying) {
+ return $uri;
+ }
+
$internal = $this->internalBaseURI;
$external = $this->externalBaseURI;
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Sat, Apr 19, 2:23 PM (4 d, 38 m ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7707525
Default Alt Text
D15712.id37855.diff (1 KB)
Attached To
Mode
D15712: When proxying the SVN protocol, don't mutate URIs in protocol frames if we're an intracluster proxy
Attached
Detach File
Event Timeline
Log In to Comment