aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Bühler <stbuehler@web.de>2010-01-31 16:59:30 +0100
committerStefan Bühler <stbuehler@web.de>2010-01-31 17:00:49 +0100
commit168c8a78bd063e74b4bc5e5f8da66fe6c39aac45 (patch)
tree1b352f80a3588afe830998b716685678fbfe11d8
parent0bf277af0d5fe21b8f744a5de1a98333372b2733 (diff)
downloadfcgi-debug-168c8a78bd063e74b4bc5e5f8da66fe6c39aac45.tar.gz
fcgi-debug-168c8a78bd063e74b4bc5e5f8da66fe6c39aac45.zip
Remove build-depend on ragel (wasn't using ragel at all, thx Tamas TEVESZ)
-rw-r--r--COPYING2
-rw-r--r--README1
-rw-r--r--src/CMakeLists.txt3
-rw-r--r--src/parse-fastcgi.c (renamed from src/parse-fastcgi.rl)8
4 files changed, 5 insertions, 9 deletions
diff --git a/COPYING b/COPYING
index 2838e22..bb0daa2 100644
--- a/COPYING
+++ b/COPYING
@@ -1,7 +1,7 @@
The MIT License
-Copyright (c) 2008 Stefan Bühler
+Copyright (c) 2008-2010 Stefan Bühler
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/README b/README
index 7a7ef0b..08467db 100644
--- a/README
+++ b/README
@@ -6,7 +6,6 @@ Build Requires:
glib2
libev
cmake
- ragel
For running you probably want spawn-fcgi (either from lighttpd, or from https://cgit.stbuehler.de/gitosis/spawn-fcgi/about/)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index fb56aa7..db076ec 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -9,7 +9,6 @@ INCLUDE(CPack)
INCLUDE(FindPkgConfig)
INCLUDE(LighttpdMacros)
-FIND_PACKAGE(Ragel REQUIRED)
cmake_policy(SET CMP0005 OLD)
OPTION(BUILD_STATIC "build a static fcgi-debug")
@@ -61,8 +60,6 @@ ADD_DEFINITIONS(-DHAVE_CONFIG_H)
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
-RAGEL_PARSER(parse-fastcgi.rl)
-
ADD_EXECUTABLE(fcgi-debug
fcgi-debug.c
connection.c
diff --git a/src/parse-fastcgi.rl b/src/parse-fastcgi.c
index 51270ff..0052fe3 100644
--- a/src/parse-fastcgi.rl
+++ b/src/parse-fastcgi.c
@@ -169,7 +169,7 @@ static void fcgi_packet_parse(fcgi_context *ctx, guint8 *p, guint8 *pe) {
}
log_raw_split("data", ctx->from_server, ctx->con_id, ctx->FCGI_Record.requestID, g_string_set_const(&tmp1, (gchar*) p, pe - p));
break;
-
+
case FCGI_GET_VALUES: {
guint len1, len2;
GString *s1, *s2;
@@ -203,7 +203,7 @@ static void fcgi_packet_parse(fcgi_context *ctx, guint8 *p, guint8 *pe) {
}
break;
}
-
+
case FCGI_GET_VALUES_RESULT: {
guint len1, len2;
GString *s1, *s2;
@@ -231,7 +231,7 @@ static void fcgi_packet_parse(fcgi_context *ctx, guint8 *p, guint8 *pe) {
}
break;
}
-
+
case FCGI_UNKNOWN_TYPE:
if (ctx->FCGI_Record.contentLength != 8) {
g_print("wrong FCGI_UNKNOWN_TYPE size from %s (%u, %u): %u\n",
@@ -241,7 +241,7 @@ static void fcgi_packet_parse(fcgi_context *ctx, guint8 *p, guint8 *pe) {
g_print("unknown type %u from %s (%u, %u)\n", (guint) p[0],
from_server_to_string(ctx->from_server), ctx->con_id, (guint) ctx->FCGI_Record.requestID);
break;
-
+
default:
g_print("packet from %s (%u, %u): type: %s, contentLength: 0x%x\n",
from_server_to_string(ctx->from_server), ctx->con_id,