From 9bdbffb8cc0d169349b5580b42602268e773b470 Mon Sep 17 00:00:00 2001
From: oharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>
Date: Tue, 29 Sep 2009 13:46:26 +0000
Subject: httpd smoketest info

git-svn-id: svn://svn.berlios.de/openocd/trunk@2769 b42882b7-edfa-0310-969c-e2dbd0fdcd60
---
 doc/manual/server.txt | 11 ++++++++++-
 src/server/httpd.c    | 23 +++++++++++++++++++----
 2 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/doc/manual/server.txt b/doc/manual/server.txt
index 73d7746c..57bac4a3 100644
--- a/doc/manual/server.txt
+++ b/doc/manual/server.txt
@@ -311,6 +311,15 @@ This section needs to be expanded.
 
 /** @page serverhttp OpenOCD HTTP Server API
 
-This section needs to be expanded.
+
+Smoketest:
+
+configure --enable-httpd --enable-dummy --enable-ioutil
+
+openocd -s /usr/local/share/openocd -f httpd/httpd.tcl -f interface/dummy.cfg -f target/lpc2148.cfg
+
+Navigate to: http://localhost:8888/
+
+ 
 
  */
diff --git a/src/server/httpd.c b/src/server/httpd.c
index 6733502d..4705e442 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     *
@@ -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 */
-- 
cgit v1.2.3