Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

whitespace cleanup

Remove all trailing whitespace from all text files. Some bot sent
Klacke and me a pull request saying it had done this for us, but I
reviewed the diffs and it was affecting lines that shouldn't have been
affected, so perl and I did it ourselves instead.
  • Loading branch information...
commit 781124719103b96a11de55cfc790911e587bb2b3 1 parent 1b8546f
@vinoski vinoski authored
Showing with 847 additions and 847 deletions.
  1. +91 −91 ChangeLog
  2. +16 −16 LICENSE
  3. +2 −2 README.pkg-config
  4. +5 −5 README.win32-cygwin
  5. +5 −5 applications/chat/chat/chat.js
  6. +1 −1  applications/chat/chat/chat.yaws
  7. +1 −1  applications/chat/chat/chat_write.yaws
  8. +1 −1  applications/chat/include.mk
  9. +2 −2 applications/chat/src/Makefile
  10. +4 −4 applications/mail/README
  11. +3 −3 applications/mail/TODO
  12. +1 −1  applications/mail/include.mk
  13. +1 −1  applications/mail/mail/login.yaws
  14. +4 −4 applications/mail/mail/mail.js
  15. +2 −2 applications/mail/mail/reply.yaws
  16. +1 −1  applications/mail/mail/send.yaws
  17. +2 −2 applications/mail/src/Makefile
  18. +1 −1  applications/mail/src/mail_vsn.template
  19. +1 −1  applications/mail/src/yaws-webmail.conf
  20. +9 −9 applications/wiki/README
  21. +1 −1  applications/wiki/include.mk
  22. +3 −3 applications/wiki/scripts/Makefile
  23. +2 −2 applications/wiki/src/Makefile
  24. +1 −1  applications/wiki/src/wiki_vsn.template
  25. +1 −1  applications/wiki/wiki.conf
  26. +1 −1  applications/wiki/wiki/WikiPreferences.files/custom.css
  27. +18 −18 applications/wiki/wiki/WikiPreferences.files/template.html
  28. +19 −19 applications/wiki/wiki/WikiPreferences.files/template_info.html
  29. +1 −1  applications/wiki/wiki/searchPage.yaws
  30. +1 −1  applications/wiki/wiki/storePage.yaws
  31. +3 −3 applications/yapp/README
  32. +2 −2 applications/yapp/examples/README
  33. +4 −4 applications/yapp/examples/yapp_ex_1/priv/docroot/index.yaws
  34. +4 −4 applications/yapp/priv/docroot/add.yaws
  35. +4 −4 applications/yapp/priv/docroot/add_post.yaws
  36. +4 −4 applications/yapp/priv/docroot/index.yaws
  37. +6 −6 applications/yapp/priv/docroot/remove.yaws
  38. +7 −7 applications/yapp/priv/docroot/remove_post.yaws
  39. +5 −5 applications/yapp/priv/docroot/stil.css
  40. +1 −1  applications/yapp/src/Makefile
  41. +15 −15 c_src/epam.c
  42. +7 −7 c_src/hashtable.c
  43. +15 −15 c_src/hashtable.h
  44. +6 −6 c_src/hashtable_private.h
  45. +2 −2 c_src/setuid_drv.c
  46. +2 −2 doc/Makefile
  47. +6 −6 doc/README.rss
  48. +2 −2 doc/overview.edoc
  49. +52 −52 man/yaws.conf.5
  50. +1 −1  man/yaws_soap_lib.5
  51. +14 −14 priv/envelope.xsd
  52. +20 −20 priv/soap.xsd
  53. +41 −41 priv/wsdl.xsd
  54. +1 −1  src/yaws_exhtml.erl
  55. +3 −3 src/yaws_log.erl
  56. +3 −3 src/yaws_soap_lib.erl
  57. +3 −3 src/yaws_soap_srv.erl
  58. +2 −2 src/yaws_vsn.template
  59. +2 −2 ssl/mkcert_altname/README
  60. +2 −2 ssl/mkcert_altname/openssl.cnf
  61. +4 −4 win32/Makefile
  62. +1 −1  win32/build.xml.in
  63. +6 −6 win32/include.mk
  64. +3 −3 www/api.yaws
  65. +10 −10 www/arg.yaws
  66. +2 −2 www/arg2.yaws
  67. +11 −11 www/bindings.yaws
  68. +5 −5 www/code.yaws
  69. +29 −29 www/configuration.yaws
  70. +5 −5 www/contact.yaws
  71. +6 −6 www/cookies.yaws
  72. +2 −2 www/doc.yaws
  73. +46 −46 www/dynamic.yaws
  74. +1 −1  www/embed.yaws
  75. +2 −2 www/examples.yaws
  76. +16 −16 www/form.yaws
  77. +5 −5 www/haxe_intro.yaws
  78. +1 −1  www/haxe_sample.yaws
  79. +1 −1  www/icons/README
  80. +1 −1  www/index.yaws
  81. +24 −24 www/internals.yaws
  82. +5 −5 www/json_sample.html
  83. +6 −6 www/json_sample.yaws
  84. +3 −3 www/man.yaws
  85. +4 −4 www/motivation.yaws
  86. +5 −5 www/pcookie.yaws
  87. +8 −8 www/post.yaws
  88. +24 −24 www/privbind.yaws
  89. +4 −4 www/query.yaws
  90. +10 −10 www/readcookie.yaws
  91. +6 −6 www/readpcookie.yaws
  92. +10 −10 www/redirect.yaws
  93. +3 −3 www/session.yaws
  94. +3 −3 www/session1.yaws
  95. +10 −10 www/setcookie.yaws
  96. +6 −6 www/setpcookie.yaws
  97. +1 −1  www/shoppingcart/Makefile
  98. +1 −1  www/shoppingcart/buy.yaws
  99. +1 −1  www/shoppingcart/index.yaws
  100. +1 −1  www/shoppingcart/logout.yaws
  101. +1 −1  www/shoppingcart/shopcart_form.yaws
  102. +7 −7 www/shoppingcart/source.html
  103. +7 −7 www/shoppingcart/style.css
  104. +6 −6 www/simple.yaws
  105. +12 −12 www/soap_intro.yaws
  106. +8 −8 www/ssi.yaws
  107. +1 −1  www/ssi/dynamic.2
  108. +1 −1  www/ssi/dynamic.3
  109. +2 −2 www/static.html
  110. +5 −5 www/stats_ex.yaws
  111. +5 −5 www/stil.css
  112. +5 −5 www/todo.yaws
  113. +4 −4 www/urandom.yaws
  114. +3 −3 www/websockets.yaws
  115. +28 −28 www/websockets_example.yaws
  116. +14 −14 www/yapp_intro.yaws
  117. +2 −2 www/yaws-1.55_to_1.56.patch
  118. +4 −4 www/yman.yaws
View
182 ChangeLog
@@ -343,7 +343,7 @@
* src/yaws.erl, www/embed.yaws: Reworked the start_embedded
functions into three functions.
-
+
start_embedded(DocRoot). start_embedded(DocRoot, SC_KeyValueList).
start_embedded(DocRoot, SC_KeyValueList, GC_KeyValueList).
@@ -373,7 +373,7 @@
2006-09-05 08:56 etnt
* src/yaws.erl: Added start_embedded/1 and start_embedded/4.
-
+
Quick and easy way of starting Yaws in embedded mode. No need for
any start-script switches and no dependencies to Yaws header files.
Just call either start_embedded/1 or start_embedded/4 and you are
@@ -594,7 +594,7 @@
src/yaws_ctl.erl, src/yaws_generated.template, www/code/Makefile,
www/shopingcart/Makefile: added support for 2 additional configure
flags, --disable-pam and --with-extrainclude=DIR
-
+
Worked the Makefiles to properly support DESTDIR. This is useful
for packagers (deb, rpm ...)
@@ -1626,7 +1626,7 @@
connections, so that one SSL negotiation in progress does not
prevent other connections. Also, for the similar reasons, have use
a timeout with SSL accepts.
-
+
The values for the number of processes and the duration of the
timeout are quite arbitrary. They are ok for my low traffic site.
@@ -1721,7 +1721,7 @@
2004-06-11 14:33 klacke
- * two-mode-mode.el, scripts/ntpath.sh:
+ * two-mode-mode.el, scripts/ntpath.sh:
two-mode.el contributed by David Welton
2004-06-10 22:23 jbevemyr
@@ -2339,7 +2339,7 @@
src/yaws_config.erl, src/yaws_server.erl: Support for
`Content-Encoding: deflate' using zlib. This feature has to be
turned on in the server part of yaws.conf (`deflate = true').
-
+
Still experimental and for static files only. Cached files are
compressed just once. Large files are compressed on the fly, and
only if the mime type makes it seem wothwhile (see
@@ -2404,35 +2404,35 @@
and within erl tags). In HTML source %%Key%% is expanded to Value
and within erl tags yaws_api:get_binding(Key) can be used to
extract Value.
-
+
With this addition it is easier to write transparant yaws code
making it easier to to work together with Web people knowing little
or nothing about Erlang.
-
+
A stupid example:
-
+
----
-
+
$ cat ex.yaws <erl> out(A) -> {bindings, [{"A", "foo"}, {"B",
"baz"}]}. </erl> <html> <body> <p>%%A%%</p> <p><font
size="4">%%A%% != %%B%%</font></p> <p>An enormous amount of plain
html source here.</p> <erl> out(A) -> Value =
- yaws_api:binding("A"), {ehtml, {ul, [], [{li, [],
+ yaws_api:binding("A"), {ehtml, {ul, [], [{li, [],
Value}, {li, [], "gazonk"}]}}. </erl>
-
+
%%A%% = %%A%% (hit me) </body> </html>
-
+
----
-
+
Which expands to:
-
+
<html> <body> <p>foo</p> <p><font size="4">foo != baz</font></p>
<p>An enormous amount of plain html source here.</p>
-
+
<ul> <li>foo</li> <li>gazonk</li></ul>
-
+
foo = foo (hit me)
-
+
</body> </html>
2004-01-24 17:33 cschultz
@@ -2449,11 +2449,11 @@
2004-01-18 07:59 lpsmith
* src/yaws_server.erl: Added #arg{} to the out/1 return values.
-
+
Fixed redirect bug when adding a slash to a URL with a query.
-
+
Returns a more informative 400 instead of 403 on malformed urls.
-
+
Cleaned up a bit of debugging code that was left behind.
2004-01-13 21:56 mbj
@@ -2502,8 +2502,8 @@
2003-12-18 21:15 klacke
- * ChangeLog:
-
+ * ChangeLog:
+
prepare for 1.40 release
2003-12-18 17:23 klacke
@@ -2806,7 +2806,7 @@
* src/yaws_server.erl: We now return 403 on relative paths and
other malformed requests.
-
+
Also some small code clean ups. I really wish I had a visual
browser for dataflow analysis... it would make simplifing the code
much easier, as well as give one a quick rundown of code you aren't
@@ -2820,7 +2820,7 @@
* include/yaws.hrl, src/yaws_server.erl: Removed unused fields "q"
and "wwwauth" in the #urltype{} record.
-
+
Removed unused function yaws_server:unflat().
2003-09-09 21:07 jbevemyr
@@ -2845,28 +2845,28 @@
2003-09-08 23:02 lpsmith
- * src/yaws_config.erl:
+ * src/yaws_config.erl:
Removed the code that checks that a directory exists in the case
of:
-
+
<auth> dir= ... </auth>
-
+
as www-authentication is now specified by server path and not
filesystem path.
2003-09-08 22:37 lpsmith
- * src/yaws_server.erl:
+ * src/yaws_server.erl:
WWW-Authentication directories are now specified by server path and
not filesystem path. Code cleanup for www-authentication. Major
authentication enhancements to come.
-
+
Numerous other code cleanups, focusing on reducing the number of
arguments passed to various functions. The biggest change is that
the query part of a URL isn't passed through all the URL-parsing
functions. #urltype.q is now unused, should remove it at some
point in the future.
-
+
We update the ARG record a lot less now.
2003-09-04 13:15 cschultz
@@ -2904,7 +2904,7 @@
2003-08-25 12:06 cschultz
- * doc/yaws.tex, man/yaws_api.5, src/yaws_api.erl:
+ * doc/yaws.tex, man/yaws_api.5, src/yaws_api.erl:
Make call_cgi available in yaws_api.
2003-08-25 11:31 cschultz
@@ -2913,7 +2913,7 @@
2003-08-25 11:29 cschultz
- * include/yaws_api.hrl:
+ * include/yaws_api.hrl:
comment to arg record field `pathinfo'
2003-08-24 22:09 cschultz
@@ -2977,26 +2977,26 @@
2003-08-11 16:57 cschultz
- * src/yaws_cgi.erl:
-
+ * src/yaws_cgi.erl:
+
Now works with partial_post_size set.
2003-08-11 16:54 cschultz
- * src/yaws_server.erl:
-
+ * src/yaws_server.erl:
+
Minor changes to get_client_data.
2003-08-07 01:53 cschultz
- * src/yaws_server.erl:
-
+ * src/yaws_server.erl:
+
Fixed yet another ssl related bug.
2003-08-06 20:03 cschultz
- * src/yaws_cgi.erl:
-
+ * src/yaws_cgi.erl:
+
Added variable HTTP_COOKIE.
2003-08-05 22:27 cschultz
@@ -3005,8 +3005,8 @@
2003-08-03 18:54 cschultz
- * src/yaws_server.erl:
-
+ * src/yaws_server.erl:
+
Yaws files and appmods can return {page, {Options, Page}} instead
of {page, Page}. Options is (an option or) a deep list of options.
At the moment an option is {header, Header}. I thought this might
@@ -3027,20 +3027,20 @@
2003-07-30 23:13 cschultz
- * src/yaws.erl:
+ * src/yaws.erl:
Bug fix regarding my last ci: When sending partial content, set
status code to 206 accordingly.
2003-07-30 22:55 cschultz
- * src/yaws_server.erl:
+ * src/yaws_server.erl:
More faithful access logs in connection with {page, ...}.
2003-07-30 22:11 cschultz
- * include/yaws.hrl, src/yaws.erl, src/yaws_server.erl:
+ * include/yaws.hrl, src/yaws.erl, src/yaws_server.erl:
For GETs on regular files:
-
+
Added support for Content-Range, If-Range, If-Match, expanded
support for If-None-Match.
@@ -3050,13 +3050,13 @@
2003-07-26 00:14 cschultz
- * src/: yaws_server.erl, yaws_ssl.erl:
-
+ * src/: yaws_server.erl, yaws_ssl.erl:
+
Answer bad requests.
2003-07-23 22:59 cschultz
- * src/yaws_ssl.erl:
+ * src/yaws_ssl.erl:
Do not let SSL process die on unrecognized request.
2003-07-23 22:58 cschultz
@@ -3065,13 +3065,13 @@
2003-07-23 22:48 cschultz
- * src/yaws_server.erl:
+ * src/yaws_server.erl:
For forbidden script types return 403, not 404.
2003-07-22 11:49 cschultz
- * include/yaws.hrl, src/yaws_config.erl, src/yaws_server.erl:
-
+ * include/yaws.hrl, src/yaws_config.erl, src/yaws_server.erl:
+
Made allowed script types (yaws, php, cgi) configurable.
2003-07-21 18:24 cschultz
@@ -3086,9 +3086,9 @@
2003-07-17 01:16 cschultz
* include/yaws.hrl, include/yaws_api.hrl, src/Makefile,
- src/mime_type_c.erl, src/yaws_cgi.erl, src/yaws_server.erl:
-
- Added CGI and PHP support. Also for a request like
+ src/mime_type_c.erl, src/yaws_cgi.erl, src/yaws_server.erl:
+
+ Added CGI and PHP support. Also for a request like
/a/b/c.xxx/d/e with xxx being one of `yaws', `cgi' or `php' and
c.xxx being a plain file, /a/b/c.xxx is called with
Arg#arg.pathinfo, respectively the environment variable PATH_INFO,
@@ -3096,18 +3096,18 @@
2003-07-17 01:09 cschultz
- * src/yaws_ls.erl:
+ * src/yaws_ls.erl:
Do not show full path.
2003-07-17 01:06 cschultz
- * scripts/yaws.ss, src/yaws_ctl.erl:
+ * scripts/yaws.ss, src/yaws_ctl.erl:
Added command `-load' to yaws script.
2003-07-17 01:04 cschultz
- * src/: yaws.erl, yaws_ticker.erl:
-
+ * src/: yaws.erl, yaws_ticker.erl:
+
Moved ticker function to separate module to ease purging of module
`yaws'.
@@ -3131,7 +3131,7 @@
2003-07-13 01:31 cschultz
- * include/yaws.hrl, src/yaws.erl, src/yaws_server.erl:
+ * include/yaws.hrl, src/yaws.erl, src/yaws_server.erl:
Log file size for dynamic pages.
2003-07-13 01:17 cschultz
@@ -3153,10 +3153,10 @@
2003-07-12 05:25 lpsmith
* src/yaws_api.erl: Improved path handling: path_norm/1 removes
- all occurences of double slashes and the directories "." and "..".
+ all occurences of double slashes and the directories "." and "..".
url_decode_q_split now calls this function on the path that it
returns.
-
+
This is to fix a variety of www-authenticate related security bugs.
Previously, it was possible to access any www-auth protected
directory by inserting a "/./" before the directory, i.e. by
@@ -3164,7 +3164,7 @@
2003-07-12 01:40 lpsmith
- * src/yaws_404.erl:
+ * src/yaws_404.erl:
Fixed Cross-Site Scripting vunerability by html-quoting the path
displayed in the error message.
@@ -3494,7 +3494,7 @@
user-agent to complete the "combined" log format. It will log - for
either field if it is not supplied. The old logging command has
been retained for backward compatibility.
-
+
Also added code to log the time in localtime, and log the offset in
the apache/Common Log Format. This is significant for anyone using
the logs...
@@ -3810,7 +3810,7 @@
2002-11-25 20:59 lukeg
* src/yaws_api.erl: Moved ehtml_expand in here.
-
+
Added ehtml_expander/1 for fast reusable EHTML templates.
2002-11-25 20:58 lukeg
@@ -4162,7 +4162,7 @@
2002-10-23 14:20 etnt
- * src/yaws_ls.erl: Fixed the indentation of directory listings.
+ * src/yaws_ls.erl: Fixed the indentation of directory listings.
Also, when hoovering over a filename, the size in bytes is
displayed. Finally, a README file is inlined at the bottom, if it
exist.
@@ -4342,7 +4342,7 @@
The problem was that I skipped URL decoding, so you could e.g. read
the source to a Yaws file by saying "foo.yaw%73" instead of
"foo.yaws".
-
+
Now we initially decode the URL but not the query part. The query
part is decoded in yaws_api:parse_query. It can't be done earlier,
because unescaping characters like '&' and '=' would break the
@@ -4548,14 +4548,14 @@
early, causes problems if it unescapes &'s in the query string. Has
to wait until the query is parsed (and it looks like
yaws_api:do_parse_spec does it for us already)
-
+
For redirects, using 302 for HTTP 1.0 browsers because they don't
understand 303. This change is small but noisy since I had to pass
another arg to handle_out_reply (many clauses).
-
+
Added an {ehtml, ...} return type for out/1 functions. It does very
basic tuple->HTML expansions.
-
+
Chunked encoding: skip accumulating 0-length chunks, e.g. when
out/1 returns an empty result, because they look like terminators.
@@ -4679,17 +4679,17 @@
config parameter called partial_post_size which if set to an
integer value will cause the content of the post content to be sent
to the out/1 function in chunks of this size.
-
+
Changed implementation of multipart form data. There is a new
config parameter called partial_post_size which if set to an
integer value will cause the content of the post content to be sent
to the out/1 function in chunks of this size.
-
+
It is possible to get the server to maintain a state on behalf of
the out/1 user by returning {get_more, Cont, State}.
-
+
yaws_api:parse_post_data/1 will return either:
-
+
{cont, Cont, Res} where Res is new result(s) from this segment.
This indicates that there is more data to come and the out/1
function should return {get_more, Cont, User_state} where
@@ -4698,39 +4698,39 @@
parameter called partial_post_size which if set to an integer value
will cause the content of the post content to be sent to the out/1
function in chunks of this size.
-
+
It is possible to get the server to maintain a state on behalf of
the out/1 user by returning {get_more, Cont, State}.
-
+
yaws_api:parse_post_data/1 will now return either:
-
+
{cont, Cont, Res} where Res is new result(s) from this segment.
This indicates that there is more data to come and the out/1
function should return {get_more, Cont, User_state} where
User_state might usefully be a File Descriptor.
-
+
or {result, Res} if this is the last (or only) segment.
-
+
Res is a list of {header, Header} | {part_body, Binary} | {body,
Binary}
-
+
Example usage could be:
-
+
<erl>
-
- out(A) -> case yaws_api:parse_post_data(A) of
- {cont, Cont, Res} -> St = handle_res(A, Res),
- {get_more, Cont, St}; {result, Res} ->
+
+ out(A) -> case yaws_api:parse_post_data(A) of
+ {cont, Cont, Res} -> St = handle_res(A, Res),
+ {get_more, Cont, St}; {result, Res} ->
handle_res(A, Res), {html,
f("<pre>Done </pre>",[])} end.
-
- handle_res(A, [{head, Name}|T]) ->
+
+ handle_res(A, [{head, Name}|T]) ->
io:format("head:~p~n",[Name]), handle_res(A, T); handle_res(A,
- [{part_body, Data}|T]) -> io:format("part_body:~p~n",[Data]),
- handle_res(A, T); handle_res(A, [{body, Data}|T]) ->
+ [{part_body, Data}|T]) -> io:format("part_body:~p~n",[Data]),
+ handle_res(A, T); handle_res(A, [{body, Data}|T]) ->
io:format("body:~p~n",[Data]), handle_res(A, T); handle_res(A,
[]) -> io:format("End_res~n").
-
+
</erl>
2002-08-22 18:04 jbevemyr
View
32 LICENSE
@@ -2,26 +2,26 @@
Copyright (c) 2006, Claes Wikstrom, klacke@hyber.org
All rights reserved.
-Redistribution and use in source and binary forms, with or without
+Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
- * Redistributions of source code must retain the above copyright
+ * Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
+ * Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
- * Neither the name of "Yaws" nor the names of its contributors may be
- used to endorse or promote products derived from this software without
+ * Neither the name of "Yaws" nor the names of its contributors may be
+ used to endorse or promote products derived from this software without
specific prior written permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
View
4 README.pkg-config
@@ -9,7 +9,7 @@ $ pkg-config yaws --modversion
1.80
$ pkg-config yaws --cflags
--I/usr/local/lib/yaws/include
+-I/usr/local/lib/yaws/include
$ pkg-config yaws --libs
--pa /usr/local/lib/yaws/ebin
+-pa /usr/local/lib/yaws/ebin
View
10 README.win32-cygwin
@@ -1,14 +1,14 @@
<Note> This is now deprecated as we have a proper
native win32 yaws now.
-
+
Yaws on Cygwin/Windows
Written by Bill Robertsson (billrobertson42@yahoo.com)
Thu May 22 13:24:48 CEST 2008
-To install.
+To install.
You must have cygwin installed. This should include perl,
autoconf and make. There may be other packages that are
@@ -28,7 +28,7 @@ Extract the yaws archive, e.g.
Change to the newly created directory, start bash and run
configure. I recommend you select something other than the
default prefix, because you probably don't want YAWS in your
-cygwin directories.
+cygwin directories.
e.g.
@@ -81,13 +81,13 @@ There is also a section like this.
docroot = c:/bill/erl/yaws/var/yaws/www
listen = 0.0.0.0
dir_listings = true
- <ssl>
+ <ssl>
keyfile = c:/bill/erl/yaws/etc/yaws-key.pem
certfile = c:/bill/erl/yaws/etc/yaws-cert.pem
</ssl>
</server>
-SSL ??
+SSL ??
Untested:
erlang in a directory with spaces in the name (e.g. "Program Files"
View
10 applications/chat/chat/chat.js
@@ -1,9 +1,9 @@
-// -*- Fundamental -*-
+// -*- Fundamental -*-
// File: chat.js (/var/www/chat.js)
// Author: Johan Bevemyr
// Created: Thu Nov 18 18:25:53 2004
-// Purpose:
-
+// Purpose:
+
// Uncomment this to get debug printouts in a separate window.
@@ -113,7 +113,7 @@ function create_xmlhttp() {
if (!xmlhttp && typeof XMLHttpRequest!='undefined')
xmlhttp = new XMLHttpRequest();
-
+
return xmlhttp;
}
@@ -200,7 +200,7 @@ function reader_init() {
xml_reader.onload=h;
}
else {
- xml_reader.onreadystatechange=h;
+ xml_reader.onreadystatechange=h;
}
xml_reader.send(null);
View
2  applications/chat/chat/chat.yaws
@@ -12,7 +12,7 @@ out(A) ->
<script>
function handleEnter(event) {
- if (event == null)
+ if (event == null)
event = window.event;
var keyCode = event.keyCode ? event.keyCode : event.which ?
View
2  applications/chat/chat/chat_write.yaws
@@ -6,5 +6,5 @@ out(A) ->
Error ->
Error
end.
-
+
</erl>
View
2  applications/chat/include.mk
@@ -40,7 +40,7 @@ APPSCRIPT = '$$vsn=shift; $$mods=""; while(@ARGV){ $$_=shift; s/^([A-Z].*)$$/\'\
../ebin/%.app: %.app.src ../vsn.mk Makefile
perl -e $(APPSCRIPT) "$(VSN)" $(MODULES) < $< > $@
-../ebin/%.appup: %.appup
+../ebin/%.appup: %.appup
cp $< $@
../ebin/%.$(EMULATOR): %.erl
View
4 applications/chat/src/Makefile
@@ -12,7 +12,7 @@ MODULES=chat
HDR_FILES=
-EBIN_FILES=$(MODULES:%=../ebin/%.$(EMULATOR))
+EBIN_FILES=$(MODULES:%=../ebin/%.$(EMULATOR))
ERLC_FLAGS+=-W +debug_info $(DEBUG_FLAGS) -I../../../include -pa ../../chat
@@ -20,7 +20,7 @@ ERLC_FLAGS+=-W +debug_info $(DEBUG_FLAGS) -I../../../include -pa ../../chat
# Targets
#
-all: $(EBIN_FILES)
+all: $(EBIN_FILES)
$(EBIN_FILES) : $(HDR_FILES)
View
8 applications/mail/README
@@ -1,7 +1,7 @@
-This is a very basic WebMail application which is completely
-stateless, by design. I didn't want any SQL databases etc
+This is a very basic WebMail application which is completely
+stateless, by design. I didn't want any SQL databases etc
for storing the emails.
The reason for building it was that I needed a local WebMail
@@ -19,7 +19,7 @@ To install
- Modify include.mk for your local paths
-Run 'make' and 'make install'
+Run 'make' and 'make install'
@@ -32,7 +32,7 @@ Run 'make' and 'make install'
Two things need to be edited in /etc/yaws.conf
-1. yaws must find the beam code for mail.beam,
+1. yaws must find the beam code for mail.beam,
By default (include.mk) that gets installed in
/var/yaws/ebin
View
6 applications/mail/TODO
@@ -5,9 +5,9 @@ Things to do
need to select the text part for the quote if the email
is of type multipart/alternative. We select text/html
to display.
- - page large inboxes with 20 emails per page (sorted in
+ - page large inboxes with 20 emails per page (sorted in
reverse order with most recently received emails first)
- - write an attachement cache to limit the delays when
+ - write an attachement cache to limit the delays when
fetching an attachement
- code outgoing emails as quoted-printable (must limit max
line length to 74 according to RFC ???)
@@ -17,5 +17,5 @@ Things to do
- Support imap mail backend system.
- Properly decode encoded attachments.
-
+
View
2  applications/mail/include.mk
@@ -40,7 +40,7 @@ APPSCRIPT = '$$vsn=shift; $$mods=""; while(@ARGV){ $$_=shift; s/^([A-Z].*)$$/\'\
../ebin/%.app: %.app.src ../vsn.mk Makefile
perl -e $(APPSCRIPT) "$(VSN)" $(MODULES) < $< > $@
-../ebin/%.appup: %.appup
+../ebin/%.appup: %.appup
cp $< $@
../ebin/%.$(EMULATOR): %.erl
View
2  applications/mail/mail/login.yaws
@@ -17,4 +17,4 @@ out(A) ->
mail:display_login(A, Reason)
end.
-</erl>
+</erl>
View
8 applications/mail/mail/mail.js
@@ -1,5 +1,5 @@
-/* -*- Java -*-
- *
+/* -*- Java -*-
+ *
* File: mail.js
* Author: Johan Bevemyr
* Created: Sun Feb 15 23:40:56 2004
@@ -35,7 +35,7 @@ function changeActive(depth) {
}
}
-function setComposeCmd(val) {
+function setComposeCmd(val) {
if (document.compose.to.value.length == 0) {
alert('The To: field must not be empty.');
document.compose.to.focus();
@@ -87,7 +87,7 @@ function setComposeCmd(val) {
} else if (document.compose.file10.value.length > 0) {
document.compose.attached.value="yes";
}
-
+
document.compose.cmd.value=val;
document.compose.submit();
}
View
4 applications/mail/mail/reply.yaws
@@ -28,8 +28,8 @@ out(A) ->
Error
end.
-</erl>
-
+</erl>
+
View
2  applications/mail/mail/send.yaws
@@ -8,4 +8,4 @@ out(A) ->
Error
end.
-</erl>
+</erl>
View
4 applications/mail/src/Makefile
@@ -10,7 +10,7 @@ include ../vsn.mk
VSN=$(YAWS_VSN)
MODULES=mail attachment smtp mail_html
-EBIN_FILES=$(MODULES:%=../ebin/%.$(EMULATOR))
+EBIN_FILES=$(MODULES:%=../ebin/%.$(EMULATOR))
ERLC_FLAGS+=-W +debug_info $(DEBUG_FLAGS) -I../../../include -pa ../../mail
@@ -18,7 +18,7 @@ ERLC_FLAGS+=-W +debug_info $(DEBUG_FLAGS) -I../../../include -pa ../../mail
# Targets
#
-all: $(EBIN_FILES)
+all: $(EBIN_FILES)
mail_vsn.erl: mail_vsn.template
. ../vsn.mk; sed "s/%VSN%/${MAIL_VSN}/" < mail_vsn.template > mail_vsn.erl
View
2  applications/mail/src/mail_vsn.template
@@ -5,5 +5,5 @@
version() -> "%VSN%".
-
+
View
2  applications/mail/src/yaws-webmail.conf
@@ -15,7 +15,7 @@ popserver = localhost
smtpserver = localhost
-## maildomin must be set,
+## maildomin must be set,
maildomain = mydomain.org
View
18 applications/wiki/README
@@ -1,11 +1,11 @@
-This Wiki was originally based on Joe Armstrongs wiki implementation.
+This Wiki was originally based on Joe Armstrongs wiki implementation.
It has been ported to yaws and hacked quite a bit in general by Johan
Bevemyr.
To Install
----------
-Edit include.mk (change the WIKIINSTALLDIR and EBININSTALLDIR) then
+Edit include.mk (change the WIKIINSTALLDIR and EBININSTALLDIR) then
make
make install
@@ -13,11 +13,11 @@ make install
Edit your /etc/yaws.conf and include /var/yaws/ebin in the
ebin path ($EBININSTALLDIR), for example
-
+
ebin_dir = /var/yaws/ebin
-It is possible to have several Wiki instances on the same server.
-Just install the wiki/* files in the directory where you want a
+It is possible to have several Wiki instances on the same server.
+Just install the wiki/* files in the directory where you want a
Wiki instance. This is easily done by running the updateWiki script
and give a new directory as argument.
@@ -43,10 +43,10 @@ question marks to create the the page.
Look and feel
-------------
-The layout of the Wiki pages is to a large extent controlled by
-two templates in WikiPreferences.files called template.html
+The layout of the Wiki pages is to a large extent controlled by
+two templates in WikiPreferences.files called template.html
and template_info.html. There is an alternative look and feel
-bundled, just copy template2.html to template.html and
+bundled, just copy template2.html to template.html and
template_info2.html to template_info.html.
To maintain
@@ -58,7 +58,7 @@ updateWiki - takes a number of wiki directories and updates
the .yaws files etc
getPassword - takes a path to a wob file as argument. Will print
- the password associated with that node.
+ the password associated with that node.
importFiles - takes a path to a wob file as argument. Will add
any files in the corresponding .files directory
View
2  applications/wiki/include.mk
@@ -40,7 +40,7 @@ APPSCRIPT = '$$vsn=shift; $$mods=""; while(@ARGV){ $$_=shift; s/^([A-Z].*)$$/\'\
../ebin/%.app: %.app.src ../vsn.mk Makefile
perl -e $(APPSCRIPT) "$(VSN)" $(MODULES) < $< > $@
-../ebin/%.appup: %.appup
+../ebin/%.appup: %.appup
cp $< $@
../ebin/%.$(EMULATOR): %.erl
View
6 applications/wiki/scripts/Makefile
@@ -1,9 +1,9 @@
-# -*- Makefile -*-
+# -*- Makefile -*-
# File: Makefile (/usr/local/src/yaws/yaws/applications/wiki/scripts/Makefile)
# Author: Johan Bevemyr
# Created: Sat May 17 13:15:29 2003
-# Purpose:
-
+# Purpose:
+
include ../include.mk
SCRIPTS=importFiles getPassword updateWiki addFile
View
4 applications/wiki/src/Makefile
@@ -21,7 +21,7 @@ MODULES=wiki \
wiki_plugin_menu \
utils
-EBIN_FILES=$(MODULES:%=../ebin/%.$(EMULATOR))
+EBIN_FILES=$(MODULES:%=../ebin/%.$(EMULATOR))
ERLC_FLAGS+=-W +debug_info $(DEBUG_FLAGS) -I../../../include -pa ../../wiki
@@ -31,7 +31,7 @@ ERLC_FLAGS+=-W +debug_info $(DEBUG_FLAGS) -I../../../include -pa ../../wiki
-all: $(EBIN_FILES)
+all: $(EBIN_FILES)
wiki_vsn.erl: wiki_vsn.template
. ../vsn.mk; sed "s/%VSN%/${WIKI_VSN}/" < wiki_vsn.template > wiki_vsn.erl
View
2  applications/wiki/src/wiki_vsn.template
@@ -5,5 +5,5 @@
version() -> "%VSN%".
-
+
View
2  applications/wiki/wiki.conf
@@ -5,5 +5,5 @@ include_dir = include
<server localhost>
port = 8000
listen = 127.0.0.1
- docroot = wiki
+ docroot = wiki
</server>
View
2  applications/wiki/wiki/WikiPreferences.files/custom.css
@@ -27,4 +27,4 @@ TEXTAREA{
#menuframe {
background: #90EE91;
}
-
+
View
36 applications/wiki/wiki/WikiPreferences.files/template.html
@@ -1,5 +1,5 @@
<html>
-<head>
+<head>
<title> @@NODE@@ </title>
<style type="text/css">
<!--
@@ -9,11 +9,11 @@
</head>
<body>
<table width='100%' border=0>
-<tr>
-<td>
-<table width='100%' border=0>
-<tr>
-<!-- the menu -->
+<tr>
+<td>
+<table width='100%' border=0>
+<tr>
+<!-- the menu -->
<td id="@@MENUID@@" valign='top' width='90%'>
<table width="100%"><tr><td id="menu">
<a href="@@HOME@@"><img border=0 src='WikiPreferences.files/home.gif' alt='Home' title='Go to initial page'></a>&nbsp;&nbsp;
@@ -26,22 +26,22 @@
</td></tr></table>
</td>
</tr>
-<tr>
-<td>
+<tr>
+<td>
<p>&nbsp;<br /></p>
-
+
<!-- the generated page -->
<h1><a href='@@ALLREFS@@'>@@NODE@@</a></h1>
@@DATA@@
<hr /><p>Last Modified: @@MODIFIED@@</p>
-</td>
-</tr>
-</table>
-</td>
-
-<!-- the right hand image -->
-<td width=10 align='right' valign='top'></td>
-</tr>
-</table>
+</td>
+</tr>
+</table>
+</td>
+
+<!-- the right hand image -->
+<td width=10 align='right' valign='top'></td>
+</tr>
+</table>
</body>
</html>
View
38 applications/wiki/wiki/WikiPreferences.files/template_info.html
@@ -1,5 +1,5 @@
<html>
-<head>
+<head>
<title> @@TITLE@@ </title>
<style type="text/css">
<!--
@@ -9,29 +9,29 @@
</head>
<body>
<table width='100%' border=0>
-<tr>
-<td>
-<table width='100%' border=0>
-<tr>
-<!-- the menu -->
+<tr>
+<td>
+<table width='100%' border=0>
+<tr>
+<!-- the menu -->
<td id="@@MENUID@@" valign='top' width='90%'>
</td>
-</tr>
-<tr>
-<td>
+</tr>
+<tr>
+<td>
<p>&nbsp;<br /></p>
-
+
<!-- the generated page -->
<h1>@@HEADER@@</h1>
@@DATA@@
-</td>
-</tr>
-</table>
-</td>
-
-<!-- the right hand image -->
-<td width=10 align='right' valign='top'></td>
-</tr>
-</table>
+</td>
+</tr>
+</table>
+</td>
+
+<!-- the right hand image -->
+<td width=10 align='right' valign='top'></td>
+</tr>
+</table>
</body>
</html>
View
2  applications/wiki/wiki/searchPage.yaws
@@ -4,7 +4,7 @@
out(Arg) ->
F = searchPages,
- if
+ if
Arg#arg.clidata /= undefined ->
%% io:format("post~n"),
wiki_yaws:call_with_post(wiki, F, Arg);
View
2  applications/wiki/wiki/storePage.yaws
@@ -2,7 +2,7 @@
<html>
<erl>
out(Arg) ->
- F = storePage,
+ F = storePage,
wiki_yaws:call_with_multiquery(wiki, F, Arg).
</erl>
</html>
View
6 applications/yapp/README
@@ -1,16 +1,16 @@
An easy way to deploy Yaws applications (Yapps) independently of
each other.
-To compile :
+To compile :
make
-Generate edoc documents :
+Generate edoc documents :
make docs
Install:
make install
You need to have compiled (configured) the Yaws application before
making yapp.
-See the generated documents for more info in how to use the yapp
+See the generated documents for more info in how to use the yapp
application.
The current application uses mnesia so a precondition is that a
schema is generated for the node Yaws is running on.
View
4 applications/yapp/examples/README
@@ -11,7 +11,7 @@ runmod = yapp
arg_rewrite_mod = yapp
<opaque>
yapp_server_id = external
- </opaque>
+ </opaque>
%% add to second <server ..>, that is to <server localhost>
%% note you will only be able to access the yapp admin interface from http://localhost[:port]/yapp/
@@ -19,5 +19,5 @@ runmod = yapp
<opaque>
yapp_server_id = internal
bootstrap_yapps = yapp
- </opaque>
+ </opaque>
View
8 applications/yapp/examples/yapp_ex_1/priv/docroot/index.yaws
@@ -5,7 +5,7 @@
<h3>Yapp simple example</h3>
<p>Yaws applications is built on the OTP application concept, but this does not mean they need to be complex.
In the simplest form an OTP applications is made of a .app description file and the necessary library files. There
-is no need to have application modules (application_app.erl), supervisors, gen_servers etc. unless they are really needed.
+is no need to have application modules (application_app.erl), supervisors, gen_servers etc. unless they are really needed.
</p>
<p>This application is a very simple example and contains only two files:</p>
@@ -17,7 +17,7 @@ yapp_ex_1/priv/docroot/index.yaws - yaws file
<p>The index.yaws file contains this text and the script part:</p>
<pre>
out(A) -&gt;
- Header = "Cache-Control:no-store",
+ Header = "Cache-Control:no-store",
[X] = string:tokens(yapp:prepath(A),"/"),
[{header, Header},
{ehtml, [{p,[], X ++ " there"}]}].
@@ -26,13 +26,13 @@ out(A) -&gt;
<erl>
out(A) ->
- Header = "Cache-Control:no-store",
+ Header = "Cache-Control:no-store",
[X] = string:tokens(yapp:prepath(A),"/"),
[{header, Header},
{ehtml, [{p,[], X ++ " there"}]}].
</erl>
-<p>The default text will be "yapp_ex_1 there" but if you register your yapp under another path, e.g. "hi"
+<p>The default text will be "yapp_ex_1 there" but if you register your yapp under another path, e.g. "hi"
will get another outcome. Note that you can register your yapp under several virtual hosts and use different
dispatch paths.</p>
View
8 applications/yapp/priv/docroot/add.yaws
@@ -13,18 +13,18 @@ format_srvid_radio([ServId|T]) ->
"<input type=\"radio\" name=\"srvid\" value=\"", ServId, "\" />", ServId |
format_srvid_radio(T)].
-
+
out(A) ->
- Header = "Cache-Control:no-store",
+ Header = "Cache-Control:no-store",
[{header, Header}, {html, [ "Server id: ", format_srvid_radio(yapp:get_server_ids())]}].
-
+
</erl>
</p>
<p>Application name: <input type="textfield" name="appname"></p>
<p>Path (optional) : <input type="textfield" name="path"></p>
<p><input type="submit" value="Add Yapp"></p>
</form>
-<p><em>Note:</em> An added Yapp will always be stored in the registry,
+<p><em>Note:</em> An added Yapp will always be stored in the registry,
but if the application is not really in the load path of the Erlang system it will not
be loaded into Yaws server configuration. In such case it will not show up the when listing
the applications in the Yapp console, but it will show up in the Remove list.</p>
View
8 applications/yapp/priv/docroot/add_post.yaws
@@ -13,7 +13,7 @@ get_value(K,P) ->
end.
format(P) ->
- SrvId = get_value("srvid",P),
+ SrvId = get_value("srvid",P),
AppName = get_value("appname",P),
Path = get_value("path",P),
format(SrvId,AppName,Path).
@@ -21,7 +21,7 @@ format(P) ->
format([],_,_) -> error(no_srv_id);
format(_,[],_) -> error(no_appname);
format(S,A,[]) -> format(S,A,"/" ++ A);
-format(S,A,P) ->
+format(S,A,P) ->
case (catch yapp_handler:add(yapp_handler, S, P, list_to_atom(A))) of
ok ->
["Added Server Id: ", S,", AppName: ", A, ", Path: ", P];
@@ -33,10 +33,10 @@ error(no_srv_id) -> "<p>No Server Id selected!</p>";
error(no_appname) -> "<p>No AppName given!</p>";
error(E) -> ["<p>Error adding yapp<pre>", io:format("~p",[E]),"</pre></p>"].
-out(A) ->
+out(A) ->
P = yaws_api:parse_post(A),
-
+
{html, ["<p>",format(P),"</p>"] }.
</erl>
View
8 applications/yapp/priv/docroot/index.yaws
@@ -22,13 +22,13 @@ format_yapps([]) ->
[];
format_yapps([{yapp, Urlpath, Docroot, Appname, Appmods, _Opaque}|T]) ->
[{tr,[],[{td,[],atom_to_list(Appname)}, {td,[], Urlpath},{td,[],Docroot}]} |
- format_yapps(T)].
-
+ format_yapps(T)].
+
out(A) ->
- Header = "Cache-Control:no-store",
+ Header = "Cache-Control:no-store",
[{header, Header},
{ehtml, format_yapp_tables(yapp:get_yapps())}].
-
+
</erl>
<erl>
View
12 applications/yapp/priv/docroot/remove.yaws
@@ -23,21 +23,21 @@ format_yapps(ServId,[]) ->
[];
format_yapps(ServId, [{Urlpath, Appname}|T]) ->
["<tr><td>",
- "<input type=\"radio\" name=\"srvidurlpath\" value=\"", ServId,",",Urlpath, "\" />",
- "</td><td>", atom_to_list(Appname), "</td><td>", Urlpath, "</td></tr>" | format_yapps(ServId, T)].
-
+ "<input type=\"radio\" name=\"srvidurlpath\" value=\"", ServId,",",Urlpath, "\" />",
+ "</td><td>", atom_to_list(Appname), "</td><td>", Urlpath, "</td></tr>" | format_yapps(ServId, T)].
+
out(A) ->
- Header = "Cache-Control:no-store",
+ Header = "Cache-Control:no-store",
[{header,Header},{html, format_yapp_tables(yapp:get_server_ids())}].
-
+
</erl>
<p>
<input type="submit" value="Remove Yapp">
</p>
</form>
<p>The Yapps listed in this page are those stored in the Yapp registry. It excludes the applications
-loaded from yaws.conf with the bootstrap_yapps opaque variable. It will also include those registered
+loaded from yaws.conf with the bootstrap_yapps opaque variable. It will also include those registered
applications that are not available in the Erlang load path, and therefore not shown on the "List" page.</p>
<erl>
View
14 applications/yapp/priv/docroot/remove_post.yaws
@@ -8,18 +8,18 @@ out(A) -> {ssi, "HEAD.inc","%%",[{"remove", "choosen"}]}.
get_value(K,P) ->
case proplists:get_value(K,P) of
undefined -> {"",""};
- V ->
+ V ->
[ServId,Path|_] = string:tokens(string:strip(V),","),
{string:strip(ServId), string:strip(Path)}
end.
format(P) ->
- {SrvId,UrlPath} = get_value("srvidurlpath",P),
+ {SrvId,UrlPath} = get_value("srvidurlpath",P),
format(SrvId,UrlPath).
format([],_) -> error(no_srv_id);
format(_,[]) -> error(no_path);
-format(S,P) ->
+format(S,P) ->
case yapp_handler:remove(yapp_handler, S, P) of
ok ->
["Removed Server Id: ", S,", Path: ", P];
@@ -31,11 +31,11 @@ error(no_srv_id) -> "<p>No Server Id selected!</p>";
error(no_path) -> "<p>No path given!</p>";
error(E) -> ["<p>Error removing yapp<pre>",E,"</pre></p>"].
-out(A) ->
+out(A) ->
P = yaws_api:parse_post(A),
- Header = "Cache-Control:no-store",
- [{header, Header},
- {html, ["<p>",format(P),"</p>",
+ Header = "Cache-Control:no-store",
+ [{header, Header},
+ {html, ["<p>",format(P),"</p>",
"<a href=\"remove.yaws\"> Return to remove page</a>"] },
{ssi,"END.inc",[],[]}].
View
10 applications/yapp/priv/docroot/stil.css
@@ -9,7 +9,7 @@ body {font: 12px Verdana, Arial, Helvetica, sans-serif;
h1 {font-size: 200%; text-transform: lowercase; letter-spacing: 3px;
margin: 0.66em 0 0.33em 3%; padding: 0;}
-h3 {font-size: 133%; margin: 10; padding: 10;
+h3 {font-size: 133%; margin: 10; padding: 10;
border-bottom: 1px solid black;}
h4 {font-size: 100%; margin: 0; padding: 0.33em 0 0;
@@ -39,17 +39,17 @@ div.links {
background: green;
}
-div.box { border: solid; border-width: thin; width: 96%;
+div.box { border: solid; border-width: thin; width: 96%;
background: rgb(211, 211, 211) }
-div.news { border: solid; border-width: thin; width: 96%;
+div.news { border: solid; border-width: thin; width: 96%;
border-bottom: 3px solid black;
margin: 18px 5px 2px 10px;
background: rgb(211, 211, 211) }
div.box pre {margin: 0.66em 0 0.33em 1%; padding: 0;}
-div.man { border: solid; border-width: thin; width: 100%;
+div.man { border: solid; border-width: thin; width: 100%;
font-size: 90%;
margin : 4;
background: rgb(211,211,211) }
@@ -62,7 +62,7 @@ div.none { }
-I { font-size : 12px;
+I { font-size : 12px;
font-family: Times, Verdana, Arial, Helvetica, sans-serif;}
View
2  applications/yapp/src/Makefile
@@ -9,7 +9,7 @@ DEBUG=
EINCLUDE=../include
YAWS_INCL=$(YAWSDIRECTORY)/include
-ERLC_FLAGS+=-W $(DEBUG) -I$(EINCLUDE) -I$(YAWS_INCL)
+ERLC_FLAGS+=-W $(DEBUG) -I$(EINCLUDE) -I$(YAWS_INCL)
MODULES = yapp yapp_app yapp_sup yapp_handler yapp_server yapp_registry \
View
30 c_src/epam.c
@@ -38,11 +38,11 @@ static int read_fill(int fd, unsigned char *buf, int len)
}
-
+
static int write_fill(int fd, char *buf, int len)
{
- int i, done = 0;
-
+ int i, done = 0;
+
do {
if ((i = write(fd, buf+done, len-done)) < 0) {
if (errno != EINTR)
@@ -201,7 +201,7 @@ int misc_conv(int num_msg, const struct pam_message **msgm,
case PAM_TEXT_INFO:
/* should not actually be able to get here... */
free(reply[count].resp);
- }
+ }
reply[count].resp = NULL;
}
/* forget reply too */
@@ -293,7 +293,7 @@ static struct session *del_session(struct session **sp, int sid)
return NULL;
}
-
+
static void do_auth(char *service, char*user, char*pwd, char* mode, int sid)
{
pam_handle_t *pamh=NULL;
@@ -302,20 +302,20 @@ static void do_auth(char *service, char*user, char*pwd, char* mode, int sid)
conv.appdata_ptr = (void*)strdup(pwd);
retval = pam_start(service, user, &conv, &pamh);
-
+
if (retval != PAM_SUCCESS) {
werr(pamh, sid, retval, "start");
return;
}
pam_set_item(pamh, PAM_RUSER, user);
- retval = pam_authenticate(pamh, 0);
+ retval = pam_authenticate(pamh, 0);
if (retval != PAM_SUCCESS) {
werr(pamh, sid, retval, "auth");
return;
}
if (mode[0] == 'A') {
- retval = pam_acct_mgmt(pamh, 0);
+ retval = pam_acct_mgmt(pamh, 0);
if (retval != PAM_SUCCESS) {
werr(pamh, sid, retval, "accounting");
return;
@@ -334,7 +334,7 @@ static void do_auth(char *service, char*user, char*pwd, char* mode, int sid)
werr(pamh, sid, -1, "malloc");
return;
}
- if (mode[1] == 'S')
+ if (mode[1] == 'S')
sessp->session_mode = 1;
else
sessp->session_mode = 0;
@@ -342,7 +342,7 @@ static void do_auth(char *service, char*user, char*pwd, char* mode, int sid)
sessp->pamh = pamh;
sessp->next = sessions;
sessions = sessp;
-
+
wok(sid);
}
@@ -373,27 +373,27 @@ int main(int argc, char *argv[])
if (read_fill(0, buf, rval) != rval)
exit(1);
switch (buf[0]) {
- case 'a':
+ case 'a':
// auth a user
user = (char *)&buf[1];
pwd = user + strlen(user) + 1;
mode= pwd + strlen(pwd) + 1;
sid = atoi(mode + strlen(mode) + 1);
-
+
do_auth(argv[1], user, pwd, mode, sid);
break;
- case 'c':
+ case 'c':
// close session
sid = atoi((char *)&buf[1]);
if ((sessp = del_session(&sessions, sid)) == NULL) {
- fprintf(stderr, "Couldn't find session %d\r\n", sid);
+ fprintf(stderr, "Couldn't find session %d\r\n", sid);
break;
}
if (sessp->session_mode == 1) {
pam_close_session(sessp->pamh, 0);
/*fprintf(stderr, "did ok close sess \n\r");*/
}
- pam_end(sessp->pamh, PAM_SUCCESS);
+ pam_end(sessp->pamh, PAM_SUCCESS);
free(sessp);
break;
default:
View
14 c_src/hashtable.c
@@ -97,7 +97,7 @@ hashtable_expand(struct hashtable *h)
h->table = newtable;
}
/* Plan B: realloc instead */
- else
+ else
{
newtable = (struct entry **)
realloc(h->table, newsize * sizeof(struct entry *));
@@ -243,23 +243,23 @@ hashtable_destroy(struct hashtable *h, int free_values)
/*
* Copyright (c) 2002, Christopher Clark
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- *
+ *
* * Neither the name of the original author; nor the names of any contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
- *
- *
+ *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
View
30 c_src/hashtable.h
@@ -19,7 +19,7 @@ struct hashtable;
* v = (struct some_value *) malloc(sizeof(struct some_value));
*
* (initialise k and v to suitable values)
- *
+ *
* if (! hashtable_insert(h,k,v) )
* { exit(-1); }
*
@@ -33,7 +33,7 @@ struct hashtable;
/* Macros may be used to define type-safe(r) hashtable access functions, with
* methods specialized to take known key and value types as parameters.
- *
+ *
* Example:
*
* Insert this at the start of your file:
@@ -63,7 +63,7 @@ struct hashtable;
/*****************************************************************************
* create_hashtable
-
+
* @name create_hashtable
* @param minsize minimum initial size of hashtable
* @param hashfunction function for hashing keys
@@ -78,7 +78,7 @@ create_hashtable(unsigned int minsize,
/*****************************************************************************
* hashtable_insert
-
+
* @name hashtable_insert
* @param h the hashtable to insert into
* @param k the key - hashtable claims ownership and will free on removal
@@ -95,7 +95,7 @@ create_hashtable(unsigned int minsize,
* If in doubt, remove before insert.
*/
-int
+int
hashtable_insert(struct hashtable *h, void *k, void *v);
#define DEFINE_HASHTABLE_INSERT(fnname, keytype, valuetype) \
@@ -106,7 +106,7 @@ int fnname (struct hashtable *h, keytype *k, valuetype *v) \
/*****************************************************************************
* hashtable_search
-
+
* @name hashtable_search
* @param h the hashtable to search
* @param k the key to search for - does not claim ownership
@@ -124,7 +124,7 @@ valuetype * fnname (struct hashtable *h, keytype *k) \
/*****************************************************************************
* hashtable_remove
-
+
* @name hashtable_remove
* @param h the hashtable to remove the item from
* @param k the key to search for - does not claim ownership
@@ -143,7 +143,7 @@ valuetype * fnname (struct hashtable *h, keytype *k) \
/*****************************************************************************
* hashtable_count
-
+
* @name hashtable_count
* @param h the hashtable
* @return the number of items stored in the hashtable
@@ -154,7 +154,7 @@ hashtable_count(struct hashtable *h);
/*****************************************************************************
* hashtable_destroy
-
+
* @name hashtable_destroy
* @param h the hashtable
* @param free_values whether to call 'free' on the remaining values
@@ -168,23 +168,23 @@ hashtable_destroy(struct hashtable *h, int free_values);
/*
* Copyright (c) 2002, Christopher Clark
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- *
+ *
* * Neither the name of the original author; nor the names of any contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
- *
- *
+ *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
View
12 c_src/hashtable_private.h
@@ -54,23 +54,23 @@ indexFor(unsigned int tablelength, unsigned int hashvalue)
/*
* Copyright (c) 2002, Christopher Clark
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- *
+ *
* * Neither the name of the original author; nor the names of any contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
- *
- *
+ *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
View
4 c_src/setuid_drv.c
@@ -100,8 +100,8 @@ static ErlDrvData setuid_start(ErlDrvPort port, char *buf)
}
// In any case return error(?) for non void function
return (ErlDrvData) -1;
-
-
+
+
}
View
4 doc/Makefile
@@ -5,7 +5,7 @@ include ../vsn.mk
IMG_EPS = $(wildcard *.eps)
IMG_PDF = $(IMG_EPS:.eps=.pdf)
-all debug:
+all debug:
echo "To build the docs, please use make docs before doing make install"
docs: check yaws.ps yaws.pdf
@@ -45,4 +45,4 @@ clean:
install:
-install -d $(DESTDIR)$(PREFIX)/share/doc/yaws
-cp yaws.pdf $(DESTDIR)$(PREFIX)/share/doc/yaws
-
+
View
12 doc/README.rss
@@ -7,10 +7,10 @@ Then go to an RSS-enabled site, e.g slashdot.org . Note the little orange
icon down in the right corner of the browser window. Click on the icon
and add the RSS-feed to you personal toolbar. Then click on your toolbar,
on the RSS-bookmark and watch the nice menu of slashdot article-summarys
-popping up.
+popping up.
The module yaws_rss.erl provides an RSS store/interface so that
-you can RSS enable your application. More documentation can be
+you can RSS enable your application. More documentation can be
found in the yaws_rss.erl file (edoc).
@@ -24,9 +24,9 @@ index.html
==========
<html>
<head>
-<link rel="alternate"
- title="Example RSS"
- href="//localhost:3080/rss.yaws"
+<link rel="alternate"
+ title="Example RSS"
+ href="//localhost:3080/rss.yaws"
type="application/rss+xml>
<title>Example</title>
</head>
@@ -79,7 +79,7 @@ yaws_rss:insert(test, xml, "Yaws now support RSS feeds.",
"Bill Smith").
....
-First comes the application (RSSid) then a tag (these were used in
+First comes the application (RSSid) then a tag (these were used in
rss.yaws when we retrieved the RSS content). Then follows the
Title, Link, Description and Creator.
View
4 doc/overview.edoc
@@ -1,5 +1,5 @@
@title Yaws -An Erlang Web Server
-@doc
+@doc
<p>
This is a very rough import of Yaws into Erlware.
In particular <i>-disable-pam</i> was used to create
@@ -13,7 +13,7 @@ It is unclear if they were intentionally left out or not.
</p>
<p>
Finally some files, that normally is generated at build time
-was included <i>already generated</i>.
+was included <i>already generated</i>.
They were: <code>mime_types.erl, yaws_generated.erl</code>.
</p>
View
104 man/yaws.conf.5
@@ -17,8 +17,8 @@ All yaws logs will be written to files in this directory. There are several
different log files written by yaws.
.br
-\fBreport.log\fR - this is a text file that contains all error logger
-printouts from yaws.
+\fBreport.log\fR - this is a text file that contains all error logger
+printouts from yaws.
.br
\fB<Host>.access\fR - for each virtual host served by yaws, a file
@@ -45,7 +45,7 @@ The default value for logdir is "."
.TP
\fBebin_dir = Directory\fR
This directive adds Directory to the Erlang search path. It is possible to
-have several of these command in the configuration file. The default value
+have several of these command in the configuration file. The default value
is "yaws_dir"/examples/ebin
@@ -73,8 +73,8 @@ value is "yaws/%VSN%, Yet Another Web Server".
.TP
\fBinclude_dir = Directory\fR
This directive adds Directory to the path of directories where the Erlang
-compiler searches for include files. We need to use this if we want to
-include .hrl files in our yaws Erlang code. The default value is
+compiler searches for include files. We need to use this if we want to
+include .hrl files in our yaws Erlang code. The default value is
"yaws_dir"/examples/include.
.TP
@@ -82,7 +82,7 @@ include .hrl files in our yaws Erlang code. The default value is
Yaws will cache small files such as commonly accessed GIF images in RAM.
This directive sets a maximum number on the number of cached files.
The default value is 400.
-.TP
+.TP
\fBmax_num_cached_bytes = Integer\fR
This directive controls the total amount of RAM which can maximally be
used for cached RAM files. The default value is 1000000, 1 megabyte.
@@ -108,8 +108,8 @@ a command line flag to yaws. Default is false.
.TP
\fBuse_old_ssl = true | false\fR
This re-enables the old OTP ssl implementation. By default we use the
-new ssl implementation.
-
+new ssl implementation.
+
.TP
\fBauth_log = true | false\fR
\fBDeprecated and ignored. Now, this target must be set in server part.\fR
@@ -125,7 +125,7 @@ the last socket if the limit threshold is reached.
Normally, yaws does not restrict the number of times a connection is
kept alive using keepalive. Setting this parameter to an integer X
will ensure that connections are closed once they have been used X times.
-This can be a useful to guard against long running connections
+This can be a useful to guard against long running connections
collecting too much garbage in the Erlang VM.
.TP
@@ -151,7 +151,7 @@ size where they wrap around and the original gets renamed to File.old
is 1000000, 1 megabyte. This value can changed.
If we set the value to \fI0\fR the logs will never wrap. If we want to use
-Yaws in combination with a more traditional log wrapper such as
+Yaws in combination with a more traditional log wrapper such as
logrotate, set the size to \fI0\fR and Yaws will reopen the logfiles
once they have be renamed/removed.
@@ -173,12 +173,12 @@ Default is false.
.TP
\fBsoap_srv_mods = ListOfModuleSetting\fR
If enable_soap is true, a startup yaws will invoke \fIyaws_soap_srv:setup()\fR
-to setup modules set here.
-ModuleSetting is either a triad like \fI<Mod, HandlerFunc, WsdlFile>\fR
-or a quadruple form like \fI<Mod, HandlerFunc, WsdlFile, Prefix>\fR which
-specifies the \fIprefix\fR. A \fIprefix\fR will be used as argument of
+to setup modules set here.
+ModuleSetting is either a triad like \fI<Mod, HandlerFunc, WsdlFile>\fR
+or a quadruple form like \fI<Mod, HandlerFunc, WsdlFile, Prefix>\fR which
+specifies the \fIprefix\fR. A \fIprefix\fR will be used as argument of
\fIyaws_soap_lib:initModel()\fR and then be used as a XML namespace prefix.
-Note, the \fIWsdlFile\fR here should be an absolute-path file
+Note, the \fIWsdlFile\fR here should be an absolute-path file
in local file systems.
For example, we can specify
@@ -204,12 +204,12 @@ Default value is true.
.TP
\fBysession_mod = Module\fR
-Allows to specify a different Yaws session storage mechanism instead of
+Allows to specify a different Yaws session storage mechanism instead of
an ETS table. One of the drawbacks of the default yaws_session_server
implementation is that server side cookies are lost when the server
restarts.
Specifying a different module here will pass all writes/read
-operations to this module (it must implements appropriate callbacks).
+operations to this module (it must implements appropriate callbacks).
.TP
\fBrunmod = ModuleName\fR
@@ -296,17 +296,17 @@ the same as the default provided by \fIgen_tcp:listen/2\fR, which is 5.
.TP
\fBrhost = Host[:Port]\fR
This forces all local redirects issued by the server to go to Host.
-This is useful when yaws listens to a port which is different from
+This is useful when yaws listens to a port which is different from
the port that the user connects to. For example, running yaws as a
non-privileged user makes it impossible to listen to port 80, since
that port can only be opened by a privileged user. Instead yaws
-listens to a high port number port, 8000, and iptables are used to
-redirect traffic to port 80 to port 8000 (most NAT:ing firewalls
+listens to a high port number port, 8000, and iptables are used to
+redirect traffic to port 80 to port 8000 (most NAT:ing firewalls
will also do this for you).
.TP
\fBrscheme = http | https\fR
-This forces all local redirects issued by the server to use this
-method. This is useful when an SSL off-loader, or stunnel, is used in
+This forces all local redirects issued by the server to use this
+method. This is useful when an SSL off-loader, or stunnel, is used in
front of yaws.
.TP
@@ -316,7 +316,7 @@ Enable or disable the auth log for this virtual server. Default is true.
.TP
\fBaccess_log = true | false\fR
Setting this directive to false turns of traffic logging for this
-virtual server. The default value is true.
+virtual server. The default value is true.
.TP
\fBlogger_mod = Module\fR