1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
|
Replace usage of threads for socket listeners by forks of the
main process in order to avoid requiring perl built with
PERL_FEATURES="ithreads".
The added return values are necessary because otherwise
the process (before the thread) would continue it's procedure
call chain (before, the thread exited, not executing any more
code).
--- a/tests/poundharness.pl
+++ b/tests/poundharness.pl
@@ -16,7 +16,6 @@
use strict;
use warnings;
use Socket qw(:DEFAULT :crlf);
-use threads;
use Getopt::Long;
use HTTP::Tiny;
use POSIX qw(:sys_wait_h);
@@ -1619,19 +1618,16 @@ sub read_and_process {
my $self = shift;
foreach my $lst (@{$self->{listeners}}) {
- $lst->listen;
- }
-
- foreach my $lst (@{$self->{listeners}}) {
- threads->create(sub {
- my $lst = shift;
+ my $pid = fork();
+ if ($pid == 0) {
$lst->listen;
while (1) {
- my $fh;
- accept($fh, $lst->socket_handle) or threads->exit();
- process_http_request($fh, $lst)
+ my $fh;
+ accept($fh, $lst->socket_handle) or last;
+ process_http_request($fh, $lst)
}
- }, $lst)->detach;
+ exit 0;
+ }
}
}
@@ -1694,7 +1690,7 @@ sub process_http_request {
local $| = 1;
my $http = HTTPServ->new($sock, $backend);
- $http->parse();
+ return unless $http->parse();
if ($http->uri =~ m{^/([^/]+)(/.*)?}) {
my ($dir, $rest) = ($1, $2);
if (my $ep = $endpoints{$dir}) {
@@ -1757,7 +1753,8 @@ sub getline {
sub ParseRequest {
my $http = shift;
- my $input = $http->getline() or threads->exit();
+ my $input = $http->getline();
+ return 0 unless defined $input;
# print "GOT $input\n";
my @res = split " ", $input;
if (@res != 3) {
@@ -1765,6 +1762,7 @@ sub ParseRequest {
}
($http->{METHOD}, $http->{URI}, $http->{VERSION}) = @res;
+ return 1;
}
sub ParseHeader {
@@ -1802,9 +1800,10 @@ sub GetBody {
sub parse {
my $http = shift;
- $http->ParseRequest;
+ return 0 unless $http->ParseRequest;
$http->ParseHeader;
$http->GetBody;
+ return 1;
}
sub reply {
|
