Code Review
/
src
/
app-framework-binder.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
rest-api: fixup AFB_plugins allocated references
[src/app-framework-binder.git]
/
src
/
http-svc.c
diff --git
a/src/http-svc.c
b/src/http-svc.c
index
0f7f80c
..
839fc2f
100644
(file)
--- a/
src/http-svc.c
+++ b/
src/http-svc.c
@@
-70,14
+70,10
@@
static AFB_error initLibMagic (AFB_session *session) {
// Because of POST call multiple time requestApi we need to free POST handle here
static void endRequest (void *cls, struct MHD_Connection *connection, void **con_cls, enum MHD_RequestTerminationCode toe) {
// Because of POST call multiple time requestApi we need to free POST handle here
static void endRequest (void *cls, struct MHD_Connection *connection, void **con_cls, enum MHD_RequestTerminationCode toe) {
- AFB_
HttpPost
*posthandle = *con_cls;
+ AFB_
PostHandle
*posthandle = *con_cls;
// if post handle was used let's free everything
// if post handle was used let's free everything
- if (posthandle) {
- if (verbose) fprintf (stderr, "End Post Request UID=%d\n", posthandle->uid);
- free (posthandle->data);
- free (posthandle);
- }
+ if (posthandle != NULL) endPostRequest (posthandle);
}
}
@@
-253,7
+249,7
@@
STATIC int newRequest(void *cls,
}
// Nothing respond to this request Files, API, Angular Base
}
// Nothing respond to this request Files, API, Angular Base
- const char *errorstr = "<html><body>A
lsa-Json-Gateway Unknown or Not readable
file</body></html>";
+ const char *errorstr = "<html><body>A
FB-Daemon File Not Find
file</body></html>";
response = MHD_create_response_from_buffer(strlen(errorstr), (void*)errorstr, MHD_RESPMEM_PERSISTENT);
ret = MHD_queue_response(connection, MHD_HTTP_INTERNAL_SERVER_ERROR, response);
return (MHD_YES);
response = MHD_create_response_from_buffer(strlen(errorstr), (void*)errorstr, MHD_RESPMEM_PERSISTENT);
ret = MHD_queue_response(connection, MHD_HTTP_INTERNAL_SERVER_ERROR, response);
return (MHD_YES);
@@
-271,9
+267,12
@@
PUBLIC AFB_error httpdStart(AFB_session *session) {
apiUrlLen = strlen (session->config->rootapi);
baseUrlLen= strlen (session->config->rootbase);
rootUrlLen= strlen (session->config->rootdir);
apiUrlLen = strlen (session->config->rootapi);
baseUrlLen= strlen (session->config->rootbase);
rootUrlLen= strlen (session->config->rootdir);
+
+ // Initialise Client Session Hash Table
+ ctxStoreInit (CTX_NBCLIENTS);
- //
TBD open libmagic cache [fail to pass EFENCE check
]
- //
initLibMagic (session);
+ //
TBD open libmagic cache [fail to pass EFENCE check (allocating 0 bytes)
]
+ //initLibMagic (session);
if (verbose) {
if (verbose) {
@@
-299,20
+298,11
@@
PUBLIC AFB_error httpdStart(AFB_session *session) {
// infinite loop
PUBLIC AFB_error httpdLoop(AFB_session *session) {
// infinite loop
PUBLIC AFB_error httpdLoop(AFB_session *session) {
- static int count = 0;
-
+ int count = 0;
if (verbose) fprintf(stderr, "AFB:notice entering httpd waiting loop\n");
if (verbose) fprintf(stderr, "AFB:notice entering httpd waiting loop\n");
- if (session->foreground) {
-
- while (TRUE) {
- fprintf(stderr, "AFB:notice Use Ctrl-C to quit\n");
- (void) getc(stdin);
- }
- } else {
- while (TRUE) {
- sleep(3600);
- if (verbose) fprintf(stderr, "AFB:notice httpd alive [%d]\n", count++);
- }
+ while (TRUE) {
+ sleep(3600);
+ if (verbose) fprintf(stderr, "AFB:notice httpd alive [%d]\n", count++);
}
// should never return from here
}
// should never return from here