Permalink
Browse files

Merged mochiweb branch back into trunk.

git-svn-id: https://svn.apache.org/repos/asf/incubator/couchdb/trunk@648222 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information...
1 parent 53968dd commit 39de3072bcf9fdeec6d3faeb125924c401242205 @cmlenz cmlenz committed Apr 15, 2008
Showing with 6,270 additions and 23,449 deletions.
  1. +1 −1 NOTICE
  2. +1 −1 bin/couchdb.tpl.in
  3. +1 −2 configure.ac
  4. +2 −11 etc/couchdb/Makefile.am
  5. +6 −2 etc/couchdb/couch.ini.tpl.in
  6. +1 −1 share/www/style/layout.css
  7. +1 −1 src/Makefile.am
  8. +0 −177 src/couch_inets/Makefile.am
  9. +0 −84 src/couch_inets/couch_inets.app
  10. +0 −1,597 src/couch_inets/ftp.erl
  11. +0 −19 src/couch_inets/ftp_internal.hrl
  12. +0 −125 src/couch_inets/ftp_progress.erl
  13. +0 −190 src/couch_inets/ftp_response.erl
  14. +0 −57 src/couch_inets/ftp_sup.erl
  15. +0 −396 src/couch_inets/http.erl
  16. +0 −126 src/couch_inets/http_base_64.erl
  17. +0 −289 src/couch_inets/http_chunk.erl
  18. +0 −389 src/couch_inets/http_cookie.erl
  19. +0 −105 src/couch_inets/http_internal.hrl
  20. +0 −278 src/couch_inets/http_request.erl
  21. +0 −206 src/couch_inets/http_response.erl
  22. +0 −291 src/couch_inets/http_transport.erl
  23. +0 −113 src/couch_inets/http_uri.erl
  24. +0 −171 src/couch_inets/http_util.erl
  25. +0 −953 src/couch_inets/httpc_handler.erl
  26. +0 −87 src/couch_inets/httpc_internal.hrl
  27. +0 −475 src/couch_inets/httpc_manager.erl
  28. +0 −193 src/couch_inets/httpc_request.erl
  29. +0 −320 src/couch_inets/httpc_response.erl
  30. +0 −70 src/couch_inets/httpc_sup.erl
  31. +0 −516 src/couch_inets/httpd.erl
  32. +0 −78 src/couch_inets/httpd.hrl
  33. +0 −155 src/couch_inets/httpd_acceptor.erl
  34. +0 −84 src/couch_inets/httpd_acceptor_sup.erl
  35. +0 −122 src/couch_inets/httpd_cgi.erl
  36. +0 −720 src/couch_inets/httpd_conf.erl
  37. +0 −106 src/couch_inets/httpd_esi.erl
  38. +0 −143 src/couch_inets/httpd_example.erl
  39. +0 −193 src/couch_inets/httpd_instance_sup.erl
  40. +0 −829 src/couch_inets/httpd_manager.erl
  41. +0 −89 src/couch_inets/httpd_misc_sup.erl
  42. +0 −337 src/couch_inets/httpd_request.erl
  43. +0 −516 src/couch_inets/httpd_request_handler.erl
  44. +0 −377 src/couch_inets/httpd_response.erl
  45. +0 −141 src/couch_inets/httpd_script_env.erl
  46. +0 −62 src/couch_inets/httpd_socket.erl
  47. +0 −137 src/couch_inets/httpd_sup.erl
  48. +0 −718 src/couch_inets/httpd_util.erl
  49. +0 −34 src/couch_inets/inets.erl
  50. +0 −28 src/couch_inets/inets_app.erl
  51. +0 −27 src/couch_inets/inets_internal.hrl
  52. +0 −106 src/couch_inets/inets_sup.erl
  53. +0 −92 src/couch_inets/mod_actions.erl
  54. +0 −180 src/couch_inets/mod_alias.erl
  55. +0 −784 src/couch_inets/mod_auth.erl
  56. +0 −27 src/couch_inets/mod_auth.hrl
  57. +0 −228 src/couch_inets/mod_auth_dets.erl
  58. +0 −282 src/couch_inets/mod_auth_mnesia.erl
  59. +0 −295 src/couch_inets/mod_auth_plain.erl
  60. +0 −374 src/couch_inets/mod_auth_server.erl
  61. +0 −247 src/couch_inets/mod_browser.erl
  62. +0 −331 src/couch_inets/mod_cgi.erl
  63. +0 −281 src/couch_inets/mod_dir.erl
  64. +0 −396 src/couch_inets/mod_disk_log.erl
  65. +0 −432 src/couch_inets/mod_esi.erl
  66. +0 −125 src/couch_inets/mod_get.erl
  67. +0 −73 src/couch_inets/mod_head.erl
  68. +0 −1,075 src/couch_inets/mod_htaccess.erl
  69. +0 −594 src/couch_inets/mod_include.erl
  70. +0 −253 src/couch_inets/mod_log.erl
  71. +0 −416 src/couch_inets/mod_range.erl
  72. +0 −301 src/couch_inets/mod_responsecontrol.erl
  73. +0 −294 src/couch_inets/mod_security.erl
  74. +0 −628 src/couch_inets/mod_security_server.erl
  75. +0 −87 src/couch_inets/mod_trace.erl
  76. +0 −310 src/couch_inets/tftp.erl
  77. +0 −47 src/couch_inets/tftp.hrl
  78. +0 −181 src/couch_inets/tftp_binary.erl
  79. +0 −1,121 src/couch_inets/tftp_engine.erl
  80. +0 −338 src/couch_inets/tftp_file.erl
  81. +0 −418 src/couch_inets/tftp_lib.erl
  82. +0 −81 src/couch_inets/tftp_sup.erl
  83. +4 −4 src/couchdb/Makefile.am
  84. +1 −1 src/couchdb/cjson.erl
  85. +2 −3 src/couchdb/couch.app.tpl.in
  86. +11 −4 src/couchdb/couch_db.erl
  87. +1 −2 src/couchdb/couch_doc.erl
  88. +832 −0 src/couchdb/couch_httpd.erl
  89. +9 −0 src/couchdb/couch_rep.erl
  90. +12 −6 src/couchdb/couch_server_sup.erl
  91. +0 −890 src/couchdb/mod_couch.erl
  92. +75 −0 src/mochiweb/Makefile.am
  93. +75 −0 src/mochiweb/mochihex.erl
  94. +529 −0 src/mochiweb/mochijson.erl
  95. +509 −0 src/mochiweb/mochijson2.erl
  96. +289 −0 src/mochiweb/mochinum.erl
  97. +29 −0 src/mochiweb/mochiweb.app
  98. +101 −0 src/mochiweb/mochiweb.erl
  99. +20 −0 src/mochiweb/mochiweb_app.erl
  100. +295 −0 src/mochiweb/mochiweb_charref.erl
  101. +250 −0 src/mochiweb/mochiweb_cookies.erl
  102. +31 −0 src/mochiweb/mochiweb_echo.erl
  103. +178 −0 src/mochiweb/mochiweb_headers.erl
  104. +760 −0 src/mochiweb/mochiweb_html.erl
  105. +132 −0 src/mochiweb/mochiweb_http.erl
  106. +428 −0 src/mochiweb/mochiweb_multipart.erl
  107. +700 −0 src/mochiweb/mochiweb_request.erl
  108. +52 −0 src/mochiweb/mochiweb_response.erl
  109. +71 −0 src/mochiweb/mochiweb_skel.erl
  110. +234 −0 src/mochiweb/mochiweb_socket_server.erl
  111. +34 −0 src/mochiweb/mochiweb_sup.erl
  112. +486 −0 src/mochiweb/mochiweb_util.erl
  113. +107 −0 src/mochiweb/reloader.erl
View
2 NOTICE
@@ -15,6 +15,6 @@ Supporting software:
* m4/ac_check_icu.m4 - Copyright 2005 Akos Maroy <darkeye@tyrell.hu>
* share/www/script/jquery.js - Copyright 2008 John Resig
* share/www/script/json2.js - Public domain
- * src/couch_inets - Copyright 1999 Ericsson Utvecklings AB
+ * src/mochiweb - Copyright 2007 Mochi Media, Inc.
[1]: http://www.apache.org/
View
@@ -223,7 +223,7 @@ start_couchdb () {
command="`%ICU_CONFIG% --invoke` \
%ERL% $interactive_option -sasl errlog_type error \
-pa %erlanglibdir%/couch-%version%/ebin \
- %erlanglibdir%/couch_inets-4.7.5/ebin \
+ %erlanglibdir%/mochiweb-r64/ebin \
-eval \"application:load(couch)\" \
-eval \"couch_server:start(), receive done -> done end.\" \
-couchini $INI_FILE"
View
@@ -215,7 +215,6 @@ AC_CONFIG_FILES([bin/couchjs.tpl])
AC_CONFIG_FILES([bin/couchdb.tpl])
AC_CONFIG_FILES([bin/Makefile])
AC_CONFIG_FILES([etc/couchdb/Makefile])
-AC_CONFIG_FILES([etc/couchdb/couch_httpd.conf.tpl])
AC_CONFIG_FILES([etc/couchdb/couch.ini.tpl])
AC_CONFIG_FILES([etc/default/couchdb.tpl])
AC_CONFIG_FILES([etc/default/Makefile])
@@ -227,9 +226,9 @@ AC_CONFIG_FILES([etc/logrotate.d/couchdb.tpl])
AC_CONFIG_FILES([etc/logrotate.d/Makefile])
AC_CONFIG_FILES([etc/Makefile])
AC_CONFIG_FILES([share/Makefile])
-AC_CONFIG_FILES([src/couch_inets/Makefile])
AC_CONFIG_FILES([src/couchdb/couch.app.tpl])
AC_CONFIG_FILES([src/couchdb/Makefile])
+AC_CONFIG_FILES([src/mochiweb/Makefile])
AC_CONFIG_FILES([src/Makefile])
AC_CONFIG_FILES([var/Makefile])
View
@@ -12,11 +12,9 @@
datarootdir = @prefix@/share
-pkgconf_DATA = couch.ini couch_httpd.conf
+pkgconf_DATA = couch.ini
-nobase_dist_pkgconf_DATA = conf/mime.types
-
-CLEANFILES = $(pkgconf_DATA) $(dist_pkgconf_DATA)
+CLEANFILES = $(pkgconf_DATA)
transform = @program_transform_name@
couchjs_command_name = `echo couchjs | sed '$(transform)'`
@@ -32,10 +30,3 @@ couch.ini: couch.ini.tpl
-e "s|%couchprivlibdir%|$(couchprivlibdir)|g" \
-e "s|%couchjs_command_name%|$(couchjs_command_name)|g" \
< $< > $@
-
-couch_httpd.conf: couch_httpd.conf.tpl
- sed -e "s|%pkgconfdir%|@pkgconfdir@|g" \
- -e "s|%pkgdatadir%|@pkgdatadir@|g" \
- -e "s|%pkgstatelogdir%|@pkgstatelogdir@|g" \
- < $< > $@
-
@@ -6,9 +6,13 @@ ConsoleStartupMsg=Apache CouchDB is starting.
DbRootDir=%pkgstatelibdir%
-LogFile=%pkgstatelogdir%/couch.log
+Port=5984
+
+BindAddress=127.0.0.1
-HttpConfigFile=%pkgconfdir%/couch_httpd.conf
+DocumentRoot=%pkgdatadir%/www
+
+LogFile=%pkgstatelogdir%/couch.log
UtilDriverDir=%couchprivlibdir%
@@ -382,7 +382,7 @@ ul.suggest-dropdown li.selected { cursor: pointer; background: Highlight;
#tests tbody.content td.status { background-position: 5px 8px;
background-repeat: no-repeat; color: #999; padding-left: 20px;
}
-#tests tbody.content td.details { width: 50%; overflow: auto; }
+#tests tbody.content td.details { width: 50%; }
#tests tbody.content td.details a { border-bottom: 1px dashed #ccc;
color: #999; float: right; font-size: 85%;
}
View
@@ -12,4 +12,4 @@
datarootdir = @prefix@/share
-SUBDIRS = couch_inets couchdb
+SUBDIRS = couchdb mochiweb
View
@@ -1,177 +0,0 @@
-## Licensed under the Apache License, Version 2.0 (the "License"); you may not
-## use this file except in compliance with the License. You may obtain a copy
-## of the License at
-##
-## http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-## WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-## License for the specific language governing permissions and limitations
-## under the License.
-
-datarootdir = @prefix@/share
-
-couchinetsebindir = $(erlanglibdir)/couch_inets-4.7.5/ebin
-couchinetsincludedir = $(erlanglibdir)/couch_inets-4.7.5/include
-
-couchinets_file_collection = \
- ftp.erl \
- ftp_progress.erl \
- ftp_response.erl \
- ftp_sup.erl \
- http_base_64.erl \
- httpc_handler.erl \
- http_chunk.erl \
- httpc_manager.erl \
- http_cookie.erl \
- httpc_request.erl \
- httpc_response.erl \
- httpc_sup.erl \
- httpd_acceptor.erl \
- httpd_acceptor_sup.erl \
- httpd_cgi.erl \
- httpd_conf.erl \
- httpd.erl \
- httpd_esi.erl \
- httpd_example.erl \
- httpd_instance_sup.erl \
- httpd_manager.erl \
- httpd_misc_sup.erl \
- httpd_request.erl \
- httpd_request_handler.erl \
- httpd_response.erl \
- httpd_script_env.erl \
- httpd_socket.erl \
- httpd_sup.erl \
- httpd_util.erl \
- http.erl \
- http_request.erl \
- http_response.erl \
- http_transport.erl \
- http_uri.erl \
- http_util.erl \
- inets_app.erl \
- inets.erl \
- inets_sup.erl \
- mod_actions.erl \
- mod_alias.erl \
- mod_auth_dets.erl \
- mod_auth.erl \
- mod_auth_mnesia.erl \
- mod_auth_plain.erl \
- mod_auth_server.erl \
- mod_browser.erl \
- mod_cgi.erl \
- mod_dir.erl \
- mod_disk_log.erl \
- mod_esi.erl \
- mod_get.erl \
- mod_head.erl \
- mod_htaccess.erl \
- mod_include.erl \
- mod_log.erl \
- mod_range.erl \
- mod_responsecontrol.erl \
- mod_security.erl \
- mod_security_server.erl \
- mod_trace.erl \
- tftp_binary.erl \
- tftp_engine.erl \
- tftp.erl \
- tftp_file.erl \
- tftp_lib.erl \
- tftp_sup.erl
-
-couchinetsebin_static_file = couch_inets.app
-
-couchinetsebin_generated_file_list = \
- ftp.beam \
- ftp_progress.beam \
- ftp_response.beam \
- ftp_sup.beam \
- http_base_64.beam \
- http.beam \
- httpc_handler.beam \
- http_chunk.beam \
- httpc_manager.beam \
- http_cookie.beam \
- httpc_request.beam \
- httpc_response.beam \
- httpc_sup.beam \
- httpd_acceptor.beam \
- httpd_acceptor_sup.beam \
- httpd.beam \
- httpd_cgi.beam \
- httpd_conf.beam \
- httpd_esi.beam \
- httpd_example.beam \
- httpd_instance_sup.beam \
- httpd_manager.beam \
- httpd_misc_sup.beam \
- httpd_request.beam \
- httpd_request_handler.beam \
- httpd_response.beam \
- httpd_script_env.beam \
- httpd_socket.beam \
- httpd_sup.beam \
- httpd_util.beam \
- http_request.beam \
- http_response.beam \
- http_transport.beam \
- http_uri.beam \
- http_util.beam \
- inets_app.beam \
- inets.beam \
- inets_sup.beam \
- mod_actions.beam \
- mod_alias.beam \
- mod_auth.beam \
- mod_auth_dets.beam \
- mod_auth_mnesia.beam \
- mod_auth_plain.beam \
- mod_auth_server.beam \
- mod_browser.beam \
- mod_cgi.beam \
- mod_dir.beam \
- mod_disk_log.beam \
- mod_esi.beam \
- mod_get.beam \
- mod_head.beam \
- mod_htaccess.beam \
- mod_include.beam \
- mod_log.beam \
- mod_range.beam \
- mod_responsecontrol.beam \
- mod_security.beam \
- mod_security_server.beam \
- mod_trace.beam \
- tftp.beam \
- tftp_binary.beam \
- tftp_engine.beam \
- tftp_file.beam \
- tftp_lib.beam \
- tftp_sup.beam
-
-couchinetsinclude_DATA = \
- ftp_internal.hrl \
- httpc_internal.hrl \
- httpd.hrl \
- http_internal.hrl \
- inets_internal.hrl \
- mod_auth.hrl \
- tftp.hrl
-
-couchinetsebin_DATA = \
- $(couchinetsebin_static_file) \
- $(couchinetsebin_generated_file_list)
-
-EXTRA_DIST = \
- $(couchinets_file_collection) \
- $(couchinetsinclude_DATA) \
- $(couchinetsebin_static_file)
-
-CLEANFILES = $(couchinetsebin_generated_file_list)
-
-%.beam: %.erl
- erlc $<
@@ -1,84 +0,0 @@
-{application,couch_inets,
- [{description,"Couch INETS"},
- {vsn,"4.7.5"},
- {modules,[
- inets,
- inets_sup,
- inets_app,
-
- %% FTP
- ftp,
- ftp_progress,
- ftp_response,
- ftp_sup,
-
- %% HTTP client:
- http,
- httpc_handler,
- httpc_manager,
- httpc_request,
- httpc_response,
- httpc_sup,
- http_cookie,
- http_uri,
-
- %% HTTP used by both client and server
- http_base_64,
- http_chunk,
- http_request,
- http_response,
- http_transport,
- http_util,
-
- %% HTTP server:
- httpd,
- httpd_acceptor,
- httpd_acceptor_sup,
- httpd_cgi,
- httpd_conf,
- httpd_esi,
- httpd_example,
- httpd_instance_sup,
- httpd_manager,
- httpd_misc_sup,
- httpd_request,
- httpd_request_handler,
- httpd_response,
- httpd_script_env,
- httpd_socket,
- httpd_sup,
- httpd_util,
- mod_actions,
- mod_alias,
- mod_auth,
- mod_auth_dets,
- mod_auth_mnesia,
- mod_auth_plain,
- mod_auth_server,
- mod_browser,
- mod_cgi,
- mod_dir,
- mod_disk_log,
- mod_esi,
- mod_get,
- mod_head,
- mod_htaccess,
- mod_include,
- mod_log,
- mod_range,
- mod_responsecontrol,
- mod_security,
- mod_security_server,
- mod_trace,
-
- %% TFTP
- tftp,
- tftp_binary,
- tftp_engine,
- tftp_file,
- tftp_lib,
- tftp_sup
- ]},
- {registered,[inets_sup, httpc_manager]},
- {applications,[kernel,stdlib]},
- {mod,{inets_app,[]}}]}.
Oops, something went wrong.

0 comments on commit 39de307

Please sign in to comment.