X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fcomstack.c;h=71ab081b9fe688b9f9f17314e8d2f74045fc074a;hb=60a702f390f7e2addfdab79f2328db3ba2897c8b;hp=ba1cad329fcf69bdb466c5603923642bb0b279ba;hpb=e12cd77c1050b5722c19f9e6d312c99e14565efe;p=yaz-moved-to-github.git diff --git a/src/comstack.c b/src/comstack.c index ba1cad3..71ab081 100644 --- a/src/comstack.c +++ b/src/comstack.c @@ -1,8 +1,13 @@ /* - * Copyright (c) 1995-2004, Index Data + * Copyright (C) 1995-2005, Index Data ApS * See the file LICENSE for details. * - * $Id: comstack.c,v 1.10 2004-05-03 09:00:50 adam Exp $ + * $Id: comstack.c,v 1.14 2005-01-15 19:47:11 adam Exp $ + */ + +/** + * \file comstack.c + * \brief Implements Generic COMSTACK functions */ #include @@ -148,11 +153,18 @@ int cs_complete_auto(const unsigned char *buf, int len) { /* deal with HTTP request/response */ int i = 2, content_len = 0, chunked = 0; + + /* if dealing with HTTP responses - then default + content length is unlimited (socket close) */ + if (!memcmp(buf, "HTTP/", 5)) + content_len = -1; while (i <= len-4) { if (i > 8192) + { return i; /* do not allow more than 8K HTTP header */ + } if (buf[i] == '\r' && buf[i+1] == '\n') { i += 2; @@ -236,8 +248,12 @@ int cs_complete_auto(const unsigned char *buf, int len) { /* not chunked ; inside body */ /* i += 2 seems not to work with GCC -O2 .. so i+2 is used instead .. */ - if (len >= (i+2)+ content_len) + if (content_len == -1) + return 0; /* no content length */ + else if (len >= (i+2)+ content_len) + { return (i+2)+ content_len; + } } break; }