Browse Source

Fix comment style (//) and add gnutls to automake distcheck

personal/stbuehler/wip
Stefan Bühler 9 years ago
parent
commit
ebd5a4ecb3
  1. 2
      Makefile.am
  2. 8
      src/main/plugin_core.c
  3. 1
      src/modules/mod_progress.c

2
Makefile.am

@ -3,4 +3,4 @@ SUBDIRS=doc src include tests
ACLOCAL_AMFLAGS=-I m4
EXTRA_DIST=autogen.sh CMakeLists.txt
DISTCHECK_CONFIGURE_FLAGS=--with-lua --with-openssl --with-kerberos5 --with-zlib --with-bzip2
DISTCHECK_CONFIGURE_FLAGS=--with-lua --with-openssl --with-kerberos5 --with-gnutls --with-zlib --with-bzip2

8
src/main/plugin_core.c

@ -966,11 +966,11 @@ static liAction* core_respond(liServer *srv, liWorker *wrk, liPlugin* p, liValue
rp = g_slice_new(respond_param);
if (!val) {
// respond;
/* respond; */
rp->status_code = 200;
rp->pattern = NULL;
} else if (val->type == LI_VALUE_STRING) {
// respond "foo";
/* respond "foo"; */
rp->status_code = 200;
rp->pattern = li_pattern_new(srv, val->data.string->str);
@ -980,11 +980,11 @@ static liAction* core_respond(liServer *srv, liWorker *wrk, liPlugin* p, liValue
return NULL;
}
} else if (val->type == LI_VALUE_NUMBER) {
// respond 404;
/* respond 404; */
rp->status_code = val->data.number;
rp->pattern = NULL;
} else if (val->type == LI_VALUE_LIST && val->data.list->len == 2 && g_array_index(val->data.list, liValue*, 0)->type == LI_VALUE_NUMBER && g_array_index(val->data.list, liValue*, 1)->type == LI_VALUE_STRING) {
// respond 200 => "foo";
/* respond 200 => "foo"; */
rp->status_code = g_array_index(val->data.list, liValue*, 0)->data.number;
rp->pattern = li_pattern_new(srv, g_array_index(val->data.list, liValue*, 1)->data.string->str);

1
src/modules/mod_progress.c

@ -123,7 +123,6 @@ struct mod_progress_job {
};
/* global data */
// static mod_progress_data progress_data;
static void progress_timeout_callback(liWaitQueue *wq, gpointer data) {
mod_progress_worker_data *wrk_data = data;

Loading…
Cancel
Save