Explorar el Código

Support absolute uri (#197) - (Step 12/?)

bel2125 hace 9 años
padre
commit
ec0206610d
Se han modificado 2 ficheros con 7 adiciones y 2 borrados
  1. 2 2
      include/civetweb.h
  2. 5 0
      src/civetweb.c

+ 2 - 2
include/civetweb.h

@@ -55,9 +55,9 @@ struct mg_connection; /* Handle for the individual connection */
 struct mg_request_info {
 	const char *request_method; /* "GET", "POST", etc */
 	const char *request_uri;    /* URL-decoded URI (absolute or relative,
-                                     * as in the request) */
+	                                 * as in the request) */
 	const char *rel_uri;        /* URL-decoded URI (relative) */
-//	const char *uri;            /* URL-decoded URI (full) */
+	const char *uri;            /* Deprecated: use rel_uri instead */
 	const char *http_version;   /* E.g. "1.0", "1.1" */
 	const char *query_string;   /* URL part after '?', not including '?', or
 	                               NULL */

+ 5 - 0
src/civetweb.c

@@ -9887,6 +9887,8 @@ static void reset_per_request_attributes(struct mg_connection *conn)
 	conn->request_info.request_method = NULL;
 	conn->request_info.request_uri = NULL;
 	conn->request_info.rel_uri = NULL;
+	conn->request_info.uri = NULL; /* TODO: cleanup uri,
+	                                * rel_uri and request_uri */
 	conn->request_info.http_version = NULL;
 	conn->request_info.num_headers = 0;
 	conn->data_len = 0;
@@ -10683,6 +10685,9 @@ static void process_new_connection(struct mg_connection *conn)
 					send_http_error(conn, 400, "%s", ebuf);
 					break;
 				}
+
+				/* TODO: cleanup uri, rel_uri and request_uri */
+				conn->request_info.uri = conn->request_info.rel_uri;
 			}
 
 			if (ebuf[0] == '\0') {