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

read line buffer bug

This commit is contained in:
Adam D. Ruppe 2012-08-14 18:00:35 -04:00
parent 2e06cbdcc5
commit 7765214a7f
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
http.d
View File

@ -146,7 +146,7 @@ HttpResponse httpRequest(string method, string uri, const(ubyte)[] content = nul
}; };
read = () { read = () {
auto len = SSL_read(ssl, readBuffer.ptr, 1); auto len = SSL_read(ssl, readBuffer.ptr, readBuffer.length);
return readBuffer[0 .. len]; return readBuffer[0 .. len];
}; };
} }
@ -197,7 +197,7 @@ body {
string buffer; string buffer;
string readln() { string readln() {
auto idx = buffer.indexOf("\n"); auto idx = buffer.indexOf("\r\n");
if(idx == -1) { if(idx == -1) {
auto more = read(); auto more = read();
if(more.length == 0) { // end of file or something if(more.length == 0) { // end of file or something
@ -208,8 +208,8 @@ body {
buffer ~= more; buffer ~= more;
return readln(); return readln();
} }
auto ret = buffer[0 .. idx + 1]; auto ret = buffer[0 .. idx + 2]; // + the \r\n
buffer = buffer[idx + 1 .. $]; buffer = buffer[idx + 2 .. $];
return ret; return ret;
} }
@ -233,7 +233,7 @@ body {
auto line = readln(); auto line = readln();
while(line.length) { while(line.length) {
if(line.length <= 1) if(line.strip.length == 0)
break; break;
hr.headers ~= line; hr.headers ~= line;
if(line.startsWith("Content-Type: ")) if(line.startsWith("Content-Type: "))
@ -243,14 +243,14 @@ body {
line = readln(); line = readln();
} }
ubyte[] response; // there might be leftover stuff in the line buffer
ubyte[] response = cast(ubyte[]) buffer.dup;
auto part = read(); auto part = read();
while(part.length) { while(part.length) {
response ~= part; response ~= part;
part = read(); part = read();
} }
if(chunked) { if(chunked) {
// read the hex length, stopping at a \r\n, ignoring everything between the new line but after the first non-valid hex character // read the hex length, stopping at a \r\n, ignoring everything between the new line but after the first non-valid hex character
// read binary data of that length. it is our content // read binary data of that length. it is our content