Merge branch 'master' of https://github.com/etr/libhttpserver

Sebastiano Merlino · Sebastiano Merlino · commit 2d0093e46c83 · 2015-04-10T00:21:36.000+01:00
diff --git a/src/http_response.cpp b/src/http_response.cpp
@@ -207,7 +207,7 @@ namespace details
 
 ssize_t cb(void* cls, uint64_t pos, char* buf, size_t max)
 {
-    ssize_t val = static_cast<http_response*>(cls)->cycle_callback(buf);
+    ssize_t val = static_cast<http_response*>(cls)->cycle_callback(buf, max);
     if(val == -1)
         static_cast<http_response*>(cls)->completed = true;
     return val;
diff --git a/src/httpserver/http_response.hpp b/src/httpserver/http_response.hpp
@@ -62,7 +62,7 @@ class bad_caching_attempt: public std::exception
     }
 };
 
-typedef ssize_t(*cycle_callback_ptr)(const std::string&);
+typedef ssize_t(*cycle_callback_ptr)(char*, size_t);
 
 /**
  * Class representing an abstraction for an Http Response. It is used from classes using these apis to send information through http protocol.

Original file line number	Diff line number	Diff line change
`@@ -207,7 +207,7 @@ namespace details`
`207`	`207`
`208`	`208`	`ssize_t cb(void* cls, uint64_t pos, char* buf, size_t max)`
`209`	`209`	`{`
`210`		`- ssize_t val = static_cast<http_response*>(cls)->cycle_callback(buf);`
	`210`	`+ ssize_t val = static_cast<http_response*>(cls)->cycle_callback(buf, max);`
`211`	`211`	`if(val == -1)`
`212`	`212`	`static_cast<http_response*>(cls)->completed = true;`
`213`	`213`	`return val;`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ class bad_caching_attempt: public std::exception`
`62`	`62`	`}`
`63`	`63`	`};`
`64`	`64`
`65`		`-typedef ssize_t(*cycle_callback_ptr)(const std::string&);`
	`65`	`+typedef ssize_t(cycle_callback_ptr)(char, size_t);`
`66`	`66`
`67`	`67`	`/**`
`68`	`68`	`* Class representing an abstraction for an Http Response. It is used from classes using these apis to send information through http protocol.`