summaryrefslogtreecommitdiff
path: root/gweb
diff options
context:
space:
mode:
authorSeonah Moon <seonah1.moon@samsung.com>2018-01-23 14:50:50 +0900
committerSeonah Moon <seonah1.moon@samsung.com>2018-01-23 14:50:55 +0900
commit30602f521a85820a9f6b7ac04876400e00c68b15 (patch)
treef035a4fcc014a034f3b492886d1e8395f327fd25 /gweb
parenta079cfe6f815f8c69055de834d1ccbdf1fd94ba7 (diff)
parent9362752a471a5c892d679548fbf2828d5fc5684b (diff)
downloadconnman-30602f521a85820a9f6b7ac04876400e00c68b15.tar.gz
connman-30602f521a85820a9f6b7ac04876400e00c68b15.tar.bz2
connman-30602f521a85820a9f6b7ac04876400e00c68b15.zip
Updated connman to version 1.35
Change-Id: I13526fbf80296a79be15548fc226a308941ac9ec Signed-off-by: Taesub Kim <taesub.kim@samsung.com>
Diffstat (limited to 'gweb')
-rwxr-xr-xgweb/gresolv.c14
-rwxr-xr-xgweb/gweb.c16
2 files changed, 13 insertions, 17 deletions
diff --git a/gweb/gresolv.c b/gweb/gresolv.c
index 93f156ea..cf16a48c 100755
--- a/gweb/gresolv.c
+++ b/gweb/gresolv.c
@@ -181,17 +181,15 @@ static void find_srcaddr(struct sort_result *res)
if (fd < 0)
return;
- if (connect(fd, &res->dst.sa, sizeof(res->dst)) < 0) {
- close(fd);
- return;
- }
+ if (connect(fd, &res->dst.sa, sizeof(res->dst)) < 0)
+ goto out;
- if (getsockname(fd, &res->src.sa, &sl) < 0) {
- close(fd);
- return;
- }
+ if (getsockname(fd, &res->src.sa, &sl) < 0)
+ goto out;
res->reachable = true;
+
+out:
close(fd);
}
diff --git a/gweb/gweb.c b/gweb/gweb.c
index 307164e9..7037cd94 100755
--- a/gweb/gweb.c
+++ b/gweb/gweb.c
@@ -792,6 +792,9 @@ static void handle_multi_line(struct web_session *session)
char *str;
gchar *value;
+ if (!session->result.last_key)
+ return;
+
str = session->current_header->str;
if (str[0] != ' ' && str[0] != '\t')
@@ -1079,7 +1082,6 @@ static int connect_session_transport(struct web_session *session)
session->addr->ai_addrlen) < 0) {
if (errno != EINPROGRESS) {
debug(session->web, "connect() %s", strerror(errno));
- close(sk);
return -EIO;
}
}
@@ -1360,8 +1362,7 @@ static guint do_request(GWeb *web, const char *url,
g_free(session->address);
session->address = g_strdup(host);
}
- session->address_action = g_timeout_add(0, already_resolved,
- session);
+ session->address_action = g_idle_add(already_resolved, session);
} else {
session->resolv_action = g_resolv_lookup_hostname(web->resolv,
host, resolv_result, session);
@@ -1480,6 +1481,9 @@ GWebParser *g_web_parser_new(const char *begin, const char *end,
{
GWebParser *parser;
+ if (!begin || !end)
+ return NULL;
+
parser = g_try_new0(GWebParser, 1);
if (!parser)
return NULL;
@@ -1488,12 +1492,6 @@ GWebParser *g_web_parser_new(const char *begin, const char *end,
parser->begin_token = g_strdup(begin);
parser->end_token = g_strdup(end);
-
- if (!parser->begin_token) {
- g_free(parser);
- return NULL;
- }
-
parser->func = func;
parser->user_data = user_data;