noreply at github
Apr 17, 2013, 6:14 PM
Post #1 of 1
(105 views)
Permalink
|
|
[cherokee/webserver] 5c9e81: Merge branch 'master' of github.com:cherokee/webse...
|
|
Branch: refs/heads/go-pro-embedded-cherokee-server--master-base
Home: https://github.com/cherokee/webserver
Commit: 5c9e81ad9a15150e645ca4a4b719c7bf4dbfac8f
https://github.com/cherokee/webserver/commit/5c9e81ad9a15150e645ca4a4b719c7bf4dbfac8f
Author: M. David Peterson <m.david [at] 3rdandUrban>
Date: 2013-04-17 (Wed, 17 Apr 2013)
Changed paths:
R .gitmodules
R README
A README.rst
M admin/About.py
M admin/Auth.py
M admin/Balancer.py
R admin/CTK
A admin/CTK/AUTHORS
A admin/CTK/CTK-run.pre
A admin/CTK/CTK/AjaxUpload.py
A admin/CTK/CTK/Box.py
A admin/CTK/CTK/Button.py
A admin/CTK/CTK/Carousel.py
A admin/CTK/CTK/Checkbox.py
A admin/CTK/CTK/Collapsible.py
A admin/CTK/CTK/Combobox.py
A admin/CTK/CTK/Config.py
A admin/CTK/CTK/Container.py
A admin/CTK/CTK/DatePicker.py
A admin/CTK/CTK/Dialog.py
A admin/CTK/CTK/Downloader.py
A admin/CTK/CTK/Druid.py
A admin/CTK/CTK/HTTP.py
A admin/CTK/CTK/Help.py
A admin/CTK/CTK/HiddenField.py
A admin/CTK/CTK/Image.py
A admin/CTK/CTK/Indenter.py
A admin/CTK/CTK/Init.py
A admin/CTK/CTK/JS.py
A admin/CTK/CTK/Link.py
A admin/CTK/CTK/List.py
A admin/CTK/CTK/MailHTML.py
A admin/CTK/CTK/Makefile.am
A admin/CTK/CTK/Notice.py
A admin/CTK/CTK/Page.py
A admin/CTK/CTK/PageCleaner.py
A admin/CTK/CTK/Paginator.py
A admin/CTK/CTK/Plugin.py
A admin/CTK/CTK/Post.py
A admin/CTK/CTK/ProgressBar.py
A admin/CTK/CTK/PropsTable.py
A admin/CTK/CTK/Proxy.py
A admin/CTK/CTK/Radio.py
A admin/CTK/CTK/RawHTML.py
A admin/CTK/CTK/Refreshable.py
A admin/CTK/CTK/Server.py
A admin/CTK/CTK/SortableList.py
A admin/CTK/CTK/StarRating.py
A admin/CTK/CTK/Submitter.py
A admin/CTK/CTK/Tab.py
A admin/CTK/CTK/Table.py
A admin/CTK/CTK/Template.py
A admin/CTK/CTK/TextArea.py
A admin/CTK/CTK/TextField.py
A admin/CTK/CTK/ToggleButton.py
A admin/CTK/CTK/Uploader.py
A admin/CTK/CTK/Widget.py
A admin/CTK/CTK/XMLRPCProxy.py
A admin/CTK/CTK/__init__.py
A admin/CTK/CTK/consts.py
A admin/CTK/CTK/i18n.py
A admin/CTK/CTK/iPhoneToggle.py
A admin/CTK/CTK/json_embedded.py
A admin/CTK/CTK/pyscgi.py
A admin/CTK/CTK/util.py
A admin/CTK/LICENSE
A admin/CTK/MANIFEST.in
A admin/CTK/Makefile.am
A admin/CTK/README
A admin/CTK/setup.py
A admin/CTK/static/Makefile.am
A admin/CTK/static/css/CTK.css
A admin/CTK/static/css/Makefile.am
A admin/CTK/static/css/datepicker.css
A admin/CTK/static/css/jquery-ui-1.7.2.custom.css
A admin/CTK/static/css/jquery.ibutton.css
A admin/CTK/static/images/Makefile.am
A admin/CTK/static/images/arrow_ns.png
A admin/CTK/static/images/bg-dialog-buttonpane.png
A admin/CTK/static/images/bg-dialog-titlebar-close.gif
A admin/CTK/static/images/bg-dialog-titlebar.png
A admin/CTK/static/images/bg-dialog.png
A admin/CTK/static/images/bg-filter.png
A admin/CTK/static/images/bg-sel-actions-sel.png
A admin/CTK/static/images/bg-sel-actions.png
A admin/CTK/static/images/carousel-left-arrow.png
A admin/CTK/static/images/carousel-right-arrow.png
A admin/CTK/static/images/del-hover.png
A admin/CTK/static/images/del.png
A admin/CTK/static/images/dialog-error.png
A admin/CTK/static/images/dialog-information.png
A admin/CTK/static/images/dialog-warning.png
A admin/CTK/static/images/forbid.png
A admin/CTK/static/images/ibutton-slider-default.png
A admin/CTK/static/images/input-bg.png
A admin/CTK/static/images/jquery.ui.stars.gif
A admin/CTK/static/images/loader.gif
A admin/CTK/static/images/loading.gif
A admin/CTK/static/images/off.png
A admin/CTK/static/images/offline.png
A admin/CTK/static/images/on.png
A admin/CTK/static/images/online.png
A admin/CTK/static/images/tabbg.png
A admin/CTK/static/images/tick.png
A admin/CTK/static/images/ui-bg_gloss-wave_35_f6a828_500x100.png
A admin/CTK/static/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
A admin/CTK/static/images/ui-icons_222222_256x240.png
A admin/CTK/static/images/ui-icons_2e83ff_256x240.png
A admin/CTK/static/images/ui-icons_454545_256x240.png
A admin/CTK/static/images/ui-icons_888888_256x240.png
A admin/CTK/static/images/ui-icons_cd0a0a_256x240.png
A admin/CTK/static/images/uploadify.cancel.png
A admin/CTK/static/js/Carousel.js
A admin/CTK/static/js/Help.js
A admin/CTK/static/js/Makefile.am
A admin/CTK/static/js/StarRating.js
A admin/CTK/static/js/Submitter.js
A admin/CTK/static/js/ajaxupload.3.6.js
A admin/CTK/static/js/common.js
A admin/CTK/static/js/jquery-1.3.2.js
A admin/CTK/static/js/jquery-1.3.2.min.js
A admin/CTK/static/js/jquery-ui-1.7.2.custom.min.js
A admin/CTK/static/js/jquery-ui-1.7.2.js
A admin/CTK/static/js/jquery.cookie.js
A admin/CTK/static/js/jquery.form-defaults.js
A admin/CTK/static/js/jquery.ibutton.js
A admin/CTK/static/js/jquery.tablednd_0_5.js
A admin/CTK/static/js/jquery.uploadProgress.js
A admin/CTK/tests/cherokee.conf.orig
A admin/CTK/tests/druid-submits.py
A admin/CTK/tests/run.py
A admin/CTK/tests/test1.py
A admin/CTK/tests/test11.py
A admin/CTK/tests/test14.py
A admin/CTK/tests/test15.py
A admin/CTK/tests/test16.py
A admin/CTK/tests/test19.py
A admin/CTK/tests/test1_env.py
A admin/CTK/tests/test2-login.py
A admin/CTK/tests/test22.py
A admin/CTK/tests/test2_post.py
A admin/CTK/tests/test3.py
A admin/CTK/tests/test5.py
A admin/CTK/tests/test6.py
A admin/CTK/tests/test7.py
M admin/Certs.py
M admin/CgiBase.py
M admin/Cherokee.py
M admin/Flags.py
M admin/Graph.py
M admin/Handler.py
M admin/Icons.py
M admin/Makefile.am
M admin/Mime.py
R admin/OWS_Backup.py
R admin/OWS_Cherokee_Info.py
R admin/OWS_Login.py
R admin/OWS_Market_Info.py
M admin/Page.py
M admin/PageAdvanced.py
M admin/PageEntry.py
M admin/PageError.py
M admin/PageException.py
M admin/PageGeneral.py
M admin/PageHelp.py
M admin/PageIndex.py
M admin/PageNewConfig.py
M admin/PageRule.py
M admin/PageSource.py
M admin/PageSources.py
M admin/PageStatus.py
M admin/PageVServer.py
M admin/PageVServers.py
M admin/Rule.py
M admin/RuleSimple.py
M admin/SaveButton.py
M admin/SavingChecks.py
M admin/SelectionPanel.py
M admin/SystemInfo.py
M admin/SystemStats.py
M admin/SystemStatsWidgets.py
M admin/Wizard.py
M admin/XMLServerDigest.py
M admin/config_version.py
M admin/configured.py.pre
M admin/consts.py
R admin/market/CommandProgress.py
R admin/market/Distro.py
R admin/market/Install.py
R admin/market/InstallUtil.py
R admin/market/Install_Log.py
R admin/market/Library.py
R admin/market/Maintenance.py
R admin/market/Makefile.am
R admin/market/Menu.py
R admin/market/PageApp.py
R admin/market/PageCategory.py
R admin/market/PageIndex.py
R admin/market/PageSearch.py
R admin/market/Report.py
R admin/market/Review.py
R admin/market/Util.py
R admin/market/__init__.py
R admin/market/ows_consts.py
M admin/plugins/admin.py
M admin/plugins/authlist.py
M admin/plugins/bind.py
M admin/plugins/cgi.py
M admin/plugins/common.py
M admin/plugins/custom_error.py
M admin/plugins/dbslayer.py
M admin/plugins/deflate.py
M admin/plugins/directory.py
M admin/plugins/dirlist.py
M admin/plugins/drop.py
M admin/plugins/empty_gif.py
M admin/plugins/error_nn.py
M admin/plugins/error_redir.py
M admin/plugins/evhost.py
M admin/plugins/exists.py
M admin/plugins/extensions.py
M admin/plugins/failover.py
M admin/plugins/fcgi.py
M admin/plugins/file.py
M admin/plugins/from.py
M admin/plugins/fullpath.py
M admin/plugins/geoip.py
M admin/plugins/gzip.py
M admin/plugins/header.py
M admin/plugins/htdigest.py
M admin/plugins/htpasswd.py
M admin/plugins/ip_hash.py
M admin/plugins/ldap.py
M admin/plugins/method.py
M admin/plugins/mysql.py
M admin/plugins/pam.py
M admin/plugins/plain.py
M admin/plugins/post_report.py
M admin/plugins/post_track.py
M admin/plugins/proxy.py
M admin/plugins/redir.py
M admin/plugins/rehost.py
M admin/plugins/request.py
M admin/plugins/round_robin.py
M admin/plugins/rrd.py
M admin/plugins/scgi.py
M admin/plugins/secdownload.py
M admin/plugins/server_info.py
M admin/plugins/ssi.py
M admin/plugins/streaming.py
M admin/plugins/target_ip.py
M admin/plugins/tls.py
M admin/plugins/url_arg.py
M admin/plugins/uwsgi.py
M admin/plugins/wildcard.py
M admin/popen.py
M admin/server.py
M admin/static/css/cherokee-admin.css
M admin/static/images/Makefile.am
R admin/static/images/market.png
M admin/static/images/other/Makefile.am
A admin/static/images/other/github.png
A admin/static/images/other/googleplus.png
R admin/static/images/sidebar-market.png
M admin/static/js/SelectionPanel.js
M admin/theme.html
M admin/upgrade_config.py
M admin/util.py
M admin/wizards/List.py
M admin/wizards/alfresco.py
M admin/wizards/coldfusion.py
M admin/wizards/concrete5.py
M admin/wizards/django.py
M admin/wizards/flcache.py
M admin/wizards/glassfish.py
M admin/wizards/hotlinking.py
M admin/wizards/icons.py
M admin/wizards/mailman.py
M admin/wizards/mono.py
M admin/wizards/php.py
M admin/wizards/rails.py
M admin/wizards/redirect.py
M admin/wizards/rtorrent.py
M admin/wizards/ssl_test.py
M admin/wizards/static.py
M admin/wizards/streaming.py
M admin/wizards/symfony.py
M admin/wizards/uwsgi.py
M admin/wizards/zend.py
M autogen.sh
M cget/Makefile.am
M cget/main.c
M cget/proxy.c
M cget/proxy.h
M cherokee.conf.sample.pre
M cherokee.spec.in
M cherokee/Makefile.am
M cherokee/access.c
M cherokee/access.h
M cherokee/admin_request.c
M cherokee/admin_request.h
M cherokee/admin_server.c
M cherokee/admin_server.h
M cherokee/avl.c
M cherokee/avl.h
M cherokee/avl_flcache.c
M cherokee/avl_flcache.h
M cherokee/avl_generic.c
M cherokee/avl_generic.h
M cherokee/avl_r.c
M cherokee/avl_r.h
M cherokee/balancer.c
M cherokee/balancer.h
M cherokee/balancer_failover.c
M cherokee/balancer_failover.h
M cherokee/balancer_ip_hash.c
M cherokee/balancer_ip_hash.h
M cherokee/balancer_round_robin.c
M cherokee/balancer_round_robin.h
M cherokee/bind.c
M cherokee/bind.h
M cherokee/bogotime.c
M cherokee/bogotime.h
M cherokee/buffer.c
M cherokee/buffer.h
M cherokee/cache.c
M cherokee/cache.h
M cherokee/cacheline.c
M cherokee/cacheline.h
M cherokee/cherokee-admin-launcher
M cherokee/cherokee-macos-askpass
M cherokee/cherokee-tweak
M cherokee/cherokee.h
M cherokee/cherokee_show.c
M cherokee/collector.c
M cherokee/collector.h
M cherokee/collector_rrd.c
M cherokee/collector_rrd.h
M cherokee/common-internal.h
M cherokee/common.h
M cherokee/config_entry.c
M cherokee/config_entry.h
M cherokee/config_node.c
M cherokee/config_node.h
M cherokee/config_reader.c
M cherokee/config_reader.h
M cherokee/connection-protected.h
M cherokee/connection.c
M cherokee/connection.h
M cherokee/connection_info.c
M cherokee/connection_info.h
M cherokee/cryptor.c
M cherokee/cryptor.h
M cherokee/cryptor_libssl.c
M cherokee/cryptor_libssl.h
M cherokee/downloader-protected.h
M cherokee/downloader.c
M cherokee/downloader.h
M cherokee/downloader_async.c
M cherokee/downloader_async.h
M cherokee/dtm.c
M cherokee/dtm.h
M cherokee/dwriter.c
M cherokee/dwriter.h
M cherokee/encoder.c
M cherokee/encoder.h
M cherokee/encoder_deflate.c
M cherokee/encoder_deflate.h
M cherokee/encoder_gzip.c
M cherokee/encoder_gzip.h
M cherokee/error_log.c
M cherokee/error_log.h
M cherokee/errors.py
M cherokee/fdpoll-epoll.c
M cherokee/fdpoll-kqueue.c
M cherokee/fdpoll-poll.c
M cherokee/fdpoll-port.c
M cherokee/fdpoll-protected.h
M cherokee/fdpoll-select.c
R cherokee/fdpoll-win32.c
M cherokee/fdpoll.c
M cherokee/fdpoll.h
M cherokee/flcache.c
M cherokee/flcache.h
M cherokee/gen_evhost.c
M cherokee/gen_evhost.h
M cherokee/handler.c
M cherokee/handler.h
M cherokee/handler_admin.c
M cherokee/handler_admin.h
M cherokee/handler_cgi.c
M cherokee/handler_cgi.h
M cherokee/handler_cgi_base.c
M cherokee/handler_cgi_base.h
M cherokee/handler_common.c
M cherokee/handler_common.h
M cherokee/handler_custom_error.c
M cherokee/handler_custom_error.h
M cherokee/handler_dbslayer.c
M cherokee/handler_dbslayer.h
M cherokee/handler_dirlist.c
M cherokee/handler_dirlist.h
M cherokee/handler_drop.c
M cherokee/handler_drop.h
M cherokee/handler_empty_gif.c
M cherokee/handler_empty_gif.h
M cherokee/handler_error.c
M cherokee/handler_error.h
M cherokee/handler_error_nn.c
M cherokee/handler_error_nn.h
M cherokee/handler_error_redir.c
M cherokee/handler_error_redir.h
M cherokee/handler_fcgi.c
M cherokee/handler_fcgi.h
M cherokee/handler_file.c
M cherokee/handler_file.h
M cherokee/handler_post_report.c
M cherokee/handler_post_report.h
M cherokee/handler_proxy.c
M cherokee/handler_proxy.h
M cherokee/handler_redir.c
M cherokee/handler_redir.h
M cherokee/handler_render_rrd.c
M cherokee/handler_render_rrd.h
M cherokee/handler_scgi.c
M cherokee/handler_scgi.h
M cherokee/handler_secdownload.c
M cherokee/handler_secdownload.h
M cherokee/handler_server_info.c
M cherokee/handler_server_info.h
M cherokee/handler_ssi.c
M cherokee/handler_ssi.h
M cherokee/handler_streaming.c
M cherokee/handler_streaming.h
M cherokee/handler_uwsgi.c
M cherokee/handler_uwsgi.h
M cherokee/header-protected.h
M cherokee/header.c
M cherokee/header.h
M cherokee/header_op.c
M cherokee/header_op.h
M cherokee/http.c
M cherokee/http.h
M cherokee/human_strcmp.c
M cherokee/human_strcmp.h
M cherokee/icons.c
M cherokee/icons.h
M cherokee/info.c
M cherokee/info.h
M cherokee/init.c
M cherokee/init.h
M cherokee/iocache.c
M cherokee/iocache.h
M cherokee/limiter.c
M cherokee/limiter.h
M cherokee/list.c
M cherokee/list.h
M cherokee/logger-protected.h
M cherokee/logger.c
M cherokee/logger.h
M cherokee/logger_combined.c
M cherokee/logger_combined.h
M cherokee/logger_custom.c
M cherokee/logger_custom.h
M cherokee/logger_ncsa.c
M cherokee/logger_ncsa.h
M cherokee/logger_writer.c
M cherokee/logger_writer.h
M cherokee/macros.h
M cherokee/main.c
M cherokee/main_admin.c
M cherokee/main_worker.c
M cherokee/match.c
M cherokee/match.h
M cherokee/md5crypt.c
M cherokee/mime-protected.h
M cherokee/mime.c
M cherokee/mime.h
M cherokee/mime_entry.c
M cherokee/mime_entry.h
M cherokee/module.c
M cherokee/module.h
M cherokee/ncpus.h
M cherokee/nonce.c
M cherokee/nonce.h
M cherokee/nullable.h
M cherokee/plugin.h
M cherokee/plugin_loader.c
M cherokee/plugin_loader.h
M cherokee/post.c
M cherokee/post.h
M cherokee/post_track.c
M cherokee/post_track.h
M cherokee/proxy_hosts.c
M cherokee/proxy_hosts.h
M cherokee/regex.c
M cherokee/regex.h
M cherokee/request.c
M cherokee/request.h
M cherokee/resolv_cache.c
M cherokee/resolv_cache.h
M cherokee/rrd_tools.c
M cherokee/rrd_tools.h
M cherokee/rule.c
M cherokee/rule.h
M cherokee/rule_and.c
M cherokee/rule_and.h
M cherokee/rule_bind.c
M cherokee/rule_bind.h
M cherokee/rule_default.c
M cherokee/rule_default.h
M cherokee/rule_directory.c
M cherokee/rule_directory.h
M cherokee/rule_exists.c
M cherokee/rule_exists.h
M cherokee/rule_extensions.c
M cherokee/rule_extensions.h
M cherokee/rule_from.c
M cherokee/rule_from.h
M cherokee/rule_fullpath.c
M cherokee/rule_fullpath.h
M cherokee/rule_geoip.c
M cherokee/rule_geoip.h
M cherokee/rule_header.c
M cherokee/rule_header.h
M cherokee/rule_list.c
M cherokee/rule_list.h
M cherokee/rule_method.c
M cherokee/rule_method.h
M cherokee/rule_not.c
M cherokee/rule_not.h
M cherokee/rule_or.c
M cherokee/rule_or.h
M cherokee/rule_request.c
M cherokee/rule_request.h
M cherokee/rule_tls.c
M cherokee/rule_tls.h
M cherokee/rule_url_arg.c
M cherokee/rule_url_arg.h
M cherokee/server-protected.h
M cherokee/server.c
M cherokee/server.h
M cherokee/shm.c
M cherokee/shm.h
M cherokee/socket.c
M cherokee/socket.h
M cherokee/socket_lowlevel.h
M cherokee/source.c
M cherokee/source.h
M cherokee/source_interpreter.c
M cherokee/source_interpreter.h
M cherokee/spawner.c
M cherokee/spawner.h
M cherokee/template.c
M cherokee/template.h
M cherokee/thread.c
M cherokee/thread.h
M cherokee/threading.c
M cherokee/threading.h
M cherokee/trace.c
M cherokee/trace.h
R cherokee/unix4win32.c
R cherokee/unix4win32.h
M cherokee/url.c
M cherokee/url.h
M cherokee/util.c
M cherokee/util.h
M cherokee/validator.c
M cherokee/validator.h
M cherokee/validator_authlist.c
M cherokee/validator_authlist.h
M cherokee/validator_file.c
M cherokee/validator_file.h
M cherokee/validator_htdigest.c
M cherokee/validator_htdigest.h
M cherokee/validator_htpasswd.c
M cherokee/validator_htpasswd.h
M cherokee/validator_ldap.c
M cherokee/validator_ldap.h
M cherokee/validator_mysql.c
M cherokee/validator_mysql.h
M cherokee/validator_pam.c
M cherokee/validator_pam.h
M cherokee/validator_plain.c
M cherokee/validator_plain.h
M cherokee/version.c
M cherokee/version.h
M cherokee/virtual_server.c
M cherokee/virtual_server.h
M cherokee/vrule.c
M cherokee/vrule.h
M cherokee/vrule_or.c
M cherokee/vrule_or.h
M cherokee/vrule_rehost.c
M cherokee/vrule_rehost.h
M cherokee/vrule_target_ip.c
M cherokee/vrule_target_ip.h
M cherokee/vrule_wildcard.c
M cherokee/vrule_wildcard.h
R cherokee/win32_cherokeeserv.c
R cherokee/win32_cservice.c
R cherokee/win32_cservice.h
R cherokee/win32_misc.c
R cherokee/win32_misc.h
M cherokee/xrealip.c
M cherokee/xrealip.h
A configure.ac
R configure.in
M contrib/tracelor.py
A contributing.md
M dbslayer/mysql_wrap.php
M doc/Makefile.am
M doc/basics.txt
M doc/basics_download.txt
M doc/basics_installation.txt
A doc/basics_installation_freebsd.txt
A doc/basics_installation_git.txt
R doc/basics_installation_svn.txt
M doc/basics_installation_unix.txt
M doc/build/asciidoc.py
M doc/build/build_web.sh
M doc/cookbook_cross_compilation.txt
M doc/cookbook_dbslayer.txt
M doc/cookbook_drupal.txt
M doc/dev_quickstart.txt
M doc/index.txt
M doc/other_bundle_cherokee-admin.txt
M doc/other_community.txt
M doc/other_faq.txt
M doc/test_images.py
M doc/test_links.py
M http-cherokee.xml.pre
M m4/po.m4
M packages/Makefile.am
R packages/windows/Makefile.am
R packages/windows/cherokee.ico
R packages/windows/cherokee.nsi.in
R packages/windows/cherokee.reg
R packages/windows/cherokee_pkg.ico
R packages/windows/install.bat
M po/admin/ca.po
M po/admin/de.po
M po/admin/en.po
M po/admin/es.po
M po/admin/fr.po
M po/admin/generate_POTFILESin.py
M po/admin/gl.po
M po/admin/it.po
M po/admin/jp.po
M po/admin/nl.po
M po/admin/pl.po
M po/admin/pt_BR.po
M po/admin/sv_SE.po
M po/admin/zh_CN.po
M po/po_stats.py
A qa/295-custom-error-cgi.py
A qa/296-EVHost4.py
A qa/297-EVHost5.py
A qa/298-Timeout.py
A qa/299-MethodsRequestBodyHandling.py
A qa/TODO
M qa/base.py
M qa/conf.py.pre
M qa/fcgi.py
M qa/run-tests.py
Log Message:
-----------
Merge branch 'master' of github.com:cherokee/webserver into go-pro-embedded-cherokee-server--v1.2.101-base
Conflicts:
cherokee/handler_streaming.c
_______________________________________________
Cherokee-commits mailing list
Cherokee-commits [at] lists
http://lists.octality.com/listinfo/cherokee-commits
|
