Página inicial Explorar Ajuda
Entrar
PSG
/
civetweb
mirror de https://github.com/civetweb/civetweb.git
5
0
Fork 0
Arquivos Issues 0 Wiki
Ver código fonte

Merge branch 'master' of https://github.com/civetweb/civetweb into ssl_client

Mateusz Gralka 10 anos atrás
pai
418a555403 29cb09973b
commit
67381552b4
2 arquivos alterados com 125 adições e 16 exclusões
Visão unificada Mostrar estatísticas do Diff
  1. 122 16
      examples/embedded_cpp/embedded_cpp.cpp
  2. 3 0
      src/civetweb.c

+ 122 - 16
examples/embedded_cpp/embedded_cpp.cpp
Ver arquivo 

@@ -25,18 +25,24 @@ class ExampleHandler : public CivetHandler
 
 	bool
 
 	bool
 
 	handleGet(CivetServer *server, struct mg_connection *conn)
 
 	handleGet(CivetServer *server, struct mg_connection *conn)
 
 	{
 
 	{
 
-		mg_printf(conn, "HTTP/1.1 200 OK\r\nContent-Type: text/html\r\n\r\n");
 
+		mg_printf(conn,
 
+		          "HTTP/1.1 200 OK\r\nContent-Type: "
 
+		          "text/html\r\nConnection: close\r\n\r\n");
 
 		mg_printf(conn, "<html><body>\r\n");
 
 		mg_printf(conn, "<html><body>\r\n");
 
 		mg_printf(conn,
 
 		mg_printf(conn,
 
 		          "<h2>This is an example text from a C++ handler</h2>\r\n");
 
 		          "<h2>This is an example text from a C++ handler</h2>\r\n");
 
-		mg_printf(conn, "<p>To see a page from the A handler <a "
 
-		                "href=\"a\">click here</a></p>\r\n");
 
-		mg_printf(conn, "<p>To see a page from the A handler with a parameter "
 
-		                "<a href=\"a?param=1\">click here</a></p>\r\n");
 
-		mg_printf(conn, "<p>To see a page from the A/B handler <a "
 
-		                "href=\"a/b\">click here</a></p>\r\n");
 
-		mg_printf(conn, "<p>To see a page from the *.foo handler <a "
 
-		                "href=\"xy.foo\">click here</a></p>\r\n");
 
+		mg_printf(conn,
 
+		          "<p>To see a page from the A handler <a "
 
+		          "href=\"a\">click here</a></p>\r\n");
 
+		mg_printf(conn,
 
+		          "<p>To see a page from the A handler with a parameter "
 
+		          "<a href=\"a?param=1\">click here</a></p>\r\n");
 
+		mg_printf(conn,
 
+		          "<p>To see a page from the A/B handler <a "
 
+		          "href=\"a/b\">click here</a></p>\r\n");
 
+		mg_printf(conn,
 
+		          "<p>To see a page from the *.foo handler <a "
 
+		          "href=\"xy.foo\">click here</a></p>\r\n");
 
 		mg_printf(conn,
 
 		mg_printf(conn,
 
 		          "<p>To exit <a href=\"%s\">click here</a></p>\r\n",
 
 		          "<p>To exit <a href=\"%s\">click here</a></p>\r\n",
 
 		          EXIT_URI);
 
 		          EXIT_URI);
 
@@ -51,7 +57,9 @@ class ExitHandler : public CivetHandler
 
 	bool
 
 	bool
 
 	handleGet(CivetServer *server, struct mg_connection *conn)
 
 	handleGet(CivetServer *server, struct mg_connection *conn)
 
 	{
 
 	{
 
-		mg_printf(conn, "HTTP/1.1 200 OK\r\nContent-Type: text/plain\r\n\r\n");
 
+		mg_printf(conn,
 
+		          "HTTP/1.1 200 OK\r\nContent-Type: "
 
+		          "text/plain\r\nConnection: close\r\n\r\n");
 
 		mg_printf(conn, "Bye!\n");
 
 		mg_printf(conn, "Bye!\n");
 
 		exitNow = true;
 
 		exitNow = true;
 
 		return true;
 
 		return true;
 
@@ -67,7 +75,9 @@ class AHandler : public CivetHandler
 
 	          struct mg_connection *conn)
 
 	          struct mg_connection *conn)
 
 	{
 
 	{
 
 		std::string s = "";
 
 		std::string s = "";
 
-		mg_printf(conn, "HTTP/1.1 200 OK\r\nContent-Type: text/html\r\n\r\n");
 
+		mg_printf(conn,
 
+		          "HTTP/1.1 200 OK\r\nContent-Type: "
 
+		          "text/html\r\nConnection: close\r\n\r\n");
 
 		mg_printf(conn, "<html><body>");
 
 		mg_printf(conn, "<html><body>");
 
 		mg_printf(conn, "<h2>This is the A handler for \"%s\" !</h2>", method);
 
 		mg_printf(conn, "<h2>This is the A handler for \"%s\" !</h2>", method);
 
 		if (CivetServer::getParam(conn, "param", s)) {
 
 		if (CivetServer::getParam(conn, "param", s)) {
 
@@ -98,7 +108,9 @@ class ABHandler : public CivetHandler
 
 	bool
 
 	bool
 
 	handleGet(CivetServer *server, struct mg_connection *conn)
 
 	handleGet(CivetServer *server, struct mg_connection *conn)
 
 	{
 
 	{
 
-		mg_printf(conn, "HTTP/1.1 200 OK\r\nContent-Type: text/html\r\n\r\n");
 
+		mg_printf(conn,
 
+		          "HTTP/1.1 200 OK\r\nContent-Type: "
 
+		          "text/html\r\nConnection: close\r\n\r\n");
 
 		mg_printf(conn, "<html><body>");
 
 		mg_printf(conn, "<html><body>");
 
 		mg_printf(conn, "<h2>This is the AB handler!!!</h2>");
 
 		mg_printf(conn, "<h2>This is the AB handler!!!</h2>");
 
 		mg_printf(conn, "</body></html>\n");
 
 		mg_printf(conn, "</body></html>\n");
 
@@ -115,15 +127,109 @@ class FooHandler : public CivetHandler
 
 		/* Handler may access the request info using mg_get_request_info */
 
 		/* Handler may access the request info using mg_get_request_info */
 
 		const struct mg_request_info *req_info = mg_get_request_info(conn);
 
 		const struct mg_request_info *req_info = mg_get_request_info(conn);
 
 
 
-		mg_printf(conn, "HTTP/1.1 200 OK\r\nContent-Type: text/html\r\n\r\n");
 
-		mg_printf(conn, "<html><body>");
 
-		mg_printf(conn, "<h2>This is the Foo handler!!!</h2>");
 
 		mg_printf(conn,
 
 		mg_printf(conn,
 
-		          "<p>The request was:<br><pre>%s %s HTTP/%s</pre></p>",
 
+		          "HTTP/1.1 200 OK\r\nContent-Type: "
 
+		          "text/html\r\nConnection: close\r\n\r\n");
 
+
 
+		mg_printf(conn, "<html><body>\n");
 
+		mg_printf(conn, "<h2>This is the Foo GET handler!!!</h2>\n");
 
+		mg_printf(conn,
 
+		          "<p>The request was:<br><pre>%s %s HTTP/%s</pre></p>\n",
 
 		          req_info->request_method,
 
 		          req_info->request_method,
 
 		          req_info->uri,
 
 		          req_info->uri,
 
 		          req_info->http_version);
 
 		          req_info->http_version);
 
 		mg_printf(conn, "</body></html>\n");
 
 		mg_printf(conn, "</body></html>\n");
 
+
 
+		return true;
 
+	}
 
+	bool
 
+	handlePost(CivetServer *server, struct mg_connection *conn)
 
+	{
 
+		/* Handler may access the request info using mg_get_request_info */
 
+		const struct mg_request_info *req_info = mg_get_request_info(conn);
 
+		long long rlen, wlen;
 
+		long long nlen = 0;
 
+		long long tlen = req_info->content_length;
 
+		char buf[1024];
 
+
 
+		mg_printf(conn,
 
+		          "HTTP/1.1 200 OK\r\nContent-Type: "
 
+		          "text/html\r\nConnection: close\r\n\r\n");
 
+
 
+		mg_printf(conn, "<html><body>\n");
 
+		mg_printf(conn, "<h2>This is the Foo POST handler!!!</h2>\n");
 
+		mg_printf(conn,
 
+		          "<p>The request was:<br><pre>%s %s HTTP/%s</pre></p>\n",
 
+		          req_info->request_method,
 
+		          req_info->uri,
 
+		          req_info->http_version);
 
+		mg_printf(conn, "<p>Content Length: %li</p>\n", (long)tlen);
 
+		mg_printf(conn, "<pre>\n");
 
+
 
+		while (nlen < tlen) {
 
+			rlen = tlen - nlen;
 
+			if (rlen > sizeof(buf)) {
 
+				rlen = sizeof(buf);
 
+			}
 
+			rlen = mg_read(conn, buf, rlen);
 
+			if (rlen <= 0) {
 
+				break;
 
+			}
 
+			wlen = mg_write(conn, buf, rlen);
 
+			if (rlen != rlen) {
 
+				break;
 
+			}
 
+			nlen += wlen;
 
+		}
 
+
 
+		mg_printf(conn, "\n</pre>\n");
 
+		mg_printf(conn, "</body></html>\n");
 
+
 
+		return true;
 
+	}
 
+	bool
 
+	handlePut(CivetServer *server, struct mg_connection *conn)
 
+	{
 
+		/* Handler may access the request info using mg_get_request_info */
 
+		const struct mg_request_info *req_info = mg_get_request_info(conn);
 
+		long long rlen, wlen;
 
+		long long nlen = 0;
 
+		long long tlen = (size_t)req_info->content_length;
 
+		char buf[1024];
 
+
 
+		mg_printf(conn,
 
+		          "HTTP/1.1 200 OK\r\nContent-Type: "
 
+		          "text/html\r\nConnection: close\r\n\r\n");
 
+
 
+		mg_printf(conn, "<html><body>\n");
 
+		mg_printf(conn, "<h2>This is the Foo PUT handler!!!</h2>\n");
 
+		mg_printf(conn,
 
+		          "<p>The request was:<br><pre>%s %s HTTP/%s</pre></p>\n",
 
+		          req_info->request_method,
 
+		          req_info->uri,
 
+		          req_info->http_version);
 
+		mg_printf(conn, "<p>Content Length: %li</p>\n", (long)tlen);
 
+		mg_printf(conn, "<pre>\n");
 
+
 
+		while (nlen < tlen) {
 
+			rlen = tlen - nlen;
 
+			if (rlen > sizeof(buf)) {
 
+				rlen = sizeof(buf);
 
+			}
 
+			rlen = mg_read(conn, buf, rlen);
 
+			if (rlen <= 0) {
 
+				break;
 
+			}
 
+			wlen = mg_write(conn, buf, rlen);
 
+			if (rlen != rlen) {
 
+				break;
 
+			}
 
+			nlen += wlen;
 
+		}
 
+
 
+		mg_printf(conn, "\n</pre>\n");
 
+		mg_printf(conn, "</body></html>\n");
 
+
 
 		return true;
 
 		return true;
 
 	}
 
 	}
 
 };
 
 };

+ 3 - 0
src/civetweb.c
Ver arquivo 

@@ -320,6 +320,9 @@ typedef DWORD clockid_t;
 
 #define CLOCK_REALTIME (2)
 
 #define CLOCK_REALTIME (2)
 
 #endif
 
 #endif
 
 
 
+#if defined(_MSC_VER) && (_MSC_VER >= 1900)
 
+#define _TIMESPEC_DEFINED
 
+#endif
 
 #ifndef _TIMESPEC_DEFINED
 
 #ifndef _TIMESPEC_DEFINED
 
 struct timespec {
 
 struct timespec {
 
 	time_t tv_sec; /* seconds */
 
 	time_t tv_sec; /* seconds */