Cherokee tweak #1090

Merged
merged 19 commits into from Jan 6, 2014

Conversation

Projects
None yet
1 participant
Member

skinkie commented Jan 5, 2014

[FIXED] The change in server.c should be really evaluated, the code gets in a deadlock.
a5eb6aa

I also hope someone could come up with a better parser of the command line arguments in cherokee-tweak. Due to the increasing number of issues with cherokee-tweak/handler_admin I don't have a clue what exactly fixed #750, but it does rotate now with and without authentication.

Additionally I would like to see verified that none of the serialisation formats actually require that forward slash should be escaped. That includes: php, ruby, python and json, if so the follow commit should be replaced by something that removes the entire adition of "/".
44ab729

Member

skinkie commented on cherokee/server.c in a5eb6aa Jan 5, 2014

The problem here is that the code gets in a deadlock.

==21595== Thread #19: Attempt to re-lock a non-recursive lock I already hold
==21595==    at 0x402DCD1: pthread_mutex_lock (in /usr/lib64/valgrind/vgpreload_helgrind-amd64-linux.so)
==21595==    by 0x4C9CC7C: cherokee_server_del_connection (server.c:1949)
==21595==    by 0x7FAA639: cherokee_admin_server_reply_close_conn (admin_server.c:224)
==21595==    by 0x7FA9D5E: process_request_line (handler_admin.c:125)
==21595==    by 0x7FA9812: cherokee_handler_admin_read_post (handler_admin.c:252)
==21595==    by 0x4C9761A: cherokee_handler_read_post (handler.c:107)
==21595==    by 0x4C910B0: cherokee_connection_read_post (connection.c:686)
==21595==    by 0x4CA6339: process_active_connections (thread.c:1216)
==21595==    by 0x4CA71F1: cherokee_thread_step_MULTI_THREAD (thread.c:2067)
==21595==    by 0x4CA3BC1: thread_routine (thread.c:99)
==21595==    by 0x402D88D: ??? (in /usr/lib64/valgrind/vgpreload_helgrind-amd64-linux.so)
==21595==    by 0x4ECBF39: start_thread (in /lib64/libpthread-2.17.so)
==21595==  Lock was previously acquired
==21595==    at 0x402DE16: pthread_mutex_lock (in /usr/lib64/valgrind/vgpreload_helgrind-amd64-linux.so)
==21595==    by 0x4CA71D9: cherokee_thread_step_MULTI_THREAD (thread.c:2059)
==21595==    by 0x4CA3BC1: thread_routine (thread.c:99)
==21595==    by 0x402D88D: ??? (in /usr/lib64/valgrind/vgpreload_helgrind-amd64-linux.so)
==21595==    by 0x4ECBF39: start_thread (in /lib64/libpthread-2.17.so)

See potential solution in:
71bc6c8

skinkie merged commit cffc6da into master Jan 6, 2014

skinkie deleted the cherokee_tweak branch Jan 6, 2014

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment