Little Palm fixes

diff --git a/palm/lib/child.py b/palm/lib/child.py
index 1299c11..ede7b6a 100644 (file)
--- a/palm/lib/child.py
+++ b/palm/lib/child.py
@@ -97,6 +97,9 @@ class Child:
             # Register key value
             request.add_header(key, val)
 
+        if request is None:
+            debug("[+] Invalid Exit")
+            exit(1)
 
         # Post-parse POST data
         if request.get('POST_VARS') == '*':
@@ -113,10 +116,6 @@ class Child:
             # Override POST_VARS
             request.add_header('POST_VARS', data[offset_init:offset_end])
 
-        if request is None:
-            debug("[+] Invalid Exit")
-            exit(1)
-
         # Debug message
         msg = "[+] Request Headers\n"
         for h in request.headers:

diff --git a/plugins/palm/palm.c b/plugins/palm/palm.c
index e2b7b3c..8fdbec2 100644 (file)
--- a/plugins/palm/palm.c
+++ b/plugins/palm/palm.c
@@ -218,7 +218,6 @@ struct mk_iov *mk_palm_create_env(struct client_request *cr,
     mk_palm_iov_add_header(iov, mk_cgi_script_filename, sr->real_path);
     //mk_palm_iov_add_header(iov, mk_cgi_remote_port, mk_api->config->port);
     mk_palm_iov_add_header(iov, mk_cgi_query_string, sr->query_string);
-    mk_palm_iov_add_header(iov, mk_cgi_post_vars, sr->post_variables);
 
     if (sr->method == HTTP_METHOD_POST && sr->content_length > 0) {
         /* Content length */
@@ -233,6 +232,9 @@ struct mk_iov *mk_palm_create_env(struct client_request *cr,
         mk_palm_iov_add_header(iov, mk_cgi_content_type, sr->content_type);
     }
 
+    /* Post data */
+    mk_palm_iov_add_header(iov, mk_cgi_post_vars, sr->post_variables);
+
     /* CRLF */
     mk_api->iov_add_entry(iov, mk_iov_crlf.data, mk_iov_crlf.len,
                           mk_iov_none, MK_IOV_NOT_FREE_BUF);