[PATCH] Fix various spelling errors and grammar
Nick Andrew
nick at nick-andrew.net
Sun Jun 29 06:16:45 UTC 2008
Fix various spelling errors and grammar
Fix up some typos, spelling and grammar errors.
Signed-off-by: Nick Andrew <nick at nick-andrew.net>
---
doc/config-guide.txt | 2 +-
doc/reproxying.txt | 2 +-
doc/service-parameters.txt | 2 +-
lib/Perlbal.pm | 2 +-
lib/Perlbal/ClientHTTPBase.pm | 4 ++--
lib/Perlbal/ClientProxy.pm | 10 +++++-----
lib/Perlbal/HTTPHeaders.pm | 2 +-
lib/Perlbal/Plugin/Cgilike.pm | 2 +-
lib/Perlbal/Plugin/EchoService.pm | 2 +-
lib/Perlbal/Plugin/Highpri.pm | 2 +-
lib/Perlbal/Plugin/Palimg.pm | 6 +++---
lib/Perlbal/Plugin/Stats.pm | 2 +-
lib/Perlbal/Plugin/Vhosts.pm | 4 ++--
lib/Perlbal/Service.pm | 8 ++++----
lib/Perlbal/Socket.pm | 2 +-
lib/Perlbal/SocketSSL.pm | 2 +-
lib/Perlbal/TCPListener.pm | 2 +-
lib/Perlbal/Util.pm | 2 +-
t/30-reverseproxy.t | 2 +-
t/32-pipelining.t | 2 +-
20 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/doc/config-guide.txt b/doc/config-guide.txt
index 383a7ce..d9b340f 100644
--- a/doc/config-guide.txt
+++ b/doc/config-guide.txt
@@ -47,7 +47,7 @@ server <param> = <value> -- set a server parameter, where param is one of:
max_connections
nice_level
aio_mode : one of "none", "linux" (Linux::AIO), or "ioaio" (IO::AIO)
- This controls how disk IO is done asynchronosly. Highly recommended
+ This controls how disk IO is done asynchronously. Highly recommended
to use Linux::AIO or IO::AIO for webserving or reproxying files.
For purely reverse proxy or only reproxying URLs, none is fine.
aio_threads : number of child threads doing disk IO. (use between 2-50)
diff --git a/doc/reproxying.txt b/doc/reproxying.txt
index c97ddb3..ddb601d 100644
--- a/doc/reproxying.txt
+++ b/doc/reproxying.txt
@@ -27,7 +27,7 @@ X-REPROXY-FILE: /home/pics/$userid/$pic
Perlbal will then use asynchronous IO to send the file to the user without
slowing down Perlbal at all.
-This support also extens to URLs that can be located anywhere Perlbal has
+This support also extends to URLs that can be located anywhere Perlbal has
access to. It's the same syntax, nearly:
X-REPROXY-URL: http://foo.com:80/resource.html
diff --git a/doc/service-parameters.txt b/doc/service-parameters.txt
index 972f10b..eb9e6ae 100644
--- a/doc/service-parameters.txt
+++ b/doc/service-parameters.txt
@@ -311,7 +311,7 @@ Only for 'web_server' services:
|-------------------+------+------------+--------------------------------|
| enable_put | bool | false | Enable HTTP PUT requests. |
|-------------------+------+------------+--------------------------------|
- | | | | Comma-seperated list of |
+ | | | | Comma-separated list of |
| index_files | | index.html | filenames to load when a user |
| | | | visits a directory URL, listed |
| | | | in order of preference. |
diff --git a/lib/Perlbal.pm b/lib/Perlbal.pm
index bb874ec..2d214d7 100644
--- a/lib/Perlbal.pm
+++ b/lib/Perlbal.pm
@@ -1197,7 +1197,7 @@ sub daemonize {
croak "Cannot detach from controlling terminal"
unless $sess_id = POSIX::setsid();
- ## Prevent possibility of acquiring a controling terminal
+ ## Prevent possibility of acquiring a controlling terminal
$SIG{'HUP'} = 'IGNORE';
if ($pid = fork) { exit 0; }
diff --git a/lib/Perlbal/ClientHTTPBase.pm b/lib/Perlbal/ClientHTTPBase.pm
index 6e3c146..fe83b9b 100644
--- a/lib/Perlbal/ClientHTTPBase.pm
+++ b/lib/Perlbal/ClientHTTPBase.pm
@@ -243,7 +243,7 @@ sub event_read {
# PUT/POST overflow, it'll be sent to ClientHTTPBase, which can't
# handle it yet. must wait for the selector (which has as much
# time as it wants) to route as to our subclass, which can then
- # renable reads.
+ # re-enable reads.
$self->watch_read(0);
my $select = sub {
@@ -593,7 +593,7 @@ sub _serve_request_multiple_poststat {
$ims_len = $1;
}
- # What is -f _ doing here? don't we detect the existance of all files above in the loop?
+ # What is -f _ doing here? don't we detect the existence of all files above in the loop?
my $not_mod = $ims eq $lastmod && -f _;
my $res;
diff --git a/lib/Perlbal/ClientProxy.pm b/lib/Perlbal/ClientProxy.pm
index 6494616..8dfce27 100644
--- a/lib/Perlbal/ClientProxy.pm
+++ b/lib/Perlbal/ClientProxy.pm
@@ -316,7 +316,7 @@ sub start_reproxy_file {
}
# if the thing we're reproxying is indeed a file, advertise that
- # we support byteranges on it
+ # we support byte ranges on it
if (-f _) {
$hd->header("Accept-Ranges", "bytes");
}
@@ -426,7 +426,7 @@ sub backend_finished {
my Perlbal::ClientProxy $self = shift;
print "ClientProxy::backend_finished\n" if Perlbal::DEBUG >= 3;
- # mark ourselves as having responded (presumeably if we're here,
+ # mark ourselves as having responded (presumably if we're here,
# the backend has responded already)
$self->{responded} = 1;
@@ -438,7 +438,7 @@ sub backend_finished {
return $self->http_response_sent unless $self->{unread_data_waiting};
# if we get here (and we do, rarely, in practice) then that means
- # the backend read was empty/disconected (or otherwise messed up),
+ # the backend read was empty/disconnected (or otherwise messed up),
# and the only thing we can really do is close the client down.
$self->close("backend_finished_while_unread_data");
}
@@ -1119,7 +1119,7 @@ sub buffered_upload_update {
$self->{buoutpos} += $bytes;
# now check if we wrote less than we had in this chunk of buffer. if that's
- # the case then we need to reenqueue the part of the chunk that wasn't
+ # the case then we need to re-enqueue the part of the chunk that wasn't
# written out and update as appropriate.
if ($bytes < $len) {
my $diff = $len - $bytes;
@@ -1173,7 +1173,7 @@ sub purge_buffered_upload {
$self->{bufh} = undef;
eval {
- # now asyncronously unlink the file
+ # now asynchronously unlink the file
Perlbal::AIO::aio_unlink($self->{bufilename}, sub {
if ($!) {
# note an error, but whatever, we'll either overwrite the file later (O_TRUNC | O_CREAT)
diff --git a/lib/Perlbal/HTTPHeaders.pm b/lib/Perlbal/HTTPHeaders.pm
index ebfd4d1..1ff036b 100644
--- a/lib/Perlbal/HTTPHeaders.pm
+++ b/lib/Perlbal/HTTPHeaders.pm
@@ -427,7 +427,7 @@ sub res_keep_alive {
# returns (status, range_start, range_end) when given a size
# status = 200 - invalid or non-existent range header. serve normally.
-# status = 206 - parsable range is good. serve partial content.
+# status = 206 - parseable range is good. serve partial content.
# status = 416 - Range is unsatisfiable
sub range {
my Perlbal::HTTPHeaders $self = $_[0];
diff --git a/lib/Perlbal/Plugin/Cgilike.pm b/lib/Perlbal/Plugin/Cgilike.pm
index a2963c9..e841ff9 100644
--- a/lib/Perlbal/Plugin/Cgilike.pm
+++ b/lib/Perlbal/Plugin/Cgilike.pm
@@ -44,7 +44,7 @@ With this plugin loaded into a particular service, the plugin will then be calle
all requests for that service.
Set cgilike.handler to the name of a subroutine that will handle requests. This subroutine
-will recieve an object which allows interaction with the Perlbal service.
+will receive an object which allows interaction with the Perlbal service.
package MyPackage
sub handler {
diff --git a/lib/Perlbal/Plugin/EchoService.pm b/lib/Perlbal/Plugin/EchoService.pm
index 7705657..3f6f1f7 100644
--- a/lib/Perlbal/Plugin/EchoService.pm
+++ b/lib/Perlbal/Plugin/EchoService.pm
@@ -8,7 +8,7 @@ package Perlbal::Plugin::EchoService;
use strict;
use warnings;
-# on load we need to define the service and any paramemters we want
+# on load we need to define the service and any parameters we want
sub load {
# define the echo service, which instantiates this type of object
diff --git a/lib/Perlbal/Plugin/Highpri.pm b/lib/Perlbal/Plugin/Highpri.pm
index 2cadcf9..0c26968 100644
--- a/lib/Perlbal/Plugin/Highpri.pm
+++ b/lib/Perlbal/Plugin/Highpri.pm
@@ -38,7 +38,7 @@ sub register {
# if they said undef, that's not a regexp, that means use none
my $temp;
unless ($val eq 'undef' || $val eq 'none' || $val eq 'null') {
- # verify this regex works? do it in an eval because qr will die
+ # verify this regexp works? do it in an eval because qr will die
# if we give it something invalid
eval {
$temp = qr{$val};
diff --git a/lib/Perlbal/Plugin/Palimg.pm b/lib/Perlbal/Plugin/Palimg.pm
index 99c2046..4c61dc9 100644
--- a/lib/Perlbal/Plugin/Palimg.pm
+++ b/lib/Perlbal/Plugin/Palimg.pm
@@ -59,7 +59,7 @@ sub register {
sysseek($obj->{reproxy_fh}, $ld, &POSIX::SEEK_SET);
$obj->{reproxy_file_offset} = $ld;
- # reenable writes after we get data
+ # re-enable writes after we get data
$obj->tcp_cork(1); # by setting reproxy_file_offset above, it won't cork, so we cork it
$obj->write($data);
$obj->watch_write(1);
@@ -278,7 +278,7 @@ sub new_png_palette
} else {
my $skip;
# Skip rest of chunk and add to imgdata
- # Number of bytes is +4 becauses of CRC
+ # Number of bytes is +4 because of CRC
#
for (my $count=0; $count < $length + 4; $count++) {
$read->(\$skip, 1);
@@ -325,7 +325,7 @@ Example C<perlbal.conf>:
=head1 GRADIENTS
-You can change the gradient of the image by adding C</pg0011111164ffffff> to the end of the url. C<00> is the index where the gradient starts and C<111111> is the color (in hex) of the begining of the gradient. C<64> is the index of the end of the gradient and C<ffffff> is the color of the end of the gradient. Note that all colors specified in hex should be lowercase.
+You can change the gradient of the image by adding C</pg0011111164ffffff> to the end of the url. C<00> is the index where the gradient starts and C<111111> is the color (in hex) of the beginning of the gradient. C<64> is the index of the end of the gradient and C<ffffff> is the color of the end of the gradient. Note that all colors specified in hex should be lowercase.
Example:
diff --git a/lib/Perlbal/Plugin/Stats.pm b/lib/Perlbal/Plugin/Stats.pm
index 3cd659a..e28b886 100644
--- a/lib/Perlbal/Plugin/Stats.pm
+++ b/lib/Perlbal/Plugin/Stats.pm
@@ -27,7 +27,7 @@ sub register {
$statobjs{$svc->{name}} = [ $svc, $sobj ];
# simple events we count are done here. when the hook on the left side is called,
- # we simply increment the count of the stat ont he right side.
+ # we simply increment the count of the stat on the right side.
my %simple = qw(
start_send_file files_sent
start_file_reproxy files_reproxied
diff --git a/lib/Perlbal/Plugin/Vhosts.pm b/lib/Perlbal/Plugin/Vhosts.pm
index a6d3755..6a14e27 100644
--- a/lib/Perlbal/Plugin/Vhosts.pm
+++ b/lib/Perlbal/Plugin/Vhosts.pm
@@ -3,9 +3,9 @@
###########################################################################
# things to test:
-# one persistent connection, first to a docs plugin, then to web proxy... see if it returns us to our base class after end of reuqest
+# one persistent connection, first to a docs plugin, then to web proxy... see if it returns us to our base class after end of request
# PUTing a large file to a selector, seeing if it is put correctly to the PUT-enabled web_server proxy
-# obvious cases: non-existant domains, default domains (*), proper matching (foo.brad.lj before *.brad.lj)
+# obvious cases: non-existent domains, default domains (*), proper matching (foo.brad.lj before *.brad.lj)
#
package Perlbal::Plugin::Vhosts;
diff --git a/lib/Perlbal/Service.pm b/lib/Perlbal/Service.pm
index 1ad57ae..82f1b26 100644
--- a/lib/Perlbal/Service.pm
+++ b/lib/Perlbal/Service.pm
@@ -63,7 +63,7 @@ use fields (
'waiting_clients', # arrayref of clients waiting for backendhttp conns
'waiting_clients_highpri', # arrayref of high-priority clients waiting for backendhttp conns
'waiting_clients_lowpri', # arrayref of low-priority clients waiting for backendhttp conns
- 'waiting_client_count', # number of clients waiting for backendds
+ 'waiting_client_count', # number of clients waiting for backends
'waiting_client_map' , # map of clientproxy fd -> 1 (if they're waiting for a conn)
'pending_connects', # hashref of "ip:port" -> $time (only one pending connect to backend at a time)
'pending_connect_count', # number of outstanding backend connects
@@ -326,7 +326,7 @@ our $tunables = {
},
'enable_concatenate_get' => {
- des => "Enable Perlbal's multiple-files-in-one-request mode, where a client have use a comma-separated list of files to return, always in text/plain. Useful for webapps which have dozens/hundreds of tiny css/js files, and don't trust browsers/etc to do pipelining. Decreases overall roundtrip latency a bunch, but requires app to be modified to support it. See t/17-concat.t test for details.",
+ des => "Enable Perlbal's multiple-files-in-one-request mode, where a client have use a comma-separated list of files to return, always in text/plain. Useful for web apps which have dozens/hundreds of tiny css/js files, and don't trust browsers/etc to do pipelining. Decreases overall round-trip latency a bunch, but requires app to be modified to support it. See t/17-concat.t test for details.",
default => 0,
check_role => "web_server",
check_type => "bool",
@@ -394,7 +394,7 @@ our $tunables = {
'index_files' => {
check_role => "web_server",
default => "index.html",
- des => "Comma-seperated list of filenames to load when a user visits a directory URL, listed in order of preference.",
+ des => "Comma-separated list of filenames to load when a user visits a directory URL, listed in order of preference.",
setter => sub {
my ($self, $val, $set, $mc) = @_;
$self->{index_files} = [ split(/[\s,]+/, $val) ];
@@ -1262,7 +1262,7 @@ sub spawn_backends {
unless ($pool) {
if (my $sp = $self->{server_process}) {
warn "To create = $to_create...\n";
- warn " spawing $sp\n";
+ warn " spawning $sp\n";
my $be = Perlbal::BackendHTTP->new_process($self, $sp);
return;
}
diff --git a/lib/Perlbal/Socket.pm b/lib/Perlbal/Socket.pm
index 3daf7fe..1a5d5a2 100644
--- a/lib/Perlbal/Socket.pm
+++ b/lib/Perlbal/Socket.pm
@@ -110,7 +110,7 @@ sub new {
@created_objects = grep { $_ } @created_objects;
# however, the grep turned our weak references back into strong ones, so
- # we have to reweaken them
+ # we have to re-weaken them
weaken($_) foreach @created_objects;
# we've cleaned up at this point
diff --git a/lib/Perlbal/SocketSSL.pm b/lib/Perlbal/SocketSSL.pm
index d52fce6..f868c25 100644
--- a/lib/Perlbal/SocketSSL.pm
+++ b/lib/Perlbal/SocketSSL.pm
@@ -62,7 +62,7 @@ sub new {
$self->SUPER::new($sock);
# TODO: would be good to have an overall timeout so that we can
- # kill sockets that are open and just sitting ethere. "ssl_handshake_timeout"
+ # kill sockets that are open and just sitting there. "ssl_handshake_timeout"
# or something like that...
return $self;
diff --git a/lib/Perlbal/TCPListener.pm b/lib/Perlbal/TCPListener.pm
index c3ac6e0..0eb4441 100644
--- a/lib/Perlbal/TCPListener.pm
+++ b/lib/Perlbal/TCPListener.pm
@@ -76,7 +76,7 @@ sub event_read {
# SSL promotion if necessary
if ($self->{sslopts}) {
- # try to upgrade to SSL, this does no IO it just reblesses
+ # try to upgrade to SSL, this does no IO it just re-blesses
# and prepares the SSL engine for handling us later
IO::Socket::SSL->start_SSL(
$psock,
diff --git a/lib/Perlbal/Util.pm b/lib/Perlbal/Util.pm
index 4c42e77..7016814 100644
--- a/lib/Perlbal/Util.pm
+++ b/lib/Perlbal/Util.pm
@@ -17,7 +17,7 @@ sub durl {
Safely re-bless a locked (use fields) hash into another package. Note
that for our convenience elsewhere the set of allowable keys for the
-reblessed hash will be the union of the keys allowed by its old package
+re-blessed hash will be the union of the keys allowed by its old package
and those allowed for the package into which it is blessed.
=cut
diff --git a/t/30-reverseproxy.t b/t/30-reverseproxy.t
index 26723f8..4628504 100644
--- a/t/30-reverseproxy.t
+++ b/t/30-reverseproxy.t
@@ -52,7 +52,7 @@ is($wc->reqdone, 0, "didn't persist to perlbal");
# verify 1 count
is(req_count(), 1, 'stats show 1 request');
-# persisent is on, so let's do some more and see if they're counting up
+# persistent is on, so let's do some more and see if they're counting up
$wc->keepalive(1);
$resp = $wc->request('status');
is(reqnum($resp), 2, "second request");
diff --git a/t/32-pipelining.t b/t/32-pipelining.t
index 13eff5a..2a06aaa 100644
--- a/t/32-pipelining.t
+++ b/t/32-pipelining.t
@@ -4,7 +4,7 @@
# properly, notably not poisoning the backend by injecting two when we only
# know of one, and also dealing okay with POSTs with an extra \r\n, which
# happen in the real world, without disconnecting those users thinking
-# their bogus-pipeling-flooding us.
+# they're bogus-pipeline-flooding us.
#
use strict;
More information about the perlbal
mailing list