mirror of
https://github.com/php/php-sdk-binary-tools.git
synced 2026-03-23 23:22:08 +01:00
Fix HTTP request corruption by the user agent (GH-32)
The file `VERSION` used to send the version contains a new line. When it's used to generate the UserAgent for curl, the new line char stops the headers sent for the request. All other headers sent after the user agent are ignored and used like the body requests. To solve this issue, clean up the `VERSION` file content on load.
This commit is contained in:
committed by
GitHub
parent
53d62894b7
commit
b3d87e1487
@@ -218,7 +218,7 @@ class Config
|
||||
}
|
||||
|
||||
/* Try to figure out the branch. The worky scenarios are
|
||||
- CWD is in php-src
|
||||
- CWD is in php-src
|
||||
- phpize is on the path
|
||||
FIXME for the dev package, there should be a php-config utility
|
||||
*/
|
||||
@@ -256,7 +256,7 @@ class Config
|
||||
$cmd = "\"$git\" branch";
|
||||
|
||||
$ret = trim(shell_exec($cmd));
|
||||
if (preg_match_all(",\*\s+master,", $ret) > 0) {
|
||||
if (preg_match_all(",\*\s+master,", $ret) > 0) {
|
||||
$branch = "master";
|
||||
}
|
||||
}
|
||||
@@ -271,7 +271,7 @@ class Config
|
||||
$branch = self::guessCurrentBranchName();
|
||||
self::setCurrentBranchName($branch);
|
||||
}
|
||||
|
||||
|
||||
return self::$currentBranchName;
|
||||
}/*}}}*/
|
||||
|
||||
@@ -336,7 +336,7 @@ class Config
|
||||
throw new Exception("Failed to find config with arch '" . self::getCurrentArchName() . "'");
|
||||
}
|
||||
|
||||
return $ret;
|
||||
return $ret;
|
||||
}/*}}}*/
|
||||
|
||||
public static function getSdkNugetFeedUrl() : string
|
||||
@@ -368,7 +368,7 @@ class Config
|
||||
throw new Exception("Couldn't find the SDK version file.");
|
||||
}
|
||||
|
||||
return file_get_contents($path);
|
||||
return trim(file_get_contents($path));
|
||||
}/*}}}*/
|
||||
|
||||
public static function getDepsLocalPath() : ?string
|
||||
@@ -391,7 +391,7 @@ class Config
|
||||
self::setDepsLocalPath($tmp);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if (NULL == self::$depsLocalPath) {
|
||||
$tmp = realpath("../deps");
|
||||
if (is_dir($tmp)) {
|
||||
|
||||
Reference in New Issue
Block a user