X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fserver%2Fhttpd.c;h=d8659b09e6c39c7d64a4da8abaf041fef5dbd7bf;hp=6733502df09930fa3b902fd60cb2c5f1644cc4f2;hb=d0dee7ccafcf87259fadf6c5de43df8583b0e885;hpb=8b994145b849c40b0a195c3fb332b9770b2f9097
diff --git a/src/server/httpd.c b/src/server/httpd.c
index 6733502df0..d8659b09e6 100644
--- a/src/server/httpd.c
+++ b/src/server/httpd.c
@@ -1,9 +1,7 @@
/***************************************************************************
- * Copyright (C) 2007,2008 Ãyvind Harboe *
+ * Copyright (C) 2007,2008,2009 Ãyvind Harboe *
* oyvind.harboe@zylin.com *
* *
- * Copyright (C) 2008 Free Software Foundation
- * *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
@@ -36,6 +34,20 @@
#define PAGE_NOT_FOUND "
File not found File not found"
+static pthread_mutex_t mutex;
+
+void openocd_sleep_prelude(void)
+{
+ pthread_mutex_unlock(&mutex);
+}
+
+void openocd_sleep_postlude(void)
+{
+ pthread_mutex_lock(&mutex);
+}
+
+
+
int loadFile(const char *name, void **data, size_t *len);
static const char *appendf(const char *prev, const char *format, ...)
@@ -111,7 +123,7 @@ static int httpd_Jim_Command_writeform(Jim_Interp *interp, int argc,
const char *script = alloc_printf("set dummy_val $httppostdata(%s); set dummy_val",
name);
- retcode = Jim_Eval_Named(interp, script, "httpd.c", __LINE__);
+ retcode = Jim_Eval_Named(interp, script, __FILE__, __LINE__);
free((void *) script);
if (retcode != JIM_OK)
return retcode;
@@ -152,7 +164,7 @@ httpd_Jim_Command_formfetch(Jim_Interp *interp,
const char *script = alloc_printf("set dummy_val $httppostdata(%s); set dummy_val",
name);
- int retcode = Jim_Eval_Named(interp, script, "httpd.c", __LINE__);
+ int retcode = Jim_Eval_Named(interp, script, __FILE__, __LINE__);
free((void *) script);
if (retcode != JIM_OK)
{
@@ -186,7 +198,9 @@ static void request_completed(void *cls, struct MHD_Connection *connection,
if (r->postprocessor)
{
+ openocd_sleep_postlude();
MHD_destroy_post_processor(r->postprocessor);
+ openocd_sleep_prelude();
}
free(r);
@@ -198,6 +212,7 @@ static void append_key(struct httpd_request *r, const char *key,
const char *data, size_t off, size_t size)
{
Jim_Obj *keyObj = Jim_NewStringObj(interp, key, -1);
+ Jim_IncrRefCount(keyObj);
Jim_Obj *value = NULL;
Jim_Obj *dict = Jim_GetVariableStr(interp, "httppostdata", 0);
@@ -208,16 +223,32 @@ static void append_key(struct httpd_request *r, const char *key,
{
value = NULL;
}
+ else
+ {
+ Jim_IncrRefCount(value);
+ }
}
+
if (value == NULL)
+ {
value = Jim_NewStringObj(interp, "", -1);
+ Jim_IncrRefCount(value);
+
+ }
/* create a new object we append to and insert into this location */
Jim_Obj *newObj = Jim_NewStringObj(interp, "", -1);
+ Jim_IncrRefCount(newObj);
Jim_AppendObj(interp, newObj, value);
Jim_AppendString(interp, newObj, data, size);
/* uhh... use name here of dictionary */
- Jim_SetDictKeysVector(interp, Jim_NewStringObj(interp, "httppostdata", -1), &keyObj, 1, newObj);
+ dict = Jim_NewStringObj(interp, "httppostdata", -1);
+ Jim_IncrRefCount(dict);
+ Jim_SetDictKeysVector(interp, dict, &keyObj, 1, newObj);
+ Jim_DecrRefCount(interp, dict);
+ Jim_DecrRefCount(interp, value);
+ Jim_DecrRefCount(interp, newObj);
+ Jim_DecrRefCount(interp, keyObj);
}
/* append data to each key */
@@ -242,7 +273,7 @@ static int record_arg(void *cls, enum MHD_ValueKind kind, const char *key,
}
-int handle_request(struct MHD_Connection * connection, const char * url)
+static int handle_request(struct MHD_Connection * connection, const char * url)
{
struct MHD_Response * response;
@@ -257,10 +288,10 @@ int handle_request(struct MHD_Connection * connection, const char * url)
const char *script = alloc_printf(
"global httpdata; source {%s}; set httpdata", url);
- retcode = Jim_Eval_Named(interp, script, "httpd.c", __LINE__);
+ retcode = Jim_Eval_Named(interp, script, __FILE__, __LINE__);
free((void *) script);
- if (retcode == JIM_ERR)
+ if (retcode != JIM_OK)
{
printf("Tcl failed\n");
const char *t = httpd_exec_cgi_tcl_error(interp);
@@ -310,7 +341,10 @@ int handle_request(struct MHD_Connection * connection, const char * url)
LOG_DEBUG("Serving %s length=%zu", url, len);
/* serve file directly */
response = MHD_create_response_from_data(len, data, MHD_YES, MHD_NO);
+ /* Should we expose mimetype via tcl here or just let the browser
+ guess?
MHD_add_response_header(response, "Content-Type", "image/png");
+ */
ret = MHD_queue_response(connection, MHD_HTTP_OK, response);
MHD_destroy_response(response);
@@ -320,9 +354,9 @@ int handle_request(struct MHD_Connection * connection, const char * url)
}
}
-static int ahc_echo(void * cls, struct MHD_Connection * connection,
+static int ahc_echo_inner(void * cls, struct MHD_Connection * connection,
const char * url, const char * method, const char * version,
- const char * upload_data, unsigned int * upload_data_size, void ** ptr)
+ const char * upload_data, size_t * upload_data_size, void ** ptr)
{
int post = 0;
@@ -408,9 +442,23 @@ static int ahc_echo(void * cls, struct MHD_Connection * connection,
return result;
}
-static struct MHD_Daemon * d;
-static pthread_mutex_t mutex;
+static int ahc_echo(void * cls, struct MHD_Connection * connection,
+ const char * url, const char * method, const char * version,
+ const char * upload_data, size_t * upload_data_size, void ** ptr)
+{
+ int result;
+
+ openocd_sleep_postlude();
+
+ result = ahc_echo_inner(cls, connection, url, method, version, upload_data, upload_data_size, ptr);
+
+ openocd_sleep_prelude();
+
+ return result;
+}
+
+static struct MHD_Daemon * d;
int httpd_start(void)
{
@@ -449,13 +497,3 @@ void httpd_stop(void)
pthread_mutex_destroy(&mutex);
}
-void openocd_sleep_prelude(void)
-{
- pthread_mutex_unlock(&mutex);
-}
-
-void openocd_sleep_postlude(void)
-{
- pthread_mutex_lock(&mutex);
-}
-