Reverse the check for Cookie: and remove leftover code implementing
authorLuigi Rizzo <rizzo@icir.org>
Tue, 20 May 2008 16:39:39 +0000 (16:39 +0000)
committerLuigi Rizzo <rizzo@icir.org>
Tue, 20 May 2008 16:39:39 +0000 (16:39 +0000)
the same thing.
Add an ast_debug() call to help debugging the url matching.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@117266 65c4cc65-6c06-0410-ace0-fbb531ad65f3

main/http.c

index 42d0db5..7dc46a3 100644 (file)
@@ -451,6 +451,7 @@ static struct ast_str *handle_uri(struct ast_tcptls_session_instance *ser, char
                /* scan registered uris to see if we match one. */
                AST_RWLIST_RDLOCK(&uris);
                AST_RWLIST_TRAVERSE(&uris, urih, entry) {
+                       ast_debug(2, "match request [%s] with handler [%s] len %d\n", uri, urih->uri, l);
                        if (!saw_method) {
                                switch (method) {
                                case AST_HTTP_GET:
@@ -632,33 +633,9 @@ static void *httpd_helper_thread(void *data)
                if (ast_strlen_zero(cookie)) {
                        break;
                }
-               if (strncasecmp(cookie, "Cookie: ", 8)) {
-                       char *name, *value;
-                       struct ast_variable *var;
-
-                       value = ast_strdupa(cookie);
-                       name = strsep(&value, ":");
-                       if (!value) {
-                               continue;
-                       }
-                       value = ast_skip_blanks(value);
-                       if (ast_strlen_zero(value)) {
-                               continue;
-                       }
-                       var = ast_variable_new(name, value, "");
-                       if (!var) { 
-                               continue;
-                       }
-                       var->next = headers;
-                       headers = var;
-
-                       continue;
-               }
-
-               if (vars) {
-                       ast_variables_destroy(vars);
+               if (!strncasecmp(cookie, "Cookie: ", 8)) {
+                       vars = parse_cookies(cookie);
                }
-               vars = parse_cookies(cookie);
        }
 
        if (!*uri) {