diff --git a/microstack/ILibWebClient.c b/microstack/ILibWebClient.c index 94da687..f0f9b6d 100644 --- a/microstack/ILibWebClient.c +++ b/microstack/ILibWebClient.c @@ -1871,10 +1871,6 @@ ILibWebClient_DataResults ILibWebClient_OnData(ILibAsyncSocket_SocketModule sock ILibDestructPacket(wcdo->header); wcdo->header = tph; } - //else - //{ - // printf("WCDO/HEADER was NULL\n"); - //} } } } @@ -2216,6 +2212,7 @@ void ILibWebClient_OnDisconnectSink(ILibAsyncSocket_SocketModule socketModule, v wcdo->FinHeader = 0; h = wcdo->header; wcdo->header = NULL; + if (wr != NULL && wr->OnResponse != NULL) { wr->OnResponse( diff --git a/test/self-test.js b/test/self-test.js index 834c65f..9e0e097 100644 --- a/test/self-test.js +++ b/test/self-test.js @@ -235,65 +235,46 @@ server.on('request', function (imsg, rsp) username = imsg.Digest_GetUsername(); qop = imsg.Digest_GetQOP(); - switch (imsg.url) + imsg.on('end', function () { - case '/': - if (imsg.Digest_ValidatePassword(digest_password)) - { - rsp.statusCode = 200; - rsp.setHeader('Content-Type', 'text/html'); - rsp.end('Success!'); - } - else - { - rsp.Digest_writeUnauthorized(digest_realm); - } - break; - case '/auth': - if (qop != 'auth') { promises.digest_auth.reject('Received Incorrect QOP: ' + qop); } - if (imsg.Digest_ValidatePassword(digest_password)) - { - rsp.statusCode = 200; - rsp.setHeader('Content-Type', 'text/html'); - rsp.end('Success!'); - } - else - { - rsp.Digest_writeUnauthorized(digest_realm, { qop: 'auth' }); - } - break; - case '/auth-int': - if (qop != 'auth-int') { promises.digest_authint.reject('Received Incorrect QOP: ' + qop); } - imsg.on('end', function () - { - if (imsg.Digest_ValidatePassword(digest_password)) - { - rsp.statusCode = 200; - rsp.setHeader('Content-Type', 'text/html'); - rsp.end('Success!'); - } - else - { - rsp.Digest_writeUnauthorized(digest_realm); - } - }); - break; - } + switch (imsg.url) + { + case '/auth': + if (qop != 'auth') { promises.digest_auth.reject('Received Incorrect QOP: ' + qop); } + break; + case '/auth-int': + if (qop != 'auth-int') { promises.digest_authint.reject('Received Incorrect QOP: ' + qop); } + break; + } + if (imsg.Digest_ValidatePassword(digest_password)) + { + rsp.statusCode = 200; + rsp.setHeader('Content-Type', 'text/html'); + rsp.end('Success!'); + } + else + { + rsp.Digest_writeUnauthorized(digest_realm); + } + }); } else { - switch (imsg.url) + imsg.on('end', function () { - case '/': - rsp.Digest_writeUnauthorized(digest_realm); - break; - case '/auth': - rsp.Digest_writeUnauthorized(digest_realm, { qop: 'auth' }); - break; - case '/auth-int': - rsp.Digest_writeUnauthorized(digest_realm, { qop: 'auth-int, auth' }); - break; - } + switch (imsg.url) + { + case '/': + rsp.Digest_writeUnauthorized(digest_realm); + break; + case '/auth': + rsp.Digest_writeUnauthorized(digest_realm, { qop: 'auth' }); + break; + case '/auth-int': + rsp.Digest_writeUnauthorized(digest_realm, { qop: 'auth-int, auth' }); + break; + } + }); } } });