Skip to content

Commit 8ce8eaa

Browse files
committed
byeWin
1 parent 631e5b0 commit 8ce8eaa

1 file changed

Lines changed: 3 additions & 6 deletions

File tree

src/http/await.php

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ public function request()
2121
private function requestEngine()
2222
{
2323
$hostname = dirname($_SERVER['SCRIPT_NAME']);
24-
<<<<<<< HEAD
2524
if (basename($hostname)) {
2625
avail::$hostSlA=$hostname.avail::SlA;
2726
avail::$hostname = $_SERVER['HTTP_HOST'].$hostname;
@@ -31,18 +30,16 @@ private function requestEngine()
3130
avail::$hostname = $_SERVER['HTTP_HOST'];
3231
$this->uriPath = $_SERVER['REQUEST_URI'];
3332
}
34-
=======
35-
avail::$hostname = $_SERVER['HTTP_HOST'].$hostname;
36-
$this->uriPath = str_replace($hostname,'',$_SERVER['REQUEST_URI']);
37-
avail::$config['ARO'] ='';
33+
// avail::$hostname = $_SERVER['HTTP_HOST'].$hostname;
34+
// $this->uriPath = str_replace($hostname,'',$_SERVER['REQUEST_URI']);
35+
// avail::$config['ARO'] ='';
3836
// avail::$hostname = defined('app_hostname')?constant('app_hostname'):$_SERVER['HTTP_HOST'];
3937
// avail::$uriPath = trim(parse_url(defined('app_uriPath')?constant('app_uriPath'):$_SERVER['REQUEST_URI'], PHP_URL_PATH), avail::SlA);
4038
}
4139
private function requestAfter()
4240
{
4341
avail::$hostname = $_SERVER['HTTP_HOST'];
4442
$this->uriPath = $_SERVER['REQUEST_URI'];
45-
>>>>>>> 502e29dc0624238d2574bb830a53e137724ef1ed
4643
}
4744
public function initiate()
4845
{

0 commit comments

Comments
 (0)