diff --git a/doc/yaws.tex b/doc/yaws.tex index 286cea3df..d1125c9a6 100644 --- a/doc/yaws.tex +++ b/doc/yaws.tex @@ -1557,7 +1557,7 @@ \section{The opaque data} foo = bar somefile = /var/myapp/db - myname = hyber + myname = example \end{verbatim} @@ -1573,7 +1573,7 @@ \section{The opaque data} [{foo, "bar"}, {somefile, "/var/myapp/db"}, - {myname, "hyber"} + {myname, "example"} ] \end{verbatim} @@ -3069,7 +3069,7 @@ \section{Server Part} appmods = ... \end{verbatim} Assume for example that we have the URL - \url{http://www.hyber.org/myapp/foo/bar?user=joe} while we + \url{http://www.example.org/myapp/foo/bar?user=joe} while we have the module \verb+foo+ defined as an appmod, the function \verb+foo:out(Arg)+ will be invoked instead of searching the filesystems below the point \verb+foo+. @@ -3204,9 +3204,9 @@ \section{Server Part} docroot and \verb+Url+ is a URL pointing to a website we want to "mount" under the \verb+Prefix+ path. For example: - \verb+revproxy = /tmp/foo http://yaws.hyber.org+ + \verb+revproxy = /tmp/foo http://www.example.org+ - This makes the hyber website appear under \verb+/tmp/foo+. + This makes the \verb+example+ website appear under \verb+/tmp/foo+. It is possible to have multiple reverse proxies inside the same server by supplying multiple \verb+revproxy+ directives. diff --git a/man/yaws.conf.5 b/man/yaws.conf.5 index fdf606bc6..73af9c7bf 100644 --- a/man/yaws.conf.5 +++ b/man/yaws.conf.5 @@ -747,7 +747,7 @@ specify .fi Assume for example that we have the URL -http://www.hyber.org/myapp/foo/bar/baz?user=joe while we have the module foo +http://www.example.org/myapp/foo/bar/baz?user=joe while we have the module foo defined as an appmod, the function foo:out(Arg) will be invoked instead of searching the filesystems below the point foo. .br @@ -901,10 +901,10 @@ and \fIUrl\fB argument is a URL pointing to a website we want to "mount" under the \fIPrefix\fR path. This example: .nf - revproxy = /tmp/foo http://yaws.hyber.org + revproxy = /tmp/foo http://www.example.org .fi -makes the hyber website appear under \fI/tmp/foo\fR. +makes the \fIexample\fR website appear under \fI/tmp/foo\fR. It is possible to have multiple reverse proxies inside the same server. diff --git a/src/yaws.conf b/src/yaws.conf index b8e12ab76..b56665307 100644 --- a/src/yaws.conf +++ b/src/yaws.conf @@ -10,7 +10,7 @@ #end then a set of servers - + port = 8000 listen = 192.168.128.24 docroot = /home/klacke/yaws/www diff --git a/src/yaws_appmod_dav.erl b/src/yaws_appmod_dav.erl index 342418673..d64552339 100644 --- a/src/yaws_appmod_dav.erl +++ b/src/yaws_appmod_dav.erl @@ -593,7 +593,7 @@ allprops(R) -> C = get(compatibility), %% default property set P1 = [ - {'http://yaws.hyber.org/',access}, % sample Yaws extension + {'http://www.example.org/',access}, % sample Yaws extension {'DAV:',creationdate}, %%{'DAV:',getcontentlanguage}, % not supported in GET % so omitted here as well @@ -637,10 +637,10 @@ allprops(R) -> end, P1++P2++P3. -prop_get({'http://yaws.hyber.org/',access},_A,R) -> +prop_get({'http://www.example.org/',access},_A,R) -> F = R#resource.info, A = F#file_info.access, - P = {access, [{xmlns,'http://yaws.hyber.org/'}], [atom_to_list(A)]}, + P = {access, [{xmlns,'http://www.example.org/'}], [atom_to_list(A)]}, {200, P}; prop_get({'DAV:',childcount},A,_R) -> Path=davpath(A), diff --git a/test/dynopts_SUITE.erl b/test/dynopts_SUITE.erl index 8aa5b2e7d..ac370e203 100644 --- a/test/dynopts_SUITE.erl +++ b/test/dynopts_SUITE.erl @@ -72,8 +72,8 @@ generated_dynopts(_Config) -> %%==================================================================== check_have_http_uri_parse(_Config) -> - ?assertEqual({ok,{http,[],"yaws.hyber.org",80,"/",[]}}, - yaws_dynopts:http_uri_parse("http://yaws.hyber.org/")), + ?assertEqual({ok,{http,[],"www.example.org",80,"/",[]}}, + yaws_dynopts:http_uri_parse("http://www.example.org/")), case yaws_dynopts:have_http_uri_parse() of true -> {file, _} = code:is_loaded(http_uri), diff --git a/test/ehtml_SUITE.erl b/test/ehtml_SUITE.erl index eb6c14909..cff3b90a9 100644 --- a/test/ehtml_SUITE.erl +++ b/test/ehtml_SUITE.erl @@ -110,7 +110,7 @@ nested_mfa(_Config) -> ok. get_link() -> - "http://yaws.hyber.org/". + "http://www.example.org/". simple_attr(_Config) -> Link = "link", diff --git a/test/no_docroot_SUITE_data/templates/no_docroot_redirect.conf b/test/no_docroot_SUITE_data/templates/no_docroot_redirect.conf index 7994f79b4..627b3a667 100644 --- a/test/no_docroot_SUITE_data/templates/no_docroot_redirect.conf +++ b/test/no_docroot_SUITE_data/templates/no_docroot_redirect.conf @@ -12,6 +12,6 @@ keepalive_timeout = 10000 listen = 127.0.0.1 port = $yaws_port1$ - "/" == http://yaws.hyber.org/ + "/" == http://www.example.org/ diff --git a/test/no_docroot_SUITE_data/templates/no_docroot_revproxy.conf b/test/no_docroot_SUITE_data/templates/no_docroot_revproxy.conf index 481d04a6d..5a5ae8aaa 100644 --- a/test/no_docroot_SUITE_data/templates/no_docroot_revproxy.conf +++ b/test/no_docroot_SUITE_data/templates/no_docroot_revproxy.conf @@ -11,5 +11,5 @@ keepalive_timeout = 10000 listen = 127.0.0.1 port = $yaws_port1$ - revproxy = "/" http://yaws.hyber.org + revproxy = "/" http://www.example.org diff --git a/test/redirect_SUITE.erl b/test/redirect_SUITE.erl index da5ca1b10..8e9036088 100644 --- a/test/redirect_SUITE.erl +++ b/test/redirect_SUITE.erl @@ -67,14 +67,14 @@ redirect_default(Config) -> ?assertEqual(testsuite:make_url(http, "127.0.0.1", Port, "/redir"), proplists:get_value("location", Hdrs2)), - %% /default_redirect3 -> http://yaws.hyber.org (absolute-url + append) + %% /default_redirect3 -> http://www.example.org (absolute-url + append) {ok, {{_,302,_}, Hdrs3, _}} = testsuite:http_get(Url3), - ?assertEqual("http://yaws.hyber.org/default_redirect3/index.html", + ?assertEqual("http://www.example.org/default_redirect3/index.html", proplists:get_value("location", Hdrs3)), - %% /default_redirect4 -> http://yaws.hyber.org (absolute-url + noappend) + %% /default_redirect4 -> http://www.example.org (absolute-url + noappend) {ok, {{_,302,_}, Hdrs4, _}} = testsuite:http_get(Url4), - ?assertEqual("http://yaws.hyber.org/", + ?assertEqual("http://www.example.org/", proplists:get_value("location", Hdrs4)), ok. @@ -90,7 +90,7 @@ redirect_with_trailing_slash(Config) -> Url2 = testsuite:make_url(http, "localhost", Port2, "/"), {ok, {{_,302,_}, Hdrs2, _}} = testsuite:http_get(Url2), %% Verify no extra slashes are added on redirect - ?assertEqual("http://yaws.hyber.org/", proplists:get_value("location", Hdrs2)), + ?assertEqual("http://www.example.org/", proplists:get_value("location", Hdrs2)), ok. redirect_301(Config) -> @@ -110,14 +110,14 @@ redirect_301(Config) -> ?assertEqual(testsuite:make_url(http, "127.0.0.1", Port, "/redir"), proplists:get_value("location", Hdrs2)), - %% /301_redirect3 -> http://yaws.hyber.org (absolute-url + append) + %% /301_redirect3 -> http://www.example.org (absolute-url + append) {ok, {{_,301,_}, Hdrs3, _}} = testsuite:http_get(Url3), - ?assertEqual("http://yaws.hyber.org/301_redirect3/index.html", + ?assertEqual("http://www.example.org/301_redirect3/index.html", proplists:get_value("location", Hdrs3)), - %% /301_redirect4 -> http://yaws.hyber.org (absolute-url + noappend) + %% /301_redirect4 -> http://www.example.org (absolute-url + noappend) {ok, {{_,301,_}, Hdrs4, _}} = testsuite:http_get(Url4), - ?assertEqual("http://yaws.hyber.org/", + ?assertEqual("http://www.example.org/", proplists:get_value("location", Hdrs4)), ok. @@ -186,14 +186,14 @@ redirect_querystring(Config) -> ?assertEqual(testsuite:make_url(http, "127.0.0.1", Port, "/redir?a=b&c=d"), proplists:get_value("location", Hdrs2)), - %% /default_redirect3 -> http://yaws.hyber.org (absolute-url + append) + %% /default_redirect3 -> http://www.example.org (absolute-url + append) {ok, {{_,302,_}, Hdrs3, _}} = testsuite:http_get(Url3), - ?assertEqual("http://yaws.hyber.org/default_redirect3/index.html?a=b&c=d", + ?assertEqual("http://www.example.org/default_redirect3/index.html?a=b&c=d", proplists:get_value("location", Hdrs3)), - %% /default_redirect4 -> http://yaws.hyber.org (absolute-url + noappend) + %% /default_redirect4 -> http://www.example.org (absolute-url + noappend) {ok, {{_,302,_}, Hdrs4, _}} = testsuite:http_get(Url4), - ?assertEqual("http://yaws.hyber.org/?a=b&c=d", + ?assertEqual("http://www.example.org/?a=b&c=d", proplists:get_value("location", Hdrs4)), %% /404_redirect3 -> /error404.yaws (append) diff --git a/test/redirect_SUITE_data/bad_redirect3.conf b/test/redirect_SUITE_data/bad_redirect3.conf index 362ffdb98..ba2357bfa 100644 --- a/test/redirect_SUITE_data/bad_redirect3.conf +++ b/test/redirect_SUITE_data/bad_redirect3.conf @@ -1,5 +1,5 @@ - /bad_redirect = 404 http://yaws.hyber.org + /bad_redirect = 404 http://www.example.org diff --git a/test/redirect_SUITE_data/templates/yaws.conf b/test/redirect_SUITE_data/templates/yaws.conf index 94506fd40..ce28a6ac9 100644 --- a/test/redirect_SUITE_data/templates/yaws.conf +++ b/test/redirect_SUITE_data/templates/yaws.conf @@ -19,13 +19,13 @@ keepalive_timeout = 10000 /default_redirect1 = /redir /default_redirect2 == /redir - /default_redirect3 = http://yaws.hyber.org - /default_redirect4 == http://yaws.hyber.org + /default_redirect3 = http://www.example.org + /default_redirect4 == http://www.example.org /301_redirect1 = 301 /redir /301_redirect2 == 301 /redir - /301_redirect3 = 301 http://yaws.hyber.org - /301_redirect4 == 301 http://yaws.hyber.org + /301_redirect3 = 301 http://www.example.org + /301_redirect4 == 301 http://www.example.org /404_redirect1 = 404 /404_redirect2 == 404 @@ -44,6 +44,6 @@ keepalive_timeout = 10000 listen = 127.0.0.1 port = $yaws_port2$ - / = 302 http://yaws.hyber.org/ + / = 302 http://www.example.org/ diff --git a/test/sconf_SUITE.erl b/test/sconf_SUITE.erl index 311a7ceb9..65543c1cc 100644 --- a/test/sconf_SUITE.erl +++ b/test/sconf_SUITE.erl @@ -188,73 +188,73 @@ setup_mime_types_info(_Config) -> comp_sname(_Config) -> - ?assert(yaws_server:comp_sname("yaws.hyber.org", "yaws.hyber.org")), - ?assert(yaws_server:comp_sname("yaws.hyber.org", "YAWS.HYBER.ORG")), - ?assert(yaws_server:comp_sname("yaws.hyber.org:80", "yaws.hyber.org")), - ?assert(yaws_server:comp_sname("yaws.hyber.org", "yaws.hyber.org:80")), - ?assert(yaws_server:comp_sname("yaws.hyber.org:443", "yaws.hyber.org:80")), - - ?assertNot(yaws_server:comp_sname("yaws.hyber.org", "yaws.hyber.com")), - ?assertNot(yaws_server:comp_sname("yaws.hyber.org:80", "yaws.hyber.org.bad")), - ?assertNot(yaws_server:comp_sname("yaws.hyber.org.bad", "yaws.hyber.org:80")), - ?assertNot(yaws_server:comp_sname("yaws.hyber.org", "yaws.hyber.org.bad")), - ?assertNot(yaws_server:comp_sname("yaws.hyber.org.bad", "yaws.hyber.org")), + ?assert(yaws_server:comp_sname("www.example.org", "www.example.org")), + ?assert(yaws_server:comp_sname("www.example.org", "WWW.EXAMPLE.ORG")), + ?assert(yaws_server:comp_sname("www.example.org:80", "www.example.org")), + ?assert(yaws_server:comp_sname("www.example.org", "www.example.org:80")), + ?assert(yaws_server:comp_sname("www.example.org:443", "www.example.org:80")), + + ?assertNot(yaws_server:comp_sname("www.example.org", "www.example.com")), + ?assertNot(yaws_server:comp_sname("www.example.org:80", "www.example.org.bad")), + ?assertNot(yaws_server:comp_sname("www.example.org.bad", "www.example.org:80")), + ?assertNot(yaws_server:comp_sname("www.example.org", "www.example.org.bad")), + ?assertNot(yaws_server:comp_sname("www.example.org.bad", "www.example.org")), ok. wildcomp_salias(_Config) -> - ?assert(yaws_server:wildcomp_salias("yaws.hyber.org", "yaws.hyber.org")), - ?assert(yaws_server:wildcomp_salias("yaws.hyber.org", "YAWS.HYBER.ORG")), - ?assert(yaws_server:wildcomp_salias("yaws.hyber.org:80", "yaws.hyber.org")), - ?assert(yaws_server:wildcomp_salias("yaws.hyber.org", "yaws.hyber.org:80")), - ?assert(yaws_server:wildcomp_salias("yaws.hyber.org:443", "yaws.hyber.org:80")), - - ?assertNot(yaws_server:wildcomp_salias("yaws.hyber.org", "yaws.hyber.com")), - ?assertNot(yaws_server:wildcomp_salias("yaws.hyber.org:80", "yaws.hyber.org.bad")), - ?assertNot(yaws_server:wildcomp_salias("yaws.hyber.org.bad", "yaws.hyber.org:80")), - ?assertNot(yaws_server:wildcomp_salias("yaws.hyber.org", "yaws.hyber.org.bad")), - ?assertNot(yaws_server:wildcomp_salias("yaws.hyber.org.bad", "yaws.hyber.org")), - - ?assert(yaws_server:wildcomp_salias("yaws.hyber.org", "*.hyber.org")), - ?assert(yaws_server:wildcomp_salias("yaws.hyber.hyber.org", "*.hyber.org")), - ?assert(yaws_server:wildcomp_salias("yaws.hyber.org", "yaws.*.org")), - ?assert(yaws_server:wildcomp_salias("yaws.hyber.hyber.org", "yaws.*.org")), - ?assert(yaws_server:wildcomp_salias("yaws.hyber.org.org", "yaws.*.org")), - ?assert(yaws_server:wildcomp_salias("yaws.hyber.org", "yaws.hyber.*")), - ?assert(yaws_server:wildcomp_salias("yaws.hyber.hyber.org", "yaws.hyber.*")), - ?assert(yaws_server:wildcomp_salias("yaws.hyber.org.org", "yaws.hyber.*")), - ?assert(yaws_server:wildcomp_salias("yaws.hyber.org", "*.hyber.*")), - ?assert(yaws_server:wildcomp_salias("yaws.hyber.hyber.org", "*.hyber.*")), - ?assert(yaws_server:wildcomp_salias("erlang.hyber.org", "*.hyber.*")), - ?assert(yaws_server:wildcomp_salias("yaws.hyber.org", "*.*.org")), - ?assert(yaws_server:wildcomp_salias("yaws.hyber.hyber.org", "*.*.org")), + ?assert(yaws_server:wildcomp_salias("www.example.org", "www.example.org")), + ?assert(yaws_server:wildcomp_salias("www.example.org", "WWW.EXAMPLE.ORG")), + ?assert(yaws_server:wildcomp_salias("www.example.org:80", "www.example.org")), + ?assert(yaws_server:wildcomp_salias("www.example.org", "www.example.org:80")), + ?assert(yaws_server:wildcomp_salias("www.example.org:443", "www.example.org:80")), + + ?assertNot(yaws_server:wildcomp_salias("www.example.org", "www.example.com")), + ?assertNot(yaws_server:wildcomp_salias("www.example.org:80", "www.example.org.bad")), + ?assertNot(yaws_server:wildcomp_salias("www.example.org.bad", "www.example.org:80")), + ?assertNot(yaws_server:wildcomp_salias("www.example.org", "www.example.org.bad")), + ?assertNot(yaws_server:wildcomp_salias("www.example.org.bad", "www.example.org")), + + ?assert(yaws_server:wildcomp_salias("www.example.org", "*.example.org")), + ?assert(yaws_server:wildcomp_salias("www.example.hyber.org", "*.hyber.org")), + ?assert(yaws_server:wildcomp_salias("www.example.org", "www.*.org")), + ?assert(yaws_server:wildcomp_salias("www.example.hyber.org", "www.*.org")), + ?assert(yaws_server:wildcomp_salias("www.example.org.org", "www.*.org")), + ?assert(yaws_server:wildcomp_salias("www.example.org", "www.example.*")), + ?assert(yaws_server:wildcomp_salias("www.example.hyber.org", "www.example.*")), + ?assert(yaws_server:wildcomp_salias("www.example.org.org", "www.example.*")), + ?assert(yaws_server:wildcomp_salias("www.example.org", "*.example.*")), + ?assert(yaws_server:wildcomp_salias("www.example.hyber.org", "*.example.*")), + ?assert(yaws_server:wildcomp_salias("erlang.example.org", "*.example.*")), + ?assert(yaws_server:wildcomp_salias("www.example.org", "*.*.org")), + ?assert(yaws_server:wildcomp_salias("www.example.hyber.org", "*.*.org")), ?assert(yaws_server:wildcomp_salias("..org", "*.*.org")), - ?assert(yaws_server:wildcomp_salias("hyber.org", "*hyber.org")), - ?assert(yaws_server:wildcomp_salias("yaws-hyber.org", "*hyber.org")), - - ?assertNot(yaws_server:wildcomp_salias("yaws.hyber.com", "*.hyber.org")), - ?assertNot(yaws_server:wildcomp_salias("yaws.hyber.hyber.com", "*.hyber.org")), - ?assertNot(yaws_server:wildcomp_salias("yaws.hyber.org.org", "*.hyber.org")), - ?assertNot(yaws_server:wildcomp_salias("yaws.hyber.org.com", "*.hyber.org")), - ?assertNot(yaws_server:wildcomp_salias("erlang.hyber.org", "yaws.*.org")), - ?assertNot(yaws_server:wildcomp_salias("yaws.hyber.com", "yaws.*.org")), - ?assertNot(yaws_server:wildcomp_salias("yaws.hyber.hyber.com", "yaws.*.org")), - ?assertNot(yaws_server:wildcomp_salias("yaws.hyber.org.com", "yaws.*.org")), - ?assertNot(yaws_server:wildcomp_salias("erlang.hyber.com", "yaws.hyber.*")), - ?assertNot(yaws_server:wildcomp_salias("yaws.yaws.hyber.org", "yaws.hyber.*")), - - ?assert(yaws_server:wildcomp_salias("yaws.hyber.org", "?aws.hyber.org")), - ?assert(yaws_server:wildcomp_salias("yaws.hyber.org", "????.hyber.org")), - ?assert(yaws_server:wildcomp_salias("yaws-hyber.org", "yaws?hyber.org")), - - ?assertNot(yaws_server:wildcomp_salias("yaws.hyber.com", "?aws.hyber.org")), - ?assertNot(yaws_server:wildcomp_salias("yaw.hyber.org", "????.hyber.org")), - ?assertNot(yaws_server:wildcomp_salias("yaws.hyber.org", "???.hyber.org")), - ?assertNot(yaws_server:wildcomp_salias("yaws.hyber.org", "yaws?hyber.org")), - - ?assert(yaws_server:wildcomp_salias("yaws.hyber.hyber.org", "yaws.*.hyber.???")), - ?assert(yaws_server:wildcomp_salias("yaws.hyber.hyber.com", "yaws.*.hyber.???")), - - ?assertNot(yaws_server:wildcomp_salias("yaws.hyber.hyber.fr", "yaws.*.hyber.???")), + ?assert(yaws_server:wildcomp_salias("example.org", "*example.org")), + ?assert(yaws_server:wildcomp_salias("yaws-example.org", "*example.org")), + + ?assertNot(yaws_server:wildcomp_salias("www.example.com", "*.example.org")), + ?assertNot(yaws_server:wildcomp_salias("www.example.hyber.com", "*.example.org")), + ?assertNot(yaws_server:wildcomp_salias("www.example.org.org", "*.example.org")), + ?assertNot(yaws_server:wildcomp_salias("www.example.org.com", "*.example.org")), + ?assertNot(yaws_server:wildcomp_salias("erlang.hyber.org", "www.*.org")), + ?assertNot(yaws_server:wildcomp_salias("www.example.com", "www.*.org")), + ?assertNot(yaws_server:wildcomp_salias("www.example.hyber.com", "www.*.org")), + ?assertNot(yaws_server:wildcomp_salias("www.example.org.com", "www.*.org")), + ?assertNot(yaws_server:wildcomp_salias("erlang.example.com", "www.example.*")), + ?assertNot(yaws_server:wildcomp_salias("yaws.www.example.org", "www.example.*")), + + ?assert(yaws_server:wildcomp_salias("www.example.org", "?ww.example.org")), + ?assert(yaws_server:wildcomp_salias("www.example.org", "???.example.org")), + ?assert(yaws_server:wildcomp_salias("www-example.org", "www?example.org")), + + ?assertNot(yaws_server:wildcomp_salias("www.example.com", "?ww.example.org")), + ?assertNot(yaws_server:wildcomp_salias("ww.example.org", "???.example.org")), + ?assertNot(yaws_server:wildcomp_salias("www.example.org", "??.example.org")), + ?assertNot(yaws_server:wildcomp_salias("www.example.org", "www?example.org")), + + ?assert(yaws_server:wildcomp_salias("www.example.example.org", "www.*.example.???")), + ?assert(yaws_server:wildcomp_salias("www.example.example.com", "www.*.example.???")), + + ?assertNot(yaws_server:wildcomp_salias("www.example.example.fr", "www.*.example.???")), ok. ssl_renegotiation_config(_Config) -> diff --git a/www/appmods.yaws b/www/appmods.yaws index a57eec117..8857f13c0 100644 --- a/www/appmods.yaws +++ b/www/appmods.yaws @@ -26,7 +26,7 @@ out(A) -> {p, [], ["Appmods are a way to let the application programmer take control over the URL path. Or put in another way, to let the application programmer fake real paths in URLs where in reality an Erlang module is executing. Possibly an example will make this easy to understand. Say we have the following URL"]}, - box("http://yaws.hyber.org/pathelem/foo/bar/x.pdf"), + box("http://www.example.org/pathelem/foo/bar/x.pdf"), {p,[],["With the above URL, the webserver would try to deliver the file \"/pathelem/foo/bar/x.pdf\" relative to the docroot. However if we had specified \"pathelem\" as an appmod, the server would stop processing the URL after seeing the \"pathelem\" part of the URL. Say we had the following in our yaws.conf configuration file"]}, @@ -56,7 +56,7 @@ out(A) -> {p,[], "Thus the following URL"}, - box("http://yaws.hyber.org/zap/pathelem/foo/bar/x.pdf?a=b"), + box("http://www.example.org/zap/pathelem/foo/bar/x.pdf?a=b"), {p,[], "Produces the following output:"}, box(" diff --git a/www/cgi.yaws b/www/cgi.yaws index 7e59676d9..be993c675 100644 --- a/www/cgi.yaws +++ b/www/cgi.yaws @@ -27,7 +27,7 @@ out(A) ->
- + port = 80 listen = 0.0.0.0 allowed_scripts = php yaws cgi diff --git a/www/logger_mod.yaws b/www/logger_mod.yaws index 17862db7b..ba6cd9b0e 100644 --- a/www/logger_mod.yaws +++ b/www/logger_mod.yaws @@ -31,7 +31,7 @@ overridden by using the directive "logger_mod" in yaws.conf:
- + port = 80 listen = 0.0.0.0 logger_mod = simple_logger diff --git a/www/query.yaws b/www/query.yaws index f12d9bbe9..c9a08e4c4 100644 --- a/www/query.yaws +++ b/www/query.yaws @@ -18,7 +18,7 @@ out(A) ->

We show how to work with the query part of the url through an example, if we have a URL on the form of - http://yaws.hyber.org/man.yaws?page=cat + http://www.example.org/man.yaws?page=cat a key/value pair is passed to the page. In the above example, we have key=page and its value "cat". The code in the page man.yaws, will read these key/value pairs diff --git a/www/redirect.yaws b/www/redirect.yaws index f8336c15c..0ea6849b4 100644 --- a/www/redirect.yaws +++ b/www/redirect.yaws @@ -63,18 +63,18 @@ redirects. For example:

- # curl -I http://rubin.hyber.org:8000/redirect3.yaws + # curl -I http://www.example.org:8000/redirect3.yaws HTTP/1.1 302 Found Server: Yaws/1.49 Yet Another Web Server - Location: http://rubin.hyber.org:8000/redirect2.yaws + Location: http://www.example.org:8000/redirect2.yaws Date: Tue, 16 Nov 2004 20:16:01 GMT Content-Type: text/html
-

Where http://rubin.hyber.org:8000 is where I am currently +

Where http://www.example.org:8000 is where I am currently testing the redirect3.yaws code. Learn and use the curl web client, it may not render pictures pretty, but it sure displays diff --git a/yaws.pc.in b/yaws.pc.in index 536845d23..5787696c7 100644 --- a/yaws.pc.in +++ b/yaws.pc.in @@ -10,6 +10,6 @@ includedir=${prefix}/lib/yaws/include Name: yaws Description: Yet Another Web Server Version: @YAWS_VSN@ -URL: http://yaws.hyber.org/ +URL: https://erlyaws.github.io/ Libs: -pa ${libdir} Cflags: -I${includedir}