0.9.26 Release

6 files changed, 13 insertions, 10 deletions

diff --git a/src/common.c b/src/common.c
index 2ee4afb..8362171 100644
--- a/src/common.c
+++ b/src/common.c
@@ -208,7 +208,7 @@ argc_argv (char *instr, argv_t ** argv, char *commentstr)
    originally by Per Bother */
 
 void
-buffer_init (buffer_t * buf)
+haserl_buffer_init (buffer_t * buf)
 {
   buf->data = NULL;
   buf->ptr = NULL;
@@ -222,7 +222,7 @@ buffer_destroy (buffer_t * buf)
     {
       free (buf->data);
     }
-  buffer_init (buf);
+  haserl_buffer_init (buf);
 }
 
 /* don't reallocate - just forget about the current contents */
diff --git a/src/common.h b/src/common.h
index dbf33aa..b9ee5f3 100644
--- a/src/common.h
+++ b/src/common.h
@@ -44,7 +44,7 @@ typedef struct
 /* common.c */
 
 int argc_argv (char *instr, argv_t ** argv, char *commentstr);
-void buffer_init (buffer_t * buf);
+void haserl_buffer_init (buffer_t * buf);
 void buffer_reset (buffer_t * buf);
 void buffer_destroy (buffer_t * buf);
 void buffer_add (buffer_t * buf, const void *data, unsigned long size);
diff --git a/src/config.h.in b/src/config.h.in
index 215b591..f9135a1 100644
--- a/src/config.h.in
+++ b/src/config.h.in
@@ -78,6 +78,9 @@
 /* Define to the one symbol short name of this package. */
 #undef PACKAGE_TARNAME
 
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
diff --git a/src/h_script.c b/src/h_script.c
index 029fc41..646be6e 100644
--- a/src/h_script.c
+++ b/src/h_script.c
@@ -522,7 +522,7 @@ process_token_list (buffer_t * buf, token_t * token)
 {
   char *c;
 
-  buffer_init (buf);
+  haserl_buffer_init (buf);
   shell_exec (buf, "\n");	/* try to get the error reporting match the line number */
 
   while (token)
diff --git a/src/haserl.c b/src/haserl.c
index fa6059a..049e7f9 100644
--- a/src/haserl.c
+++ b/src/haserl.c
@@ -269,7 +269,7 @@ myputenv (list_t * cur, char *str, char *prefix)
 	      /* if an array, create a new string with this
 	       * value added to the end of the old value(s) 
 	       */
-	      temp = xmalloc (strlen (cur->buf) + len + 1);
+	      temp = xmalloc (strlen (cur->buf) + strlen(entry) - len + 1);
 	      memmove (temp, cur->buf, strlen (cur->buf) + 1);
 	      strcat (temp, "\n");
 	      strcat (temp, str + keylen + 3);
@@ -491,7 +491,7 @@ ReadCGIPOSTValues (list_t * env)
     {
       sbuf.maxread = strtoul (getenv (CONTENT_LENGTH), NULL, 10);
     }
-  buffer_init (&token);
+  haserl_buffer_init (&token);
 
 
   /* Allow 2MB content, unless they have a global upload set */
@@ -695,7 +695,7 @@ main (int argc, char *argv[])
 
   assignGlobalStartupValues ();
 #ifndef JUST_LUACSHELL
-  buffer_init (&script_text);
+  haserl_buffer_init (&script_text);
 #endif
 
   /* if more than argv[1] and argv[1] is not a file */
diff --git a/src/rfc2388.c b/src/rfc2388.c
index 8aa5d19..b9e8daf 100644
--- a/src/rfc2388.c
+++ b/src/rfc2388.c
@@ -62,7 +62,7 @@ mime_var_init (mime_var_t * obj)
   obj->filename = NULL;
   obj->type = NULL;
   obj->tempname = NULL;
-  buffer_init (&(obj->value));
+  haserl_buffer_init (&(obj->value));
   obj->fh = 0;
 }
 
@@ -157,7 +157,7 @@ void
 mime_var_putenv (list_t * env, mime_var_t * obj)
 {
   buffer_t buf;
-  buffer_init (&buf);
+  haserl_buffer_init (&buf);
   if (obj->name)
     {
       buffer_add (&(obj->value), "", 1);
@@ -401,7 +401,7 @@ rfc2388_handler (list_t * env)
     }
 
   /* initialize the buffer, and make sure it doesn't point to null */
-  buffer_init (&buf);
+  haserl_buffer_init (&buf);
   buffer_add (&buf, "", 1);
   buffer_reset (&buf);