forks
/
arsd
mirror of https://github.com/adamdruppe/arsd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

openssl3 support really this easy?!?!?!?

This commit is contained in:
Adam D. Ruppe 2022-08-23 14:31:04 -04:00
parent 52ff937a12
commit 06ce4090af
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
http2.d
View File

@ -2181,10 +2181,11 @@ class HttpRequest {
if(headerReadingState.atStartOfLine) { if(headerReadingState.atStartOfLine) {
headerReadingState.atStartOfLine = false; headerReadingState.atStartOfLine = false;
// FIXME it being \r should never happen... and i don't think it does
if(data[position] == '\r' || data[position] == '\n') { if(data[position] == '\r' || data[position] == '\n') {
// done with headers // done with headers
position++; // skip the newline position++; // skip the \r
if(responseData.headers.length) if(responseData.headers.length)
parseLastHeader(); parseLastHeader();
@ -2203,7 +2204,7 @@ class HttpRequest {
responseData.headers = null; responseData.headers = null;
headerReadingState.atStartOfLine = true; headerReadingState.atStartOfLine = true;
continue; continue; // the \n will be skipped by the for loop advance
} }
if(this.requestParameters.method == HttpVerb.HEAD) if(this.requestParameters.method == HttpVerb.HEAD)
@ -2211,6 +2212,9 @@ class HttpRequest {
else else
state = State.readingBody; state = State.readingBody;
// skip the \n before we break
position++;
break; break;
} else if(data[position] == ' ' || data[position] == '\t') { } else if(data[position] == ' ' || data[position] == '\t') {
// line continuation, ignore all whitespace and collapse it into a space // line continuation, ignore all whitespace and collapse it into a space
@ -2396,6 +2400,7 @@ class HttpRequest {
} }
if(bodyReadingState.contentLengthRemaining == 0) { if(bodyReadingState.contentLengthRemaining == 0) {
if(bodyReadingState.isGzipped || bodyReadingState.isDeflated) { if(bodyReadingState.isGzipped || bodyReadingState.isDeflated) {
// import std.stdio; writeln(responseData.content.length, " ", responseData.content[0 .. 2], " .. ", responseData.content[$-2 .. $]);
auto n = uncompress.uncompress(responseData.content); auto n = uncompress.uncompress(responseData.content);
n ~= uncompress.flush(); n ~= uncompress.flush();
responseData.content = cast(ubyte[]) n; responseData.content = cast(ubyte[]) n;
@ -3661,6 +3666,7 @@ version(use_openssl) {
]; ];
} else { } else {
static immutable string[] ossllibs = [ static immutable string[] ossllibs = [
"libssl.so.3",
"libssl.so.1.1", "libssl.so.1.1",
"libssl.so.1.0.2", "libssl.so.1.0.2",
"libssl.so.1.0.1", "libssl.so.1.0.1",
@ -3680,6 +3686,8 @@ version(use_openssl) {
} }
static immutable wstring[] ossllibs = [ static immutable wstring[] ossllibs = [
"libssl-3-x64.dll"w,
"libssl-3.dll"w,
"libssl-1_1.dll"w, "libssl-1_1.dll"w,
"libssl32.dll"w, "libssl32.dll"w,
]; ];
@ -3691,6 +3699,8 @@ version(use_openssl) {
} }
static immutable wstring[] eaylibs = [ static immutable wstring[] eaylibs = [
"libcrypto-3-x64.dll"w,
"libcrypto-3.dll"w,
"libcrypto-1_1.dll"w, "libcrypto-1_1.dll"w,
"libeay32.dll", "libeay32.dll",
]; ];