Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

""

git-svn-id: https://erlyaws.svn.sourceforge.net/svnroot/erlyaws/trunk/yaws@926 9fbdc01b-0d2c-0410-bfb7-fb27d70d8b52
  • Loading branch information...
commit 6cf3eceb16f430f9f599b2b5c25bc786c988816f 1 parent b6f249f
@klacke authored
View
4 src/yaws.erl
@@ -8,8 +8,8 @@
-module(yaws).
-author('klacke@bluetail.com').
--include_lib("yaws/include/yaws.hrl").
--include_lib("yaws/include/yaws_api.hrl").
+-include("../include/yaws.hrl").
+-include("../include/yaws_api.hrl").
-include("yaws_debug.hrl").
View
4 src/yaws_api.erl
@@ -11,8 +11,8 @@
%% -compile(export_all).
--include_lib("yaws/include/yaws.hrl").
--include_lib("yaws/include/yaws_api.hrl").
+-include("../include/yaws.hrl").
+-include("../include/yaws_api.hrl").
-include("yaws_debug.hrl").
View
4 src/yaws_cgi.erl
@@ -1,9 +1,9 @@
-module(yaws_cgi).
-author('carsten@codimi.de').
--include_lib("yaws/include/yaws_api.hrl").
+-include("../include/yaws_api.hrl").
-include("yaws_debug.hrl").
--include_lib("yaws/include/yaws.hrl").
+-include("../include/yaws.hrl").
-export([call_cgi/5, call_cgi/4, call_cgi/3, call_cgi/2]).
View
4 src/yaws_compile.erl
@@ -12,8 +12,8 @@
--include_lib("yaws/include/yaws.hrl").
--include_lib("yaws/include/yaws_api.hrl").
+-include("../include/yaws.hrl").
+-include("../include/yaws_api.hrl").
-include("yaws_debug.hrl").
View
4 src/yaws_config.erl
@@ -11,8 +11,8 @@
--include_lib("yaws/include/yaws.hrl").
--include_lib("yaws/include/yaws_api.hrl").
+-include("../include/yaws.hrl").
+-include("../include/yaws_api.hrl").
-include("yaws_debug.hrl").
View
2  src/yaws_content_negotiation.erl
@@ -1,7 +1,7 @@
-module(yaws_content_negotiation).
-export([compute_rsva/2, parse_accept_field/1, match_media_type/2]).
--include_lib("yaws/include/yaws_api.hrl").
+-include("../include/yaws_api.hrl").
%% TODO: analyze impact of spaces in headers; when/where to strip?
View
4 src/yaws_ctl.erl
@@ -13,8 +13,8 @@
-compile(export_all).
-include_lib("kernel/include/file.hrl").
--include_lib("yaws/include/yaws.hrl").
--include_lib("yaws/include/yaws_api.hrl").
+-include("../include/yaws.hrl").
+-include("../include/yaws_api.hrl").
-include("yaws_debug.hrl").
View
4 src/yaws_debug.erl
@@ -10,8 +10,8 @@
-compile(export_all).
--include_lib("yaws/include/yaws.hrl").
--include_lib("yaws/include/yaws_api.hrl").
+-include("../include/yaws.hrl").
+-include("../include/yaws_api.hrl").
-include("yaws_debug.hrl").
View
4 src/yaws_log.erl
@@ -21,8 +21,8 @@
%% gen_server callbacks
-export([init/1, handle_call/3, handle_cast/2, handle_info/2, terminate/2]).
--include_lib("yaws/include/yaws.hrl").
--include_lib("yaws/include/yaws_api.hrl").
+-include("../include/yaws.hrl").
+-include("../include/yaws_api.hrl").
-include("yaws_debug.hrl").
%% 1 meg log we wrap
View
4 src/yaws_ls.erl
@@ -11,8 +11,8 @@
-compile(export_all).
--include_lib("yaws/include/yaws.hrl").
--include_lib("yaws/include/yaws_api.hrl").
+-include("../include/yaws.hrl").
+-include("../include/yaws_api.hrl").
-include("yaws_debug.hrl").
-include_lib("kernel/include/file.hrl").
View
4 src/yaws_revproxy.erl
@@ -8,8 +8,8 @@
-module(yaws_revproxy).
-compile(export_all).
--include_lib("yaws/include/yaws.hrl").
--include_lib("yaws/include/yaws_api.hrl").
+-include("../include/yaws.hrl").
+-include("../include/yaws_api.hrl").
-include("yaws_debug.hrl").
%% reverse proxy implementation.
View
15 src/yaws_server.erl
@@ -13,8 +13,8 @@
-behaviour(gen_server).
--include_lib("yaws/include/yaws.hrl").
--include_lib("yaws/include/yaws_api.hrl").
+-include("../include/yaws.hrl").
+-include("../include/yaws_api.hrl").
-include("yaws_debug.hrl").
-include_lib("kernel/include/file.hrl").
@@ -715,7 +715,6 @@ do_accept(GS) when GS#gs.ssl == ssl ->
initial_acceptor(GS) ->
- GC = GS#gs.gconf,
if
GS#gs.ssl == nossl ->
acceptor(GS);
@@ -723,6 +722,14 @@ initial_acceptor(GS) ->
initial_acceptor(GS, 5)
end.
+
+% an SSL connection might include user interaction.
+% So while one person has a dialog box on the screen asking him to review
+% the server's certificate, no other person is able to establish a new
+% connnection to the server.
+% unless we run multiple SSL acceptor processes
+% Therefore, the code below!
+
initial_acceptor(_GS, 0) ->
ok;
initial_acceptor(GS, 1) ->
@@ -743,7 +750,7 @@ acceptor(GS) ->
proc_lib:spawn_link(yaws_server, acceptor0, [GS, self()]).
acceptor0(GS, Top) ->
?TC([{record, GS, gs}]),
- put(gc, GC=GS#gs.gconf),
+ put(gc, GS#gs.gconf),
X = do_accept(GS),
Top ! {self(), next},
case X of
View
4 src/yaws_ssl.erl
@@ -13,8 +13,8 @@
%% module isn't used any more
%% replaced by builtin support for http in OTP ssl module
--include_lib("yaws/include/yaws.hrl").
--include_lib("yaws/include/yaws_api.hrl").
+-include("../include/yaws.hrl").
+-include("../include/yaws_api.hrl").
-include("yaws_debug.hrl").
-include_lib("kernel/include/file.hrl").
Please sign in to comment.
Something went wrong with that request. Please try again.