Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
httpd smoketest info
[openocd.git] / src / server / httpd.c
diff --git a/src/server/httpd.c b/src/server/httpd.c
index e77721689c5da29d6042f03f709542d5d39127ae..4705e4426c0c17aa4711de79fd37af41d1b3dd7a 100644 (file)
--- 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     *
@@ -34,7 +32,7 @@
 #include <pthread.h>
 #include <signal.h>
 
-#define PAGE_NOT_FOUND "<html><head><title>File not found</title></head><body>File not found</body></html>"
+#define PAGE_NOT_FOUND "<html><head><title > File not found</title></head><body > File not found</body></html>"
 
 int loadFile(const char *name, void **data, size_t *len);
 
@@ -71,7 +69,7 @@ static const char *httpd_exec_cgi_tcl_error(Jim_Interp *interp)
 
        t = appendf(t, "Runtime error, file \"%s\", line %d:<br>",
                        interp->errorFileName, interp->errorLine);
-       t = appendf(t, "    %s<br>", Jim_GetString(interp->result, NULL));
+       t = appendf(t, "    %s < br>", Jim_GetString(interp->result, NULL));
        Jim_ListLength(interp, interp->stackTrace, &len);
        for (i = 0; i < len; i += 3)
        {
@@ -84,7 +82,7 @@ static const char *httpd_exec_cgi_tcl_error(Jim_Interp *interp)
                file = Jim_GetString(objPtr, NULL);
                Jim_ListIndex(interp, interp->stackTrace, i + 2, &objPtr, JIM_NONE);
                line = Jim_GetString(objPtr, NULL);
-               t = appendf(t, "In procedure '%s' called at file \"%s\", line %s<br>",
+               t = appendf(t, "In procedure '%s' called at file \"%s\", line %s < br>",
                                proc, file, line);
        }
        t = appendf(t, "</html></body>\n");
@@ -111,7 +109,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, "httpd.c", __LINE__);
        free((void *) script);
        if (retcode != JIM_OK)
                return retcode;
@@ -152,7 +150,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, "httpd.c", __LINE__);
        free((void *) script);
        if (retcode != JIM_OK)
        {
@@ -198,6 +196,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 +207,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 */
@@ -257,7 +272,7 @@ 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, "httpd.c", __LINE__);
                free((void *) script);
 
                if (retcode == JIM_ERR)
@@ -415,8 +430,8 @@ static pthread_mutex_t mutex;
 int httpd_start(void)
 {
        pthread_mutexattr_t attr;
-       pthread_mutexattr_init( &attr );
-       pthread_mutex_init( &mutex, &attr );
+       pthread_mutexattr_init(&attr);
+       pthread_mutex_init(&mutex, &attr);
 
        int port = 8888;
        LOG_USER("Launching httpd server on port %d", port);
@@ -446,16 +461,16 @@ int httpd_start(void)
 void httpd_stop(void)
 {
        MHD_stop_daemon(d);
-       pthread_mutex_destroy( &mutex );
+       pthread_mutex_destroy(&mutex);
 }
 
 void openocd_sleep_prelude(void)
 {
-       pthread_mutex_unlock( &mutex );
+       pthread_mutex_unlock(&mutex);
 }
 
 void openocd_sleep_postlude(void)
 {
-       pthread_mutex_lock( &mutex );
+       pthread_mutex_lock(&mutex);
 }
 
Open On-Chip Debugger

Linking to existing account procedure

If you already have an account and want to add another login method you MUST first sign in with your existing account and then change URL to read https://review.openocd.org/login/?link to get to this page again but this time it'll work for linking. Thank you.

SSH host keys fingerprints

1024 SHA256:YKx8b7u5ZWdcbp7/4AeXNaqElP49m6QrwfXaqQGJAOk gerrit-code-review@openocd.zylin.com (DSA)
384 SHA256:jHIbSQa4REvwCFG4cq5LBlBLxmxSqelQPem/EXIrxjk gerrit-code-review@openocd.org (ECDSA)
521 SHA256:UAOPYkU9Fjtcao0Ul/Rrlnj/OsQvt+pgdYSZ4jOYdgs gerrit-code-review@openocd.org (ECDSA)
256 SHA256:A13M5QlnozFOvTllybRZH6vm7iSt0XLxbA48yfc2yfY gerrit-code-review@openocd.org (ECDSA)
256 SHA256:spYMBqEYoAOtK7yZBrcwE8ZpYt6b68Cfh9yEVetvbXg gerrit-code-review@openocd.org (ED25519)
+--[ED25519 256]--+
|=..              |
|+o..   .         |
|*.o   . .        |
|+B . . .         |
|Bo. = o S        |
|Oo.+ + =         |
|oB=.* = . o      |
| =+=.+   + E     |
|. .=o   . o      |
+----[SHA256]-----+
2048 SHA256:0Onrb7/PHjpo6iVZ7xQX2riKN83FJ3KGU0TvI0TaFG4 gerrit-code-review@openocd.zylin.com (RSA)