#if CHUNK_DEBUG
if (i < len-2)
{
- printf ("\n<<<");
int j;
+ printf ("\n<<<");
for (j = i; j <= i+3; j++)
printf ("%c", buf[j]);
printf (">>>\n");
static int cs_complete_http(const char *buf, int len, int head_only)
{
/* deal with HTTP request/response */
- int i = 2, content_len = 0, chunked = 0;
+ int i, content_len = 0, chunked = 0;
- if (len < 6)
- return 0;
+ /* need at least one line followed by \n or \r .. */
+ for (i = 0; ; i++)
+ if (i == len)
+ return 0; /* incomplete */
+ else if (buf[i] == '\n' || buf[i] == '\r')
+ break;
- /* if dealing with HTTP responses - then default
- content length is unlimited (socket close) */
+ /* check to see if it's a response with content */
if (!head_only && !memcmp(buf, "HTTP/", 5))
- content_len = -1;
-
+ {
+ int j;
+ for (j = 5; j < i; j++)
+ if (buf[j] == ' ')
+ {
+ ++j;
+ if (buf[j] == '1') /* 1XX */
+ ;
+ else if (!memcmp(buf + j, "204", 3))
+ ;
+ else if (!memcmp(buf + j, "304", 3))
+ ;
+ else
+ content_len = -1;
+ break;
+ }
+ }
#if 0
printf("len = %d\n", len);
fwrite (buf, 1, len, stdout);
printf("----------\n");
#endif
- while (i <= len-2)
+ for (i = 2; i <= len-2; )
{
if (i > 8192)
{
YAZ_CHECK_EQ(cs_complete_auto(http_buf, 24), 0);
}
{
+ /* no content, no headers */
+ const char *http_buf =
+ /*123456789012345678 */
+ "HTTP/1.1 204 OK\r\n"
+ "\r\n"
+ "HTTP/1.1 200 OK\r\n";
+
+ YAZ_CHECK_EQ(cs_complete_auto(http_buf, 1), 0);
+ YAZ_CHECK_EQ(cs_complete_auto(http_buf, 2), 0);
+ YAZ_CHECK_EQ(cs_complete_auto(http_buf, 18), 0);
+ YAZ_CHECK_EQ(cs_complete_auto(http_buf, 19), 19);
+ YAZ_CHECK_EQ(cs_complete_auto(http_buf, 24), 19);
+ }
+ {
/* response, content */
const char *http_buf =
/*123456789012345678 */