diff options
| author | Dan Winship <danw@src.gnome.org> | 2004-06-02 14:07:23 +0000 |
|---|---|---|
| committer | Dan Winship <danw@src.gnome.org> | 2004-06-02 14:07:23 +0000 |
| commit | 4964e7b625f3b34d91a6f4c66fb62176d1f2e44f (patch) | |
| tree | a93f22bc2754b363094b219459218e8c117d63a1 /libsoup/soup-server.c | |
| parent | 2b17e189f3934a2e3f57be5b36881bf3a91809bf (diff) | |
| download | libsoup-4964e7b625f3b34d91a6f4c66fb62176d1f2e44f.tar.gz | |
Redo the various IPv4/IPv6-abstracting macros to not use ?: expressions as
* libsoup/soup-address.c: Redo the various IPv4/IPv6-abstracting
macros to not use ?: expressions as lvalues, since that's
apparently a GNU extension.
(soup_address_resolve_async): Use a timeout rather than an idle
handler to poll the dns result. (soup-dns really should be
rewritten to not require polling, but this is easier for now.)
#59240
* libsoup/soup-server.c (call_handler): Don't use GNU-only
non-constant structure initialization
Diffstat (limited to 'libsoup/soup-server.c')
| -rw-r--r-- | libsoup/soup-server.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/libsoup/soup-server.c b/libsoup/soup-server.c index 90973004..e0738da7 100644 --- a/libsoup/soup-server.c +++ b/libsoup/soup-server.c @@ -385,19 +385,18 @@ call_handler (SoupMessage *req, SoupSocket *sock) if (hand->callback) { const SoupUri *uri = soup_message_get_uri (req); + SoupServerContext ctx; - SoupServerContext serverctx = { - req, - uri->path, - soup_method_get_id (req->method), - auth, - server, - hand, - sock - }; + ctx.msg = req; + ctx.path = uri->path; + ctx.method_id = soup_method_get_id (req->method); + ctx.auth = auth; + ctx.server = server; + ctx.handler = hand; + ctx.sock = sock; /* Call method handler */ - (*hand->callback) (&serverctx, req, hand->user_data); + (*hand->callback) (&ctx, req, hand->user_data); } if (auth) |