Skip to content

Commit

Permalink
git-svn-id: svn://cherokee-project.com/cherokee/trunk@475 5dc97367-97…
Browse files Browse the repository at this point in the history
…f1-0310-9951-d761b3857238
  • Loading branch information
alobbs committed Nov 22, 2006
1 parent e7e4695 commit 3cbd17a
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
4 changes: 4 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
2006-11-22 Alvaro Lopez Ortega <alvaro@alobbs.com>

* cherokee/handler_fcgi.c (do_send): Post handling was
broken. Actually, I broke it with another commit a couple of days
ago. It's working again.

* cherokee/config_node.c (cherokee_config_node_add): Fixes bug
#104. It was messing up the configuration tree if the entries were
not sorted.
Expand Down
4 changes: 1 addition & 3 deletions cherokee/handler_fcgi.c
Original file line number Diff line number Diff line change
Expand Up @@ -536,16 +536,14 @@ do_send (cherokee_handler_fcgi_t *hdl, cherokee_buffer_t *buffer)
cherokee_connection_t *conn = HANDLER_CONN(hdl);

ret = cherokee_socket_write (&hdl->socket, buffer, &written);
printf ("send ret %d\n", ret);
switch (ret) {
case ret_ok:
return ret_ok;
break;
case ret_eagain:
cherokee_thread_deactive_to_polling (HANDLER_THREAD(hdl), HANDLER_CONN(hdl),
hdl->socket.socket, 1, false);
return ret_eagain;
default:
printf ("Error? %d\n", ret);
conn->error_code = http_bad_gateway;
return ret_error;
}
Expand Down
2 changes: 1 addition & 1 deletion cherokee/post.c
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ cherokee_post_set_len (cherokee_post_t *post, size_t len)
char *ptr;
char template[64];

strncpy (template, "/tmp/cherokee_post_XXXXXX", 64);
strncpy (template, "/tmp/cherokee_post_XXXXXX", sizeof(template));

/* Generate a unique name
*/
Expand Down

0 comments on commit 3cbd17a

Please sign in to comment.