You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by yl...@apache.org on 2020/02/21 00:33:42 UTC
svn commit: r1874286 [2/2] - in /httpd/httpd/branches/2.4.x: ./ include/
modules/aaa/ modules/arch/win32/ modules/cache/ modules/core/
modules/dav/fs/ modules/dav/main/ modules/filters/ modules/http/
modules/http2/ modules/ldap/ modules/mappers/ module...
Modified: httpd/httpd/branches/2.4.x/server/mpm/event/event.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/server/mpm/event/event.c?rev=1874286&r1=1874285&r2=1874286&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/server/mpm/event/event.c (original)
+++ httpd/httpd/branches/2.4.x/server/mpm/event/event.c Fri Feb 21 00:33:40 2020
@@ -1074,7 +1074,7 @@ read_request:
* completion at some point may require reads (e.g. SSL_ERROR_WANT_READ),
* an output filter can also set the sense to CONN_SENSE_WANT_READ at any
* time for event MPM to do the right thing,
- * - suspend the connection (SUSPENDED) such that it now interracts with
+ * - suspend the connection (SUSPENDED) such that it now interacts with
* the MPM through suspend/resume_connection() hooks, and/or registered
* poll callbacks (PT_USER), and/or registered timed callbacks triggered
* by timer events.
@@ -2187,7 +2187,7 @@ static void setup_threads_runtime(void)
* the connections they handle (i.e. ptrans). We can't use this thread's
* self pool because all these objects survive it, nor use pchild or pconf
* directly because this starter thread races with other modules' runtime,
- * nor finally pchild (or subpool thereof) because it is killed explicitely
+ * nor finally pchild (or subpool thereof) because it is killed explicitly
* before pconf (thus connections/ptrans can live longer, which matters in
* ONE_PROCESS mode). So this leaves us with a subpool of pconf, created
* before any ptrans hence destroyed after.
@@ -2491,7 +2491,7 @@ static void child_main(int child_num_arg
* from being received. The child processes no longer use signals for
* any communication with the parent process. Let's also do this before
* child_init() hooks are called and possibly create threads that
- * otherwise could "steal" (implicitely) MPM's signals.
+ * otherwise could "steal" (implicitly) MPM's signals.
*/
rv = apr_setup_signal_thread();
if (rv != APR_SUCCESS) {
Modified: httpd/httpd/branches/2.4.x/server/mpm/mpmt_os2/mpmt_os2.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/server/mpm/mpmt_os2/mpmt_os2.c?rev=1874286&r1=1874285&r2=1874286&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/server/mpm/mpmt_os2/mpmt_os2.c (original)
+++ httpd/httpd/branches/2.4.x/server/mpm/mpmt_os2/mpmt_os2.c Fri Feb 21 00:33:40 2020
@@ -26,7 +26,7 @@
*
* Each child process consists of a pool of worker threads and a
* main thread that accepts connections & passes them to the workers via
- * a work queue. The worker thread pool is dynamic, managed by a maintanence
+ * a work queue. The worker thread pool is dynamic, managed by a maintenance
* thread so that the number of idle threads is kept between
* min_spare_threads & max_spare_threads.
*
Modified: httpd/httpd/branches/2.4.x/server/mpm/prefork/prefork.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/server/mpm/prefork/prefork.c?rev=1874286&r1=1874285&r2=1874286&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/server/mpm/prefork/prefork.c (original)
+++ httpd/httpd/branches/2.4.x/server/mpm/prefork/prefork.c Fri Feb 21 00:33:40 2020
@@ -703,8 +703,8 @@ static int make_child(server_rec *s, int
*/
apr_signal(SIGHUP, just_die);
apr_signal(SIGTERM, just_die);
- /* Ignore SIGINT in child. This fixes race-condition in signals
- * handling when httpd is runnning on foreground and user hits ctrl+c.
+ /* Ignore SIGINT in child. This fixes race-conditions in signals
+ * handling when httpd is running on foreground and user hits ctrl+c.
* In this case, SIGINT is sent to all children followed by SIGTERM
* from the main process, which interrupts the SIGINT handler and
* leads to inconsistency.
Modified: httpd/httpd/branches/2.4.x/server/mpm/winnt/mpm_winnt.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/server/mpm/winnt/mpm_winnt.c?rev=1874286&r1=1874285&r2=1874286&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/server/mpm/winnt/mpm_winnt.c (original)
+++ httpd/httpd/branches/2.4.x/server/mpm/winnt/mpm_winnt.c Fri Feb 21 00:33:40 2020
@@ -437,7 +437,7 @@ static int send_handles_to_child(apr_poo
* get_listeners_from_parent()
* The listen sockets are opened in the parent. This function, which runs
* exclusively in the child process, receives them from the parent and
- * makes them availeble in the child.
+ * makes them available in the child.
*/
static void get_listeners_from_parent(server_rec *s)
{
@@ -743,7 +743,7 @@ static int create_process(apr_pool_t *p,
* of this event means that the child process has exited prematurely
* due to a seg fault or other irrecoverable error. For server
* robustness, master_main will restart the child process under this
- * condtion.
+ * condition.
*
* master_main uses the child_exit_event to signal the child process
* to exit.
@@ -1130,7 +1130,7 @@ static void winnt_rewrite_args(process_r
"Failed to get the full path of %s", process->argv[0]);
exit(APEXIT_INIT);
}
- /* WARNING: There is an implict assumption here that the
+ /* WARNING: There is an implicit assumption here that the
* executable resides in ServerRoot or ServerRoot\bin
*/
def_server_root = (char *) apr_filepath_name_get(binpath);
@@ -1377,7 +1377,7 @@ static int winnt_pre_config(apr_pool_t *
ap_exists_config_define("DEBUG"))
one_process = -1;
- /* XXX: presume proper privilages; one nice thing would be
+ /* XXX: presume proper privileges; one nice thing would be
* a loud emit if running as "LocalSystem"/"SYSTEM" to indicate
* they should change to a user with write access to logs/ alone.
*/
@@ -1604,7 +1604,7 @@ static int winnt_post_config(apr_pool_t
CleanNullACL((void *)sa);
/* Create the start mutex, as an unnamed object for security.
- * Ths start mutex is used during a restart to prevent more than
+ * The start mutex is used during a restart to prevent more than
* one child process from entering the accept loop at once.
*/
rv = apr_proc_mutex_create(&start_mutex, NULL,
Modified: httpd/httpd/branches/2.4.x/server/mpm/winnt/service.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/server/mpm/winnt/service.c?rev=1874286&r1=1874285&r2=1874286&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/server/mpm/winnt/service.c (original)
+++ httpd/httpd/branches/2.4.x/server/mpm/winnt/service.c Fri Feb 21 00:33:40 2020
@@ -801,7 +801,7 @@ apr_status_t mpm_service_install(apr_poo
rv = apr_get_os_error();
ap_log_error(APLOG_MARK, APLOG_ERR | APLOG_STARTUP, rv, NULL,
APLOGNO(00369) "Failed to open the Windows service "
- "manager, perhaps you forgot to log in as Adminstrator?");
+ "manager, perhaps you forgot to log in as Administrator?");
return (rv);
}
@@ -957,7 +957,7 @@ apr_status_t mpm_service_uninstall(void)
rv = apr_get_os_error();
ap_log_error(APLOG_MARK, APLOG_ERR | APLOG_STARTUP, rv, NULL,
APLOGNO(10009) "Failed to open the Windows service "
- "manager, perhaps you forgot to log in as Adminstrator?");
+ "manager, perhaps you forgot to log in as Administrator?");
return (rv);
}
@@ -1047,7 +1047,7 @@ apr_status_t mpm_service_start(apr_pool_
rv = apr_get_os_error();
ap_log_error(APLOG_MARK, APLOG_ERR | APLOG_STARTUP, rv, NULL,
APLOGNO(10011) "Failed to open the Windows service "
- "manager, perhaps you forgot to log in as Adminstrator?");
+ "manager, perhaps you forgot to log in as Administrator?");
return (rv);
}
@@ -1157,7 +1157,7 @@ void mpm_signal_service(apr_pool_t *ptem
ap_log_error(APLOG_MARK, APLOG_ERR | APLOG_STARTUP,
apr_get_os_error(), NULL,
APLOGNO(10013) "Failed to open the Windows service "
- "manager, perhaps you forgot to log in as Adminstrator?");
+ "manager, perhaps you forgot to log in as Administrator?");
return;
}
Modified: httpd/httpd/branches/2.4.x/server/mpm/worker/worker.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/server/mpm/worker/worker.c?rev=1874286&r1=1874285&r2=1874286&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/server/mpm/worker/worker.c (original)
+++ httpd/httpd/branches/2.4.x/server/mpm/worker/worker.c Fri Feb 21 00:33:40 2020
@@ -862,7 +862,7 @@ static void setup_threads_runtime(void)
* the connections they handle (i.e. ptrans). We can't use this thread's
* self pool because all these objects survive it, nor use pchild or pconf
* directly because this starter thread races with other modules' runtime,
- * nor finally pchild (or subpool thereof) because it is killed explicitely
+ * nor finally pchild (or subpool thereof) because it is killed explicitly
* before pconf (thus connections/ptrans can live longer, which matters in
* ONE_PROCESS mode). So this leaves us with a subpool of pconf, created
* before any ptrans hence destroyed after.
@@ -1138,7 +1138,7 @@ static void child_main(int child_num_arg
* from being received. The child processes no longer use signals for
* any communication with the parent process. Let's also do this before
* child_init() hooks are called and possibly create threads that
- * otherwise could "steal" (implicitely) MPM's signals.
+ * otherwise could "steal" (implicitly) MPM's signals.
*/
rv = apr_setup_signal_thread();
if (rv != APR_SUCCESS) {
Modified: httpd/httpd/branches/2.4.x/server/mpm_unix.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/server/mpm_unix.c?rev=1874286&r1=1874285&r2=1874286&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/server/mpm_unix.c (original)
+++ httpd/httpd/branches/2.4.x/server/mpm_unix.c Fri Feb 21 00:33:40 2020
@@ -706,7 +706,7 @@ static apr_status_t dummy_connection(ap_
}
else /* ... XXX other request types here? */ {
/* Create an HTTP request string. We include a User-Agent so
- * that adminstrators can track down the cause of the
+ * that administrators can track down the cause of the
* odd-looking requests in their logs. A complete request is
* used since kernel-level filtering may require that much
* data before returning from accept(). */
Modified: httpd/httpd/branches/2.4.x/server/protocol.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/server/protocol.c?rev=1874286&r1=1874285&r2=1874286&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/server/protocol.c (original)
+++ httpd/httpd/branches/2.4.x/server/protocol.c Fri Feb 21 00:33:40 2020
@@ -2241,7 +2241,7 @@ static int protocol_cmp(const apr_array_
return (index2 >= 0) ? -1 : 1;
}
}
- /* both have the same index (mabye -1 or no pref configured) and we compare
+ /* both have the same index (maybe -1 or no pref configured) and we compare
* the names so that spdy3 gets precedence over spdy2. That makes
* the outcome at least deterministic. */
return strcmp(proto1, proto2);
Modified: httpd/httpd/branches/2.4.x/server/util_script.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/server/util_script.c?rev=1874286&r1=1874285&r2=1874286&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/server/util_script.c (original)
+++ httpd/httpd/branches/2.4.x/server/util_script.c Fri Feb 21 00:33:40 2020
@@ -45,7 +45,7 @@
/*
* Various utility functions which are common to a whole lot of
* script-type extensions mechanisms, and might as well be gathered
- * in one place (if only to avoid creating inter-module dependancies
+ * in one place (if only to avoid creating inter-module dependencies
* where there don't have to be).
*/
Modified: httpd/httpd/branches/2.4.x/support/SHA1/htpasswd-sha1.pl
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/support/SHA1/htpasswd-sha1.pl?rev=1874286&r1=1874285&r2=1874286&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/support/SHA1/htpasswd-sha1.pl (original)
+++ httpd/httpd/branches/2.4.x/support/SHA1/htpasswd-sha1.pl Fri Feb 21 00:33:40 2020
@@ -5,7 +5,7 @@ use strict;
# on the command line and generates a username
# sha1-encrytped password on the stdout.
#
-# Typical useage:
+# Typical usage:
# ./htpasswd-sha1.pl dirkx MySecret >> sha1-passwd
#
# This is public domain code. Do whatever you want with it.
Modified: httpd/httpd/branches/2.4.x/support/ab.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/support/ab.c?rev=1874286&r1=1874285&r2=1874286&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/support/ab.c (original)
+++ httpd/httpd/branches/2.4.x/support/ab.c Fri Feb 21 00:33:40 2020
@@ -55,7 +55,7 @@
** trapping of connection errors which influenced measurements.
** Contributed by Sander Temme, Early 2001
** Version 1.3e
- ** - Changed timeout behavour during write to work whilst the sockets
+ ** - Changed timeout behavior during write to work whilst the sockets
** are filling up and apr_write() does writes a few - but not all.
** This will potentially change results. <di...@webweaving.org>, April 2001
** Version 2.0.36-dev
@@ -1316,7 +1316,7 @@ static void output_html_results(void)
total = ap_round_ms(total);
if (done > 0) { /* avoid division by zero (if 0 done) */
- printf("<tr %s><th %s colspan=4>Connnection Times (ms)</th></tr>\n",
+ printf("<tr %s><th %s colspan=4>Connection Times (ms)</th></tr>\n",
trstring, tdstring);
printf("<tr %s><th %s> </th> <th %s>min</th> <th %s>avg</th> <th %s>max</th></tr>\n",
trstring, tdstring, tdstring, tdstring, tdstring);
Modified: httpd/httpd/branches/2.4.x/support/rotatelogs.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/support/rotatelogs.c?rev=1874286&r1=1874285&r2=1874286&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/support/rotatelogs.c (original)
+++ httpd/httpd/branches/2.4.x/support/rotatelogs.c Fri Feb 21 00:33:40 2020
@@ -506,7 +506,7 @@ static void doRotate(rotate_config_t *co
/*
* Get a size or time param from a string.
* Parameter 'last' indicates, whether the
- * argument is the last commadnline argument.
+ * argument is the last commandline argument.
* UTC offset is only allowed as a last argument
* in order to make is distinguishable from the
* rotation interval time.
Modified: httpd/httpd/branches/2.4.x/support/suexec.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/support/suexec.c?rev=1874286&r1=1874285&r2=1874286&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/support/suexec.c (original)
+++ httpd/httpd/branches/2.4.x/support/suexec.c Fri Feb 21 00:33:40 2020
@@ -516,7 +516,7 @@ int main(int argc, char *argv[])
/*
* Get the current working directory, as well as the proper
- * document root (dependant upon whether or not it is a
+ * document root (dependent upon whether or not it is a
* ~userdir request). Error out if we cannot get either one,
* or if the current working directory is not in the docroot.
* Use chdir()s and getcwd()s to avoid problems with symlinked
Modified: httpd/httpd/branches/2.4.x/test/make_sni.sh
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/test/make_sni.sh?rev=1874286&r1=1874285&r2=1874286&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/test/make_sni.sh (original)
+++ httpd/httpd/branches/2.4.x/test/make_sni.sh Fri Feb 21 00:33:40 2020
@@ -143,7 +143,7 @@ openssl req -new -nodes -batch \
-keyout ${CDIR}/xs-root-2.key -out ${CDIR}/xs-root-2.pem \
|| exit 2
-# Create a chain of just the two access authorites:
+# Create a chain of just the two access authorities:
cat ${CDIR}/xs-root-2.pem ${CDIR}/xs-root-1.pem > ${CDIR}/xs-root-chain.pem
# And likewise a directory with the same information (using the
@@ -206,7 +206,7 @@ ErrorLog ${DIR}/logs/error_log
SSLSessionCache none
# Note that this SSL configuration is far
-# from complete - you propably will want
+# from complete - you probably will want
# to configure SSLSession Caches at the
# very least.
@@ -295,7 +295,7 @@ do
# Uncomment the following lines if you
# want to only allow access to clients with
# a certificate issued/signed by some
- # selection of the issuing authorites
+ # selection of the issuing authorities
#
# SSLCACertificate ${CDIR}/xs-root-1.pem # just root 1
# SSLCACertificate ${CDIR}/xs-root-2.pem # just root 2
Modified: httpd/httpd/branches/2.4.x/test/test_limits.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/test/test_limits.c?rev=1874286&r1=1874285&r2=1874286&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/test/test_limits.c (original)
+++ httpd/httpd/branches/2.4.x/test/test_limits.c Fri Feb 21 00:33:40 2020
@@ -32,7 +32,7 @@
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. The name of the author may not be used to endorse or promote products
- * derived from this software withough specific prior written permission
+ * derived from this software without specific prior written permission
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES