mirror of
				https://github.com/asterisk/asterisk.git
				synced 2025-10-29 15:36:13 +00:00 
			
		
		
		
	Reverse the check for Cookie: and remove leftover code implementing
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
This commit is contained in:
		
							
								
								
									
										29
									
								
								main/http.c
									
									
									
									
									
								
							
							
						
						
									
										29
									
								
								main/http.c
									
									
									
									
									
								
							| @@ -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 (!strncasecmp(cookie, "Cookie: ", 8)) { | ||||
| 			vars = parse_cookies(cookie); | ||||
| 		} | ||||
|  | ||||
| 		if (vars) { | ||||
| 			ast_variables_destroy(vars); | ||||
| 		} | ||||
| 		vars = parse_cookies(cookie); | ||||
| 	} | ||||
|  | ||||
| 	if (!*uri) { | ||||
|   | ||||
		Reference in New Issue
	
	Block a user