Fix merge

nicolas-grekas · nicolas-grekas · commit 419a738a1c3b · 2024-11-20T17:37:22.000+01:00
diff --git a/Internal/AmpListenerV5.php b/Internal/AmpListenerV5.php
@@ -67,12 +67,12 @@ public function connectionAcquired(Request $request, Connection $connection, int
     public function requestHeaderStart(Request $request, Stream $stream): void
     {
         $host = $stream->getRemoteAddress()->toString();
+        $this->info['primary_ip'] = $host;
 
         if (str_contains($host, ':')) {
             $host = '['.$host.']';
         }
 
-        $this->info['primary_ip'] = $host;
         $this->info['primary_port'] = $stream->getRemoteAddress()->getPort();
         $this->info['pretransfer_time'] = microtime(true) - $this->info['start_time'];
         $this->info['debug'] .= \sprintf("* Connected to %s (%s) port %d\n", $request->getUri()->getHost(), $host, $this->info['primary_port']);

Original file line number	Diff line number	Diff line change
`@@ -67,12 +67,12 @@ public function connectionAcquired(Request $request, Connection $connection, int`
`67`	`67`	`public function requestHeaderStart(Request $request, Stream $stream): void`
`68`	`68`	`{`
`69`	`69`	`$host = $stream->getRemoteAddress()->toString();`
	`70`	`+ $this->info['primary_ip'] = $host;`
`70`	`71`
`71`	`72`	`if (str_contains($host, ':')) {`
`72`	`73`	`$host = '['.$host.']';`
`73`	`74`	`}`
`74`	`75`
`75`		`- $this->info['primary_ip'] = $host;`
`76`	`76`	`$this->info['primary_port'] = $stream->getRemoteAddress()->getPort();`
`77`	`77`	`$this->info['pretransfer_time'] = microtime(true) - $this->info['start_time'];`
`78`	`78`	`$this->info['debug'] .= \sprintf("* Connected to %s (%s) port %d\n", $request->getUri()->getHost(), $host, $this->info['primary_port']);`