//
#include "plaqui/server/httpheaders.h"
+#include "plaqui/server/httperror.h"
+#include "plaqui/server/string.h"
//#include <cstdlib>
#ifdef DEBUG
# include <iostream>
#endif // DEBUG
using namespace std;
-using namespace PlaQui::Server;
+
+namespace PlaQui {
+
+namespace Server {
HTTPHeaders::~HTTPHeaders(void) {
#ifdef DEBUG
#endif // DEBUG
}
-istream& operator>>(istream& is, HTTPHeaders& h) {
+istream& operator>>(istream& is, HTTPHeaders& h) throw(HTTPError) {
#ifdef DEBUG
cerr << __FILE__ << ": operator>>()" << endl;
#endif // DEBUG
string::size_type pos = sbuf.find(":");
if (pos == string::npos) {
// FIXME poner mejores excepciones.
- throw "Wrong header";
+ throw HTTPError(400, sbuf + ": No es una cabecera válida.");
}
- h[sbuf.substr(0, pos)] = sbuf.substr(pos + 1);
+ h[sbuf.substr(0, pos)] = String(sbuf.substr(pos + 1)).trim();
+#ifdef DEBUG
+ cerr << __FILE__ << " " << sbuf.substr(0, pos) << " = "
+ << h[sbuf.substr(0, pos)] << endl;
+#endif // DEBUG
return is;
}
#endif // DEBUG
for (HTTPHeaders::const_iterator i = h.begin();
i != h.end(); ++i) {
- os << i->first << ": " << i->second << "\r\n";
+ os << i->first << ": " << i->second << "\n\r";
}
return os;
}
+} // namespace Server
+
+} // namespace PlaQui
+