[Openocd-svn] r2769 - in trunk: doc/manual src/server

[oharboe at B. <oh...@ma...>]

Author: oharboe
Date: 2009-09-29 15:46:26 +0200 (Tue, 29 Sep 2009)
New Revision: 2769

Modified:
   trunk/doc/manual/server.txt
   trunk/src/server/httpd.c
Log:
httpd smoketest info

Modified: trunk/doc/manual/server.txt
===================================================================
--- trunk/doc/manual/server.txt	2009-09-29 06:07:50 UTC (rev 2768)
+++ trunk/doc/manual/server.txt	2009-09-29 13:46:26 UTC (rev 2769)
@@ -311,6 +311,15 @@
 
 /** @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/
+
+ 
+
  */

Modified: trunk/src/server/httpd.c
===================================================================
--- trunk/src/server/httpd.c	2009-09-29 06:07:50 UTC (rev 2768)
+++ trunk/src/server/httpd.c	2009-09-29 13:46:26 UTC (rev 2769)
@@ -1,9 +1,7 @@
 /***************************************************************************
- *   Copyright (C) 2007,2008 Øyvind Harboe                                 *
+ *   Copyright (C) 2007,2008,2009 Øyvind Harboe                            *
  *   oyv...@zy...                                               *
  *                                                                         *
- *   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 @@
 		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 @@
 		{
 			 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 */