Changeset 269
- Timestamp:
- 04/16/06 13:55:56 (3 years ago)
- Files:
-
- cherokee/trunk/ChangeLog (modified) (2 diffs)
- cherokee/trunk/Makefile.am (modified) (3 diffs)
- cherokee/trunk/README (modified) (1 diff)
- cherokee/trunk/cherokee.1 (modified) (1 diff)
- cherokee/trunk/cherokee/Makefile.am (modified) (14 diffs)
- cherokee/trunk/cherokee/access.c (modified) (1 diff)
- cherokee/trunk/cherokee/admin_server.c (modified) (1 diff)
- cherokee/trunk/cherokee/avl.c (added)
- cherokee/trunk/cherokee/avl.h (added)
- cherokee/trunk/cherokee/buffer.c (modified) (2 diffs)
- cherokee/trunk/cherokee/buffer.h (modified) (1 diff)
- cherokee/trunk/cherokee/cherokee.h (modified) (1 diff)
- cherokee/trunk/cherokee/cherokee_show.c (modified) (1 diff)
- cherokee/trunk/cherokee/config_entry.c (modified) (5 diffs)
- cherokee/trunk/cherokee/config_entry.h (modified) (2 diffs)
- cherokee/trunk/cherokee/config_node.c (modified) (4 diffs)
- cherokee/trunk/cherokee/config_node.h (modified) (1 diff)
- cherokee/trunk/cherokee/connection-protected.h (modified) (1 diff)
- cherokee/trunk/cherokee/connection.c (modified) (1 diff)
- cherokee/trunk/cherokee/connection_info.h (modified) (1 diff)
- cherokee/trunk/cherokee/dict.c (deleted)
- cherokee/trunk/cherokee/dict.h (deleted)
- cherokee/trunk/cherokee/dirs_table.c (modified) (1 diff)
- cherokee/trunk/cherokee/dirs_table.h (modified) (1 diff)
- cherokee/trunk/cherokee/encoder_table.h (modified) (1 diff)
- cherokee/trunk/cherokee/ext_source.c (modified) (1 diff)
- cherokee/trunk/cherokee/ext_source.h (modified) (3 diffs)
- cherokee/trunk/cherokee/exts_table.c (modified) (1 diff)
- cherokee/trunk/cherokee/handler_cgi.c (modified) (3 diffs)
- cherokee/trunk/cherokee/handler_cgi.h (modified) (1 diff)
- cherokee/trunk/cherokee/handler_cgi_base.c (modified) (4 diffs)
- cherokee/trunk/cherokee/handler_cgi_base.h (modified) (1 diff)
- cherokee/trunk/cherokee/handler_common.c (modified) (2 diffs)
- cherokee/trunk/cherokee/handler_dirlist.c (modified) (16 diffs)
- cherokee/trunk/cherokee/handler_dirlist.h (modified) (1 diff)
- cherokee/trunk/cherokee/handler_error.c (modified) (2 diffs)
- cherokee/trunk/cherokee/handler_fcgi.c (modified) (4 diffs)
- cherokee/trunk/cherokee/handler_file.c (modified) (2 diffs)
- cherokee/trunk/cherokee/handler_phpcgi.c (modified) (3 diffs)
- cherokee/trunk/cherokee/handler_redir.c (modified) (10 diffs)
- cherokee/trunk/cherokee/handler_redir.h (modified) (1 diff)
- cherokee/trunk/cherokee/handler_scgi.c (modified) (3 diffs)
- cherokee/trunk/cherokee/handler_server_info.c (modified) (2 diffs)
- cherokee/trunk/cherokee/icons.c (modified) (5 diffs)
- cherokee/trunk/cherokee/icons.h (modified) (3 diffs)
- cherokee/trunk/cherokee/iocache.c (modified) (4 diffs)
- cherokee/trunk/cherokee/list.c (added)
- cherokee/trunk/cherokee/list.h (modified) (1 diff)
- cherokee/trunk/cherokee/list_ext.c (modified) (5 diffs)
- cherokee/trunk/cherokee/list_ext.h (modified) (2 diffs)
- cherokee/trunk/cherokee/list_merge_sort.c (deleted)
- cherokee/trunk/cherokee/list_merge_sort.h (deleted)
- cherokee/trunk/cherokee/logger_table.h (modified) (1 diff)
- cherokee/trunk/cherokee/main.c (modified) (1 diff)
- cherokee/trunk/cherokee/main_admin.c (modified) (3 diffs)
- cherokee/trunk/cherokee/matching_list.c (modified) (10 diffs)
- cherokee/trunk/cherokee/matching_list.h (modified) (2 diffs)
- cherokee/trunk/cherokee/mime-protected.h (modified) (1 diff)
- cherokee/trunk/cherokee/mime_entry.c (modified) (1 diff)
- cherokee/trunk/cherokee/module.h (modified) (3 diffs)
- cherokee/trunk/cherokee/module_loader-protected.h (deleted)
- cherokee/trunk/cherokee/module_loader.c (modified) (1 diff)
- cherokee/trunk/cherokee/module_loader.h (modified) (2 diffs)
- cherokee/trunk/cherokee/module_read_config.c (deleted)
- cherokee/trunk/cherokee/module_read_config.h (deleted)
- cherokee/trunk/cherokee/reqs_list.h (modified) (1 diff)
- cherokee/trunk/cherokee/reqs_list_entry.h (modified) (1 diff)
- cherokee/trunk/cherokee/request.h (modified) (1 diff)
- cherokee/trunk/cherokee/resolv_cache.c (modified) (1 diff)
- cherokee/trunk/cherokee/server-protected.h (modified) (7 diffs)
- cherokee/trunk/cherokee/server.c (modified) (21 diffs)
- cherokee/trunk/cherokee/server.h (modified) (1 diff)
- cherokee/trunk/cherokee/session_cache.c (deleted)
- cherokee/trunk/cherokee/session_cache.h (deleted)
- cherokee/trunk/cherokee/socket.c (modified) (3 diffs)
- cherokee/trunk/cherokee/table-protected.h (deleted)
- cherokee/trunk/cherokee/table.c (modified) (11 diffs)
- cherokee/trunk/cherokee/table.h (modified) (1 diff)
- cherokee/trunk/cherokee/thread.c (modified) (3 diffs)
- cherokee/trunk/cherokee/thread.h (modified) (1 diff)
- cherokee/trunk/cherokee/typed_table.c (modified) (1 diff)
- cherokee/trunk/cherokee/typed_table.h (modified) (1 diff)
- cherokee/trunk/cherokee/validator.c (modified) (2 diffs)
- cherokee/trunk/cherokee/validator.h (modified) (2 diffs)
- cherokee/trunk/cherokee/validator_htdigest.c (modified) (3 diffs)
- cherokee/trunk/cherokee/validator_htpasswd.c (modified) (3 diffs)
- cherokee/trunk/cherokee/validator_pam.c (modified) (2 diffs)
- cherokee/trunk/cherokee/validator_plain.c (modified) (3 diffs)
- cherokee/trunk/cherokee/virtual_entries.c (added)
- cherokee/trunk/cherokee/virtual_entries.h (added)
- cherokee/trunk/cherokee/virtual_server.c (modified) (5 diffs)
- cherokee/trunk/cherokee/virtual_server.h (modified) (4 diffs)
- cherokee/trunk/cherokee_logrotate.1 (modified) (1 diff)
- cherokee/trunk/configure.in (modified) (2 diffs)
- cherokee/trunk/doc/develop/Intro.txt (modified) (2 diffs)
- cherokee/trunk/qa/001-basic.py (modified) (1 diff)
- cherokee/trunk/qa/015-CGI-simple.py (modified) (2 diffs)
- cherokee/trunk/qa/016-CGI-pathinfo.py (modified) (2 diffs)
- cherokee/trunk/qa/017-CGI-pathinfo2.py (modified) (2 diffs)
- cherokee/trunk/qa/018-CGI-pathinfo3.py (modified) (2 diffs)
- cherokee/trunk/qa/020-VirtualHost.py (modified) (2 diffs)
- cherokee/trunk/qa/021-VirtualHost2.py (modified) (2 diffs)
- cherokee/trunk/qa/029-Post+Without-lenght.py (modified) (2 diffs)
- cherokee/trunk/qa/030-Post+urlencoded.py (modified) (2 diffs)
- cherokee/trunk/qa/031-Post+urlencoded2.py (modified) (2 diffs)
- cherokee/trunk/qa/033-DirIndex.py (modified) (2 diffs)
- cherokee/trunk/qa/034-DirIndex2.py (modified) (2 diffs)
- cherokee/trunk/qa/035-PHP-simple.py (modified) (2 diffs)
- cherokee/trunk/qa/036-DocumentRoot-common.py (modified) (2 diffs)
- cherokee/trunk/qa/037-PHP-post.py (modified) (1 diff)
- cherokee/trunk/qa/039-Auth-Basic.py (modified) (2 diffs)
- cherokee/trunk/qa/040-Auth-Basic2.py (modified) (2 diffs)
- cherokee/trunk/qa/041-Auth-Basic3.py (modified) (2 diffs)
- cherokee/trunk/qa/042-Pipelining.py (modified) (1 diff)
- cherokee/trunk/qa/043-Pipelining2.py (modified) (1 diff)
- cherokee/trunk/qa/044-Home.py (modified) (2 diffs)
- cherokee/trunk/qa/045-Home2.py (modified) (2 diffs)
- cherokee/trunk/qa/046-Redir.py (modified) (2 diffs)
- cherokee/trunk/qa/047-Redir2.py (modified) (2 diffs)
- cherokee/trunk/qa/048-NN.py (modified) (2 diffs)
- cherokee/trunk/qa/049-NN-broken.py (modified) (2 diffs)
- cherokee/trunk/qa/050-HeadBody.py (modified) (2 diffs)
- cherokee/trunk/qa/061-PAM.py (modified) (2 diffs)
- cherokee/trunk/qa/062-PAM2.py (modified) (2 diffs)
- cherokee/trunk/qa/063-DocumentRoot.py (modified) (2 diffs)
- cherokee/trunk/qa/064-DirectoryIndex.py (modified) (2 diffs)
- cherokee/trunk/qa/065-DirectoryIndex2.py (modified) (2 diffs)
- cherokee/trunk/qa/066-DirectoryIndex3.py (modified) (2 diffs)
- cherokee/trunk/qa/067-PathInfo.py (modified) (2 diffs)
- cherokee/trunk/qa/068-PathInfo2.py (modified) (2 diffs)
- cherokee/trunk/qa/069-PathInfo3.py (modified) (2 diffs)
- cherokee/trunk/qa/070-Inherit.py (modified) (2 diffs)
- cherokee/trunk/qa/071-Inherit2.py (modified) (2 diffs)
- cherokee/trunk/qa/072-Inherit3.py (modified) (2 diffs)
- cherokee/trunk/qa/073-Access.py (modified) (2 diffs)
- cherokee/trunk/qa/074-Access2.py (modified) (2 diffs)
- cherokee/trunk/qa/075-AccessRange.py (modified) (2 diffs)
- cherokee/trunk/qa/076-AccessRange2.py (modified) (2 diffs)
- cherokee/trunk/qa/077-AccessRange3.py (modified) (2 diffs)
- cherokee/trunk/qa/078-AccessAny.py (modified) (2 diffs)
- cherokee/trunk/qa/079-Extension.py (modified) (2 diffs)
- cherokee/trunk/qa/080-Extension2.py (modified) (2 diffs)
- cherokee/trunk/qa/081-DocumentRoot-Common-index.py (modified) (2 diffs)
- cherokee/trunk/qa/082-Auth-header.py (modified) (2 diffs)
- cherokee/trunk/qa/083-RedirParam.py (modified) (2 diffs)
- cherokee/trunk/qa/084-RedirParamShow.py (modified) (2 diffs)
- cherokee/trunk/qa/085-AuthUsers.py (modified) (2 diffs)
- cherokee/trunk/qa/086-AuthUsers2.py (modified) (3 diffs)
- cherokee/trunk/qa/087-Location.py (modified) (1 diff)
- cherokee/trunk/qa/088-CGI-envs.py (modified) (3 diffs)
- cherokee/trunk/qa/089-gzip-encoding.py (modified) (2 diffs)
- cherokee/trunk/qa/090-Digest.py (modified) (2 diffs)
- cherokee/trunk/qa/091-Digest2.py (modified) (2 diffs)
- cherokee/trunk/qa/092-Digest3.py (modified) (2 diffs)
- cherokee/trunk/qa/093-InvalidLinks.py (modified) (2 diffs)
- cherokee/trunk/qa/094-URL-request.py (modified) (2 diffs)
- cherokee/trunk/qa/095-htpasswd-apache-md5.py (modified) (2 diffs)
- cherokee/trunk/qa/096-htpasswd-md5.py (modified) (2 diffs)
- cherokee/trunk/qa/097-htpasswd-sha1.py (modified) (2 diffs)
- cherokee/trunk/qa/098-htpasswd-crypt.py (modified) (2 diffs)
- cherokee/trunk/qa/099-htpasswd-plain.py (modified) (2 diffs)
- cherokee/trunk/qa/100-Digest-htdigest.py (modified) (2 diffs)
- cherokee/trunk/qa/102-QueryString.py (modified) (2 diffs)
- cherokee/trunk/qa/103-ScriptName.py (modified) (2 diffs)
- cherokee/trunk/qa/104-ScriptAlias_PathInfo.py (modified) (2 diffs)
- cherokee/trunk/qa/105-If-Range.py (modified) (2 diffs)
- cherokee/trunk/qa/106-If-Range2.py (modified) (2 diffs)
- cherokee/trunk/qa/107-Priority1.py (modified) (2 diffs)
- cherokee/trunk/qa/108-Priority2.py (modified) (2 diffs)
- cherokee/trunk/qa/109-Priority3.py (modified) (2 diffs)
- cherokee/trunk/qa/110-Priority4.py (modified) (2 diffs)
- cherokee/trunk/qa/112-NiceError-CGI.py (modified) (2 diffs)
- cherokee/trunk/qa/113-HeaderFile.py (modified) (2 diffs)
- cherokee/trunk/qa/114-HeaderFile2.py (modified) (2 diffs)
- cherokee/trunk/qa/115-Respin.py (modified) (2 diffs)
- cherokee/trunk/qa/116-RequestTiny.py (added)
- cherokee/trunk/qa/117-DomainToDir.py (modified) (2 diffs)
- cherokee/trunk/qa/118-Request-redir.py (modified) (2 diffs)
- cherokee/trunk/qa/121-NoUserDir.py (modified) (2 diffs)
- cherokee/trunk/qa/122-Methods.py (modified) (2 diffs)
- cherokee/trunk/qa/123-ImplicitRedit.py (modified) (2 diffs)
- cherokee/trunk/qa/124-DomainToDir2.py (modified) (2 diffs)
- cherokee/trunk/qa/125-domain-redir1.py (modified) (2 diffs)
- cherokee/trunk/qa/126-SCGI.py (modified) (2 diffs)
- cherokee/trunk/qa/127-SCGI-Post.py (modified) (2 diffs)
- cherokee/trunk/qa/128-ValidMethod-common.py (modified) (2 diffs)
- cherokee/trunk/qa/129-Basic-EmptyPasswd.py (modified) (2 diffs)
- cherokee/trunk/qa/130-Digest-EmptyPasswd.py (modified) (2 diffs)
- cherokee/trunk/qa/131-ChangeUser-phpcgi.py (modified) (2 diffs)
- cherokee/trunk/qa/run-tests.py (modified) (3 diffs)
- cherokee/trunk/sites-default.sample.pre (modified) (1 diff)
- cherokee/trunk/windows/cherokee.nsi.in (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
cherokee/trunk/ChangeLog
r261 r269 1 2006-04-16 Alvaro Lopez Ortega <alvaro@alobbs.com> 2 3 * Makefile.am, sites-default.sample.pre, cherokee/handler_redir, 4 cherokee/handler_redir.h, cherokee/module_loader.c, 5 cherokee/handler_server_info.c, cherokee/module_loader.h, 6 cherokee/dict.c, cherokee/dict.h, cherokee/handler_cgi_base.c, 7 cherokee/resolv_cache.c, cherokee/handler_cgi_base.h, 8 cherokee/access.c, cherokee/handler_dirlist.c, 9 cherokee/module_loader-protected.h, cherokee/list.c, 10 cherokee/handler_dirlist.h, cherokee/virtual_server.c, 11 cherokee/list.h, cherokee/virtual_server.h, 12 cherokee/handler_common.c, cherokee/cherokee_show.c, 13 cherokee/config_entry.c, cherokee/module.h, 14 cherokee/config_entry.h, cherokee/request.h, cherokee/avl, 15 cherokee/validator_plain.c, cherokee/reqs_list.h, 16 cherokee/ext_source.c, cherokee/avl.c, cherokee/ext_source.h, 17 cherokee/validator.c, cherokee/avl.h, cherokee/exts_table.c, 18 cherokee/validator.h, cherokee/encoder_table.h, 19 cherokee/typed_table.c, cherokee/main_admin.c, 20 cherokee/typed_table.h, cherokee/validator_htpasswd.c, 21 cherokee/thread.c, cherokee/buffer.c, cherokee/handler_file.c, 22 cherokee/thread.h, cherokee/buffer.h, cherokee/main.c, 23 cherokee/Makefile.am, cherokee/handler_fcgi.c, 24 cherokee/session_cache.c, cherokee/config_node.c, 25 cherokee/icons.c, cherokee/session_cache.h, 26 cherokee/config_node.h, cherokee/icons.h, cherokee/handler_scgi.c, 27 cherokee/handler_error.c, cherokee/table.c, cherokee/list_ext.c, 28 cherokee/logger_table.h, cherokee/table.h, cherokee/handler_cgi.c, 29 cherokee/list_ext.h, cherokee/dict, cherokee/server-protected.h, 30 cherokee/handler_cgi.h, cherokee/module_read_config.c, 31 cherokee/module_read_config.h, cherokee/admin_server.c, 32 cherokee/connection_info.h, cherokee/validator_htdigest.c, 33 cherokee/mime-protected.h, cherokee/table-protected.h, 34 cherokee/matching_list.c, cherokee/cherokee.h, 35 cherokee/matching_list.h, cherokee/iocache.c, 36 cherokee/connection.c, cherokee/list_merge_sort.c, 37 cherokee/list_merge_sort.h, cherokee/server.c, 38 cherokee/handler_phpcgi.c, cherokee/dirs_table.c, 39 cherokee/mime_entry.c, cherokee/server.h, cherokee/dirs_table.h, 40 cherokee/virtual_entries.c, cherokee/validator_pam.c, 41 cherokee/virtual_entries.h, cherokee/socket.c, 42 cherokee/connection-protected.h, cherokee/reqs_list_entry.h, 43 windows/cherokee.nsi.in, cherokee_logrotate.1, 44 doc/develop/Intro.txt, cherokee.1, configure.in, README: Many 45 changes mixed together in here: 1.- The list and AVL 46 implementations are new. 2.- I've added a new configuration 47 system much more generic than the previous one (it doesn't require 48 yacc or lex any longer! but it isn't meant to be written by hand 49 though). 3.- Most of the modules have been updated to read its 50 configuration with the new method. 51 52 * qa/031-Post+urlencoded2.py, qa/112-NiceError-CGI.py, 53 qa/034-DirIndex2.py, qa/083-RedirParam.py, 54 qa/125-domain-redir1.py, qa/080-Extension2.py, qa/070-Inherit.py, 55 qa/104-ScriptAlias_PathInfo.py, qa/091-Digest2.py, 56 qa/029-Post+Without-lenght.py, qa/127-SCGI-Post.py, 57 qa/086-AuthUsers2.py, qa/020-VirtualHost.py, qa/087-Location.py, 58 qa/015-CGI-simple.py, qa/082-Auth-header.py, qa/047-Redir2.py, 59 qa/017-CGI-pathinfo2.py, qa/042-Pipelining.py, 60 qa/118-Request-redir.py, qa/040-Auth-Basic2.py, 61 qa/107-Priority1.py, qa/108-Priority2.py, qa/033-DirIndex.py, 62 qa/076-AccessRange2.py, qa/109-Priority3.py, 63 qa/089-gzip-encoding.py, qa/037-PHP-post.py, qa/061-PAM.py, 64 qa/043-Pipelining2.py, qa/075-AccessRange.py, qa/072-Inherit3.py, 65 qa/093-InvalidLinks.py, qa/097-htpasswd-sha1.py, qa/run-tests.py, 66 qa/073-Access.py, qa/046-Redir.py, qa/117-DomainToDir.py, 67 qa/045-Home2.py, qa/081-DocumentRoot-Common-index.py, 68 qa/066-DirectoryIndex3.py, qa/063-DocumentRoot.py, 69 qa/071-Inherit2.py, qa/126-SCGI.py, qa/102-QueryString.py, 70 qa/128-ValidMethod-common.py, qa/124-DomainToDir2.py, 71 qa/062-PAM2.py, qa/041-Auth-Basic3.py, qa/122-Methods.py, 72 qa/098-htpasswd-crypt.py, qa/016-CGI-pathinfo.py, qa/001-basic.py, 73 qa/044-Home.py, qa/116-RequestTiny.py, qa/021-VirtualHost2.py, 74 qa/121-NoUserDir.py, qa/077-AccessRange3.py, qa/035-PHP-simple.py, 75 qa/065-DirectoryIndex2.py, qa/088-CGI-envs.py, 76 qa/085-AuthUsers.py, qa/131-ChangeUser-phpcgi.py, 77 qa/018-CGI-pathinfo3.py, qa/094-URL-request.py, 78 qa/110-Priority4.py, qa/123-ImplicitRedit.py, 79 qa/099-htpasswd-plain.py, qa/050-HeadBody.py, qa/079-Extension.py, 80 qa/113-HeaderFile.py, qa/074-Access2.py, qa/096-htpasswd-md5.py, 81 qa/084-RedirParamShow.py, qa/049-NN-broken.py, 82 qa/064-DirectoryIndex.py, qa/030-Post+urlencoded.py, 83 qa/068-PathInfo2.py, qa/069-PathInfo3.py, qa/092-Digest3.py, 84 qa/095-htpasswd-apache-md5.py, qa/067-PathInfo.py, qa/048-NN.py, 85 qa/039-Auth-Basic.py, qa/105-If-Range.py, 86 qa/130-Digest-EmptyPasswd.py, qa/115-Respin.py, 87 qa/103-ScriptName.py, qa/129-Basic-EmptyPasswd.py, 88 qa/114-HeaderFile2.py, qa/106-If-Range2.py, 89 qa/036-DocumentRoot-common.py, qa/090-Digest.py, 90 qa/078-AccessAny.py, qa/100-Digest-htdigest.py: Rewritten using 91 the new configuration file syntax. 92 93 2006-04-15 Alvaro Lopez Ortega <alvaro@alobbs.com> 94 95 * cherokee/handler_dirlist.c (cherokee_handler_dirlist_add_headers): 96 Added charset entry into Content-Type header. 97 98 2006-04-12 Alvaro Lopez Ortega <alvaro@alobbs.com> 99 100 * cherokee/main.c (common_server_initialization): PID file must to 101 written before the server changes its user identity. 102 103 * cherokee.1, cherokee_logrotate.1, doc/develop/Intro.txt, README, 104 sites-default.sample.pre, windows/cherokee.nsi.in: URL poiting to 105 alobbs.com has been fixed to point to 0x50.org. Patch by Gunnar 106 Wolf <gwolf@gwolf.org> 107 1 108 2006-04-08 Rodrigo Fernandez-Vizarra <rfdzvizarra@yahoo.ie> 2 109 … … 13 120 * cherokee/downloader.h: Added interface to query the status of a 14 121 download 122 123 2006-04-07 Alvaro Lopez Ortega <alvaro@alobbs.com> 124 125 * cherokee/buffer.c (cherokee_buffer_dup): New method. 126 127 2006-04-05 Alvaro Lopez Ortega <alvaro@alobbs.com> 128 129 * cherokee/macros.h (equal_str, equal_buf_str): Added new macros 130 131 2006-04-04 Alvaro Lopez Ortega <alvaro@alobbs.com> 132 133 * cherokee/module_loader.c, 134 cherokee/module_loader.h (cherokee_module_loader_get): New method. 135 136 * cherokee/icons.c (cherokee_icons_configure): Added. 137 138 * cherokee/icons.h, 139 cherokee/icons.c (cherokee_icons_read_config_file, 140 cherokee_icons_read_config_string): Removed. 15 141 16 142 2006-04-03 Alvaro Lopez Ortega <alvaro@alobbs.com> cherokee/trunk/Makefile.am
r237 r269 93 93 @$(mkinstalldirs) $(DESTDIR)$(cherokeeconfdir)/sites-available 94 94 @if test -f $(DESTDIR)$(cherokeeconfdir)/cherokee.conf ; then \ 95 echo "$@ will not overwrite existing $( cherokeeconfdir)/cherokee.conf"; \95 echo "$@ will not overwrite existing $(DESTDIR)$(cherokeeconfdir)/cherokee.conf"; \ 96 96 else \ 97 97 $(INSTALL_DATA) $(top_builddir)/cherokee.conf.sample $(DESTDIR)$(cherokeeconfdir)/cherokee.conf; \ 98 98 fi 99 99 @if test -f $(DESTDIR)$(cherokeeconfdir)/advanced.conf ; then \ 100 echo "$@ will not overwrite existing $( cherokeeconfdir)/advanced.conf"; \100 echo "$@ will not overwrite existing $(DESTDIR)$(cherokeeconfdir)/advanced.conf"; \ 101 101 else \ 102 102 $(INSTALL_DATA) $(top_builddir)/advanced.conf.sample $(DESTDIR)$(cherokeeconfdir)/advanced.conf; \ 103 103 fi 104 104 @if test -f $(DESTDIR)$(cherokeeconfdir)/icons.conf ; then \ 105 echo "$@ will not overwrite existing $( cherokeeconfdir)/icons.conf"; \105 echo "$@ will not overwrite existing $(DESTDIR)$(cherokeeconfdir)/icons.conf"; \ 106 106 else \ 107 107 $(INSTALL_DATA) $(top_srcdir)/icons.conf.sample $(DESTDIR)$(cherokeeconfdir)/icons.conf; \ 108 108 fi 109 109 @if test -f $(DESTDIR)$(cherokeeconfdir)/mime.types ; then \ 110 echo "$@ will not overwrite existing $( cherokeeconfdir)/mime.types"; \110 echo "$@ will not overwrite existing $(DESTDIR)$(cherokeeconfdir)/mime.types"; \ 111 111 else \ 112 112 $(INSTALL_DATA) $(top_srcdir)/mime.types.sample $(DESTDIR)$(cherokeeconfdir)/mime.types; \ 113 113 fi 114 114 @if test -f $(DESTDIR)$(cherokeeconfdir)/mime.compression.types ; then \ 115 echo "$@ will not overwrite existing $( cherokeeconfdir)/mime.compression.types"; \115 echo "$@ will not overwrite existing $(DESTDIR)$(cherokeeconfdir)/mime.compression.types"; \ 116 116 else \ 117 117 $(INSTALL_DATA) $(top_srcdir)/mime.compression.types.sample $(DESTDIR)$(cherokeeconfdir)/mime.compression.types; \ … … 121 121 fi 122 122 @if test -f $(DESTDIR)$(cherokeeconfdir)/sites-available/default ; then \ 123 echo "$@ will not overwrite existing $( cherokeeconfdir)/sites-available/default"; \123 echo "$@ will not overwrite existing $(DESTDIR)$(cherokeeconfdir)/sites-available/default"; \ 124 124 else \ 125 125 $(INSTALL_DATA) $(top_builddir)/sites-default.sample $(DESTDIR)$(cherokeeconfdir)/sites-available/default; \ … … 127 127 fi 128 128 @if test -f $(DESTDIR)$(cherokeeconfdir)/sites-available/example.com ; then \ 129 echo "$@ will not overwrite existing $( cherokeeconfdir)/sites-available/example.com"; \129 echo "$@ will not overwrite existing $(DESTDIR)$(cherokeeconfdir)/sites-available/example.com"; \ 130 130 else \ 131 131 $(INSTALL_DATA) $(top_builddir)/sites-example.sample $(DESTDIR)$(cherokeeconfdir)/sites-available/example.com; \ 132 132 fi 133 133 @if test -f $(DESTDIR)$(cherokeeconfdir)/mods-available/ssl ; then \ 134 echo "$@ will not overwrite existing $( cherokeeconfdir)/mods-available/ssl"; \134 echo "$@ will not overwrite existing $(DESTDIR)$(cherokeeconfdir)/mods-available/ssl"; \ 135 135 else \ 136 136 $(INSTALL_DATA) $(top_builddir)/mods-ssl.sample $(DESTDIR)$(cherokeeconfdir)/mods-available/ssl; \ 137 137 fi 138 138 @if test -f $(DESTDIR)$(cherokeeconfdir)/mods-available/admin ; then \ 139 echo "$@ will not overwrite existing $( cherokeeconfdir)/mods-available/admin"; \139 echo "$@ will not overwrite existing $(DESTDIR)$(cherokeeconfdir)/mods-available/admin"; \ 140 140 else \ 141 141 $(INSTALL_DATA) $(top_srcdir)/mods-admin.sample $(DESTDIR)$(cherokeeconfdir)/mods-available/admin; \ cherokee/trunk/README
r187 r269 2 2 =================== 3 3 4 A mailing-list cherokee@ alobbs.comis available, to subscribe:5 http:// alobbs.com/cgi-bin/mailman/listinfo/cherokee4 A mailing-list cherokee@0x50.org is available, to subscribe: 5 http://0x50.org/cgi-bin/mailman/listinfo/cherokee 6 6 7 7 The list archive is at: cherokee/trunk/cherokee.1
r31 r269 44 44 There is a mailing list for discussion among Cherokee users and for 45 45 announcements of new and test versions. To join, send a message to 46 cherokee-admin@ alobbs.comwith the line:46 cherokee-admin@0x50.org with the line: 47 47 .PP 48 48 .B subscribe cherokee 49 49 .PP 50 in the body of the message. The submission address is cherokee@ alobbs.com.50 in the body of the message. The submission address is cherokee@0x50.org. 51 51 .\" .SH "SEE ALSO" 52 52 .\" cherokee.conf (8) cherokee/trunk/cherokee/Makefile.am
r257 r269 42 42 zlib/zutil.h 43 43 44 dict_src = \45 dict/dict_generic.h \46 dict/dict_generic.c \47 dict/sp_tree.h \48 dict/sp_tree.c \49 dict/dict_private.h50 51 avl_src = \52 avl/avl.h \53 avl/avl.c54 55 44 pcre_src = \ 56 45 pcre/get.c \ … … 93 82 -export-dynamic \ 94 83 $(module_ldflags_w32) 95 96 97 #98 # Config stuff99 #100 module_read_config = \101 read_config_grammar.y \102 read_config_scanner.l \103 module_read_config.h \104 module_read_config.c105 106 libplugin_read_config_la_LDFLAGS = $(module_ldflags)107 libplugin_read_config_la_SOURCES = $(module_read_config)108 109 if STATIC_MODULE_READ_CONFIG110 static_module_read_config_src = $(module_read_config)111 else112 dynamic_module_read_config_lib = libplugin_read_config.la113 endif114 84 115 85 … … 553 523 endif 554 524 555 556 557 #558 # Yacc and Lex paramters559 # -d Generate .h file560 # -l Don't use #line561 # -t Debug562 AM_YFLAGS=-d -l -t563 AM_LFLAGS=-i564 525 565 526 … … 649 610 650 611 libcherokee_base_la_SOURCES = \ 651 $(avl_src) \652 612 $(zlib_src) \ 653 $(dict_src) \654 613 $(internal_pcre_src) \ 655 614 $(internal_getopt_src) \ … … 662 621 $(win32_src) \ 663 622 cherokee.h \ 623 avl.h \ 624 avl.c \ 664 625 http.h \ 665 626 http.c \ 666 627 list.h \ 667 list_merge_sort.h \ 668 list_merge_sort.c \ 628 list.c \ 669 629 list_ext.h \ 670 630 list_ext.c \ … … 681 641 buffer.c \ 682 642 table.h \ 683 table-protected.h \684 643 table.c \ 685 dict.h \686 dict.c \687 644 buffer_escape.h \ 688 645 buffer_escape.c \ … … 713 670 header-protected.h \ 714 671 header.c \ 715 session_cache.h \716 session_cache.c \717 672 access.h \ 718 673 access.c \ … … 758 713 759 714 libcherokee_server_la_SOURCES = \ 760 icons_grammar.y \761 icons_scanner.l \762 \763 $(static_module_read_config_src) \764 715 $(static_handler_file_src) \ 765 716 $(static_handler_admin_src) \ … … 797 748 config_entry.h \ 798 749 config_entry.c \ 750 virtual_entries.h \ 751 virtual_entries.c \ 799 752 dirs_table.h \ 800 753 dirs_table.c \ … … 859 812 mime_entry.h \ 860 813 list.h \ 861 list_merge_sort.h \862 814 url.h \ 863 815 header.h \ … … 880 832 881 833 882 # automake isn't too clever about "non-standard" use of lex and yacc883 # Icons:884 icons_scanner.c : icons_scanner.l885 $(LEX) -Pyy_icons_ -i -o$@ $<886 887 icons_grammar.h : icons_grammar.c888 icons_grammar.c : icons_grammar.y889 $(YACC) -dv -p yy_icons_ -o $@ $<890 891 892 834 # 893 835 # Cherokee plugins … … 895 837 plugindir = "$(libdir)/cherokee" 896 838 plugin_LTLIBRARIES = \ 897 $(dynamic_module_read_config_lib) \898 839 $(dynamic_handler_cgi_lib) \ 899 840 $(dynamic_handler_phpcgi_lib) \ … … 959 900 960 901 CLEANFILES = \ 961 read_config_grammar.h \962 read_config_grammar.c \963 read_config_scanner.c \964 icons_grammar.h \965 icons_grammar.c \966 icons_scanner.c \967 902 config.h 968 903 … … 989 924 $(WINDOWS_PORT_FILES) \ 990 925 $(EMBEDDED_VERSION_FILES) \ 991 read_config_grammar.h \992 926 loader.autoconf.h \ 993 927 loader.autoconf.inc cherokee/trunk/cherokee/access.c
r122 r269 65 65 66 66 typedef struct { 67 struct list_headnode;67 list_t node; 68 68 69 69 ip_type_t type; cherokee/trunk/cherokee/admin_server.c
r122 r269 147 147 cherokee_admin_server_reply_get_connections (cherokee_handler_admin_t *ahdl, cherokee_buffer_t *question, cherokee_buffer_t *reply) 148 148 { 149 ret_t ret;150 list_t *i, *tmp;151 cherokee_server_t *server = HANDLER_SRV(ahdl);152 LIST_HEAD(connections);149 ret_t ret; 150 list_t *i, *tmp; 151 list_t connections = LIST_HEAD_INIT(connections); 152 cherokee_server_t *server = HANDLER_SRV(ahdl); 153 153 154 154 /* Get the connection info list cherokee/trunk/cherokee/buffer.c
r234 r269 104 104 } 105 105 106 107 106 void 108 107 cherokee_buffer_swap_buffers (cherokee_buffer_t *buf, cherokee_buffer_t *second) … … 123 122 second->len = tmp_len; 124 123 second->size = tmp_size; 124 } 125 126 ret_t 127 cherokee_buffer_dup (cherokee_buffer_t *buf, cherokee_buffer_t **dup) 128 { 129 CHEROKEE_NEW_STRUCT(n, buffer); 130 131 n->buf = (char *) malloc(buf->len + 1); 132 if (unlikely(n->buf == NULL)) return ret_nomem; 133 134 memcpy (n->buf, buf->buf, buf->len + 1); 135 136 n->len = buf->len; 137 n->size = buf->len + 1; 138 139 *dup = n; 140 return ret_ok; 125 141 } 126 142 cherokee/trunk/cherokee/buffer.h
r122 r269 58 58 59 59 60 61 62 60 ret_t cherokee_buffer_new (cherokee_buffer_t **buf); 63 61 ret_t cherokee_buffer_free (cherokee_buffer_t *buf); 64 62 ret_t cherokee_buffer_clean (cherokee_buffer_t *buf); 63 ret_t cherokee_buffer_dup (cherokee_buffer_t *buf, cherokee_buffer_t **dup); 65 64 66 65 ret_t cherokee_buffer_init (cherokee_buffer_t *buf); cherokee/trunk/cherokee/cherokee.h
r257 r269 40 40 #include <cherokee/mime_entry.h> 41 41 #include <cherokee/mime.h> 42 #include <cherokee/list.h>43 #include <cherokee/list_merge_sort.h>44 42 #include <cherokee/url.h> 45 43 #include <cherokee/header.h> cherokee/trunk/cherokee/cherokee_show.c
r257 r269 47 47 cuint_t port; 48 48 cherokee_buffer_t buf; 49 LIST_HEAD(conns);49 list_t conns = LIST_HEAD_INIT(conns); 50 50 51 51 if (argc <= 1) { cherokee/trunk/cherokee/config_entry.c
r155 r269 59 59 entry->validator_new_func = NULL; 60 60 entry->validator_properties = NULL; 61 entry->auth_realm = NULL; 61 62 62 63 entry->access = NULL; … … 65 66 66 67 entry->document_root = NULL; 67 entry->auth_realm = NULL;68 68 entry->users = NULL; 69 69 … … 97 97 if (entry->auth_realm != NULL) { 98 98 cherokee_buffer_free (entry->auth_realm); 99 entry-> auth_realm= NULL;99 entry->document_root = NULL; 100 100 } 101 101 … … 104 104 entry->users = NULL; 105 105 } 106 106 107 107 108 free (entry); … … 259 260 return ret_ok; 260 261 } 262 263 264 ret_t 265 cherokee_config_entry_print (cherokee_config_entry_t *entry) 266 { 267 printf ("parent: %p\n", entry->parent); 268 printf ("priority: %d\n", entry->priority); 269 printf ("document_root: %s\n", entry->document_root ? entry->document_root->buf : ""); 270 printf ("only_secure: %d\n", entry->only_secure); 271 printf ("access: %p\n", entry->access); 272 printf ("handler_new %p\n", entry->handler_new_func); 273 printf ("http_met