comparison: src/server/daemon/httprequest.c
src/server/daemon/httprequest.c
- branch
- aio
- changeset 159
- 9ba9f8befa80
- parent 154
- 6394ce09889a
- child 191
- 391ccd490d97
equal
deleted
inserted
replaced
| 157:a0c8e752490d | 159:9ba9f8befa80 |
|---|---|
| 38 #include "../util/io.h" | 38 #include "../util/io.h" |
| 39 #include "../util/util.h" | 39 #include "../util/util.h" |
| 40 #include "httprequest.h" | 40 #include "httprequest.h" |
| 41 #include "config.h" | 41 #include "config.h" |
| 42 #include "vserver.h" | 42 #include "vserver.h" |
| 43 #include "event.h" | |
| 43 #include "httplistener.h" | 44 #include "httplistener.h" |
| 44 #include "func.h" | 45 #include "func.h" |
| 45 #include "error.h" | 46 #include "error.h" |
| 46 | 47 |
| 47 void http_request_init(HTTPRequest *req) { | 48 void http_request_init(HTTPRequest *req) { |
| 85 } | 86 } |
| 86 | 87 |
| 87 return S("/"); | 88 return S("/"); |
| 88 } | 89 } |
| 89 | 90 |
| 90 int handle_request(HTTPRequest *request, threadpool_t *thrpool) { | 91 int handle_request(HTTPRequest *request, threadpool_t *thrpool, EventHandler *ev) { |
| 91 // handle nsapi request | 92 // handle nsapi request |
| 92 | 93 |
| 93 // create pool | 94 // create pool |
| 94 pool_handle_t *pool = pool_create(); | 95 pool_handle_t *pool = pool_create(); |
| 95 | 96 |
| 125 | 126 |
| 126 sn->sn.client = pblock_create_pool(sn->sn.pool, 8); | 127 sn->sn.client = pblock_create_pool(sn->sn.pool, 8); |
| 127 sn->sn.next = NULL; | 128 sn->sn.next = NULL; |
| 128 sn->sn.fill = 1; | 129 sn->sn.fill = 1; |
| 129 sn->sn.subject = NULL; | 130 sn->sn.subject = NULL; |
| 131 | |
| 132 if(!ev) { | |
| 133 ev = ev_instance(get_default_event_handler()); | |
| 134 } | |
| 135 sn->sn.ev = ev; | |
| 130 | 136 |
| 131 // the session needs the current server configuration | 137 // the session needs the current server configuration |
| 132 sn->config = request->connection->listener->cfg; | 138 sn->config = request->connection->listener->cfg; |
| 133 | 139 |
| 134 // add ip to sn->client pblock | 140 // add ip to sn->client pblock |
