diff options
author | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-08-29 20:55:40 +0000 |
---|---|---|
committer | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-08-29 20:55:40 +0000 |
commit | 88e10708c5ba8158ee4fdf1aa08585739125b5da (patch) | |
tree | d08154c0eafb287f12d6b28ce99eea6938c21ce8 /main/http.c | |
parent | 2149521341f36fb9f90d61796969f2665daca309 (diff) |
This code was in team/murf/bug8684-trunk; it should fix bug 8684 in trunk. I didn't add it to 1.4 yet, because it's not entirely clear to me if this is a bug fix or an enhancement. A lot of files were affected by small changes like ast_variable_new getting an added arg, for the file name the var was defined in; ast_category_new gets added args of filename and lineno; ast_category and ast_variable structures now record file and lineno for each entry; a list of all #include and #execs in a config file (or any of its inclusions are now kept in the ast_config struct; at save time, each entry is put back into its proper file of origin, in order. #include and #exec directives are folded in properly. Headers indicating that the file was generated, are generated also for each included file. Some changes to main/manager.c to take care of file renaming, via the UpdateConfig command. Multiple inclusions of the same file are handled by exploding these into multiple include files, uniquely named. There's probably more, but I can't remember it right now.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@81361 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/http.c')
-rw-r--r-- | main/http.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/main/http.c b/main/http.c index b4aac2636..1a5da9c43 100644 --- a/main/http.c +++ b/main/http.c @@ -567,7 +567,7 @@ static struct ast_str *handle_uri(struct server_instance *ser, char *uri, int *s else val = ""; ast_uri_decode(var); - if ((v = ast_variable_new(var, val))) { + if ((v = ast_variable_new(var, val, ""))) { if (vars) prev->next = v; else @@ -778,7 +778,7 @@ static void *httpd_helper_thread(void *data) value = ast_skip_blanks(value); if (ast_strlen_zero(value)) continue; - var = ast_variable_new(name, value); + var = ast_variable_new(name, value, ""); if (!var) continue; var->next = headers; @@ -818,7 +818,7 @@ static void *httpd_helper_thread(void *data) vval++; if ( (l = strlen(vval)) ) vval[l - 1] = '\0'; /* trim trailing quote */ - var = ast_variable_new(vname, vval); + var = ast_variable_new(vname, vval, ""); if (var) { if (prev) prev->next = var; |