projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
No more manifest files
[yaz-moved-to-github.git]
/
src
/
http.c
diff --git
a/src/http.c
b/src/http.c
index
0f17df5
..
0fdd465
100644
(file)
--- a/
src/http.c
+++ b/
src/http.c
@@
-511,6
+511,12
@@
int yaz_decode_http_request(ODR o, Z_HTTP_Request **hr_p)
int lspace = 0;
*hr_p = hr;
int lspace = 0;
*hr_p = hr;
+ hr->method = 0;
+ hr->version = 0;
+ hr->path = 0;
+ hr->headers = 0;
+ hr->content_buf = 0;
+ hr->content_len = 0;
/* method .. */
for (i = 0; buf[i] != ' '; i++)
if (i >= size-5 || i > 30)
/* method .. */
for (i = 0; buf[i] != ' '; i++)
if (i >= size-5 || i > 30)
@@
-610,11
+616,15
@@
int yaz_encode_http_response(ODR o, Z_HTTP_Response *hr)
int yaz_encode_http_request(ODR o, Z_HTTP_Request *hr)
{
Z_HTTP_Header *h;
int yaz_encode_http_request(ODR o, Z_HTTP_Request *hr)
{
Z_HTTP_Header *h;
+ char *cp;
int top0 = o->op->top;
int top0 = o->op->top;
+ if (!hr->method || !hr->path)
+ return 0;
odr_write(o, hr->method, strlen(hr->method));
odr_write(o, " ", 1);
odr_write(o, hr->method, strlen(hr->method));
odr_write(o, " ", 1);
- odr_write(o, hr->path, strlen(hr->path));
+ cp = strchr(hr->path, '#');
+ odr_write(o, hr->path, cp ? (cp - hr->path) : strlen(hr->path));
odr_write(o, " HTTP/", 6);
odr_write(o, hr->version, strlen(hr->version));
odr_write(o, "\r\n", 2);
odr_write(o, " HTTP/", 6);
odr_write(o, hr->version, strlen(hr->version));
odr_write(o, "\r\n", 2);