Browse Source

httpd smoketest info

git-svn-id: svn://svn.berlios.de/openocd/trunk@2769 b42882b7-edfa-0310-969c-e2dbd0fdcd60
tags/v0.3.0-rc0
oharboe 13 years ago
parent
commit
9bdbffb8cc
2 changed files with 29 additions and 5 deletions
  1. +10
    -1
      doc/manual/server.txt
  2. +19
    -4
      src/server/httpd.c

+ 10
- 1
doc/manual/server.txt View File

@@ -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/


*/

+ 19
- 4
src/server/httpd.c View File

@@ -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 */


Loading…
Cancel
Save