Merge branch 'master' into develop

This commit is contained in:
Mark Ellzey 2012-11-26 10:59:06 -05:00
commit 95fff6776a

View file

@ -762,6 +762,8 @@ htparser_run(htparser * p, htparse_hooks * hooks, const char * data, size_t len)
p->port_offset = &p->buf[p->buf_idx];
p->state = s_port;
break;
case ' ':
i--;
case '/':
p->path_offset = &p->buf[p->buf_idx];
@ -770,10 +772,6 @@ htparser_run(htparser * p, htparse_hooks * hooks, const char * data, size_t len)
p->state = s_after_slash_in_uri;
break;
case ' ':
/* p->buf should contain the whole uri */
p->state = s_http_09;
break;
default:
p->error = htparse_error_inval_schema;
return i + 1;