You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ja...@apache.org on 2018/03/24 20:05:20 UTC

svn commit: r1827669 - in /httpd/httpd/trunk: include/ modules/filters/ modules/http/ modules/http2/ modules/lua/ modules/mappers/ modules/proxy/ modules/ssl/ server/

Author: jailletc36
Date: Sat Mar 24 20:05:19 2018
New Revision: 1827669

URL: http://svn.apache.org/viewvc?rev=1827669&view=rev
Log:
Fix some typos reported in PR 59998
Most add already been fixed when PR 59990 had been applied on trunk. 

Thx klemens

Modified:
    httpd/httpd/trunk/include/apreq.h
    httpd/httpd/trunk/include/apreq_parser.h
    httpd/httpd/trunk/include/apreq_util.h
    httpd/httpd/trunk/include/http_config.h
    httpd/httpd/trunk/modules/filters/mod_sed.c
    httpd/httpd/trunk/modules/http/http_request.c
    httpd/httpd/trunk/modules/http2/h2_config.c
    httpd/httpd/trunk/modules/http2/h2_ngn_shed.c
    httpd/httpd/trunk/modules/http2/h2_task.h
    httpd/httpd/trunk/modules/http2/h2_util.c
    httpd/httpd/trunk/modules/lua/lua_request.c
    httpd/httpd/trunk/modules/mappers/mod_imagemap.c
    httpd/httpd/trunk/modules/proxy/mod_serf.h
    httpd/httpd/trunk/modules/ssl/mod_ssl_ct.c
    httpd/httpd/trunk/server/apreq_cookie.c
    httpd/httpd/trunk/server/apreq_module_cgi.c

Modified: httpd/httpd/trunk/include/apreq.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/apreq.h?rev=1827669&r1=1827668&r2=1827669&view=diff
==============================================================================
--- httpd/httpd/trunk/include/apreq.h (original)
+++ httpd/httpd/trunk/include/apreq.h Sat Mar 24 20:05:19 2018
@@ -227,7 +227,7 @@ void apreq_value_table_add(const apreq_v
  * and apreq_post_initialize() instead.
  *
  * @param pool a base pool persisting while libapreq2 is used
- * @remarks after you detroy the pool, you have to call this function again
+ * @remarks after you destroy the pool, you have to call this function again
  *    with a new pool if you still plan to use libapreq2
  */
 APREQ_DECLARE(apr_status_t) apreq_initialize(apr_pool_t *pool);
@@ -241,7 +241,7 @@ APREQ_DECLARE(apr_status_t) apreq_initia
  * create a post-config hook using APR_HOOK_MIDDLE.
  *
  * @param pool a base pool persisting while libapreq2 is used
- * @remarks after you detroyed the pool, you have to call this function again
+ * @remarks after you destroyed the pool, you have to call this function again
  *    with a new pool if you still plan to use libapreq2
  */
 APREQ_DECLARE(apr_status_t) apreq_pre_initialize(apr_pool_t *pool);

Modified: httpd/httpd/trunk/include/apreq_parser.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/apreq_parser.h?rev=1827669&r1=1827668&r2=1827669&view=diff
==============================================================================
--- httpd/httpd/trunk/include/apreq_parser.h (original)
+++ httpd/httpd/trunk/include/apreq_parser.h Sat Mar 24 20:05:19 2018
@@ -278,7 +278,7 @@ typedef struct apreq_hook_find_param_ctx
 
 /**
  * Special purpose utility for locating a parameter
- * during parsing.  The hook's ctx shoud be initialized
+ * during parsing.  The hook's ctx should be initialized
  * to an apreq_hook_find_param_ctx_t *, with the name
  * attribute set to the sought parameter name, the param
  * attribute set to NULL, and the prev attribute set to

Modified: httpd/httpd/trunk/include/apreq_util.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/apreq_util.h?rev=1827669&r1=1827668&r2=1827669&view=diff
==============================================================================
--- httpd/httpd/trunk/include/apreq_util.h (original)
+++ httpd/httpd/trunk/include/apreq_util.h Sat Mar 24 20:05:19 2018
@@ -158,7 +158,7 @@ APREQ_DECLARE(apreq_charset_t) apreq_cha
  * @return ::APREQ_ERROR_BADSEQ or ::APREQ_ERROR_BADCHAR on malformed input.
  *
  * @remarks In the non-success case, dlen will be set to include
- *          the last succesfully decoded value.  This function decodes
+ *          the last successfully decoded value.  This function decodes
  *          \%uXXXX into a utf8 (wide) character, following ECMA-262
  *          (the Javascript spec) Section B.2.1.
  */
@@ -181,7 +181,7 @@ APREQ_DECLARE(apr_status_t) apreq_decode
  * @return ::APREQ_ERROR_BADSEQ or ::APREQ_ERROR_BADCHAR on malformed input.
  *
  * @remarks In the non-APR_SUCCESS case, dlen will be set to include
- *          the last succesfully decoded value.  This function decodes
+ *          the last successfully decoded value.  This function decodes
  *          \%uXXXX into a utf8 (wide) character, following ECMA-262
  *          (the Javascript spec) Section B.2.1.
  */

Modified: httpd/httpd/trunk/include/http_config.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/http_config.h?rev=1827669&r1=1827668&r2=1827669&view=diff
==============================================================================
--- httpd/httpd/trunk/include/http_config.h (original)
+++ httpd/httpd/trunk/include/http_config.h Sat Mar 24 20:05:19 2018
@@ -427,7 +427,7 @@ struct module_struct {
  * The AP_MAYBE_UNUSED macro is used for variable declarations that
  * might potentially exhibit "unused var" warnings on some compilers if
  * left untreated.
- * Since static intializers are not part of the C language (C89), making
+ * Since static initializers are not part of the C language (C89), making
  * (void) usage is not possible. However many compiler have proprietary 
  * mechanism to suppress those warnings.  
  */

Modified: httpd/httpd/trunk/modules/filters/mod_sed.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/filters/mod_sed.c?rev=1827669&r1=1827668&r2=1827669&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/filters/mod_sed.c (original)
+++ httpd/httpd/trunk/modules/filters/mod_sed.c Sat Mar 24 20:05:19 2018
@@ -59,7 +59,7 @@ typedef struct sed_filter_ctxt
 module AP_MODULE_DECLARE_DATA sed_module;
 
 /* This function will be call back from libsed functions if there is any error
- * happend during execution of sed scripts
+ * happened during execution of sed scripts
  */
 static apr_status_t log_sed_errf(void *data, const char *error)
 {
@@ -412,7 +412,7 @@ static apr_status_t sed_request_filter(a
      * the buckets in bbinp and read the data from buckets and invoke
      * sed_eval_buffer on the data. libsed will generate its output using
      * sed_write_output which will add data in ctx->bb. Do it until it have
-     * atleast one bucket in ctx->bb. At the end of data eos bucket
+     * at least one bucket in ctx->bb. At the end of data eos bucket
      * should be there.
      *
      * Once eos bucket is seen, then invoke sed_finalize_eval to clear the

Modified: httpd/httpd/trunk/modules/http/http_request.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http/http_request.c?rev=1827669&r1=1827668&r2=1827669&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http/http_request.c (original)
+++ httpd/httpd/trunk/modules/http/http_request.c Sat Mar 24 20:05:19 2018
@@ -378,7 +378,7 @@ AP_DECLARE(void) ap_process_request_afte
 
     /* The EOR bucket has either been handled by an output filter (eg.
      * deleted or moved to a buffered_bb => no more in bb), or an error
-     * occured before that (eg. c->aborted => still in bb) and we ought
+     * occurred before that (eg. c->aborted => still in bb) and we ought
      * to destroy it now. So cleanup any remaining bucket along with
      * the orphan request (if any).
      */
@@ -779,7 +779,7 @@ AP_DECLARE(void) ap_internal_redirect(co
 
     AP_INTERNAL_REDIRECT(r->uri, new_uri);
 
-    /* ap_die was already called, if an error occured */
+    /* ap_die was already called, if an error occurred */
     if (!new) {
         return;
     }
@@ -803,7 +803,7 @@ AP_DECLARE(void) ap_internal_redirect_ha
     int access_status;
     request_rec *new = internal_internal_redirect(new_uri, r);
 
-    /* ap_die was already called, if an error occured */
+    /* ap_die was already called, if an error occurred */
     if (!new) {
         return;
     }

Modified: httpd/httpd/trunk/modules/http2/h2_config.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/h2_config.c?rev=1827669&r1=1827668&r2=1827669&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http2/h2_config.c (original)
+++ httpd/httpd/trunk/modules/http2/h2_config.c Sat Mar 24 20:05:19 2018
@@ -419,7 +419,7 @@ static const char *h2_conf_add_push_prio
     else if (!strcasecmp("BEFORE", sdependency)) {
         dependency = H2_DEPENDANT_BEFORE;
         if (sweight) {
-            return "dependecy 'Before' does not allow a weight";
+            return "dependency 'Before' does not allow a weight";
         }
     } 
     else if (!strcasecmp("INTERLEAVED", sdependency)) {

Modified: httpd/httpd/trunk/modules/http2/h2_ngn_shed.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/h2_ngn_shed.c?rev=1827669&r1=1827668&r2=1827669&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http2/h2_ngn_shed.c (original)
+++ httpd/httpd/trunk/modules/http2/h2_ngn_shed.c Sat Mar 24 20:05:19 2018
@@ -281,7 +281,7 @@ apr_status_t h2_ngn_shed_pull_request(h2
     if (H2_REQ_ENTRIES_EMPTY(&ngn->entries)) {
         if (want_shutdown) {
             ap_log_cerror(APLOG_MARK, APLOG_TRACE1, 0, shed->c,
-                          "h2_ngn_shed(%ld): emtpy queue, shutdown engine %s", 
+                          "h2_ngn_shed(%ld): empty queue, shutdown engine %s", 
                           shed->c->id, ngn->id);
             ngn->shutdown = 1;
         }

Modified: httpd/httpd/trunk/modules/http2/h2_task.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/h2_task.h?rev=1827669&r1=1827668&r2=1827669&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http2/h2_task.h (original)
+++ httpd/httpd/trunk/modules/http2/h2_task.h Sat Mar 24 20:05:19 2018
@@ -21,7 +21,7 @@
 
 /**
  * A h2_task fakes a HTTP/1.1 request from the data in a HTTP/2 stream 
- * (HEADER+CONT.+DATA) the module recieves.
+ * (HEADER+CONT.+DATA) the module receives.
  *
  * In order to answer a HTTP/2 stream, we want all Apache httpd infrastructure
  * to be involved as usual, as if this stream can as a separate HTTP/1.1
@@ -113,7 +113,7 @@ void h2_task_rst(h2_task *task, int erro
 
 void h2_task_register_hooks(void);
 /*
- * One time, post config intialization.
+ * One time, post config initialization.
  */
 apr_status_t h2_task_init(apr_pool_t *pool, server_rec *s);
 

Modified: httpd/httpd/trunk/modules/http2/h2_util.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/h2_util.c?rev=1827669&r1=1827668&r2=1827669&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http2/h2_util.c (original)
+++ httpd/httpd/trunk/modules/http2/h2_util.c Sat Mar 24 20:05:19 2018
@@ -421,7 +421,7 @@ void h2_iq_clear(h2_iqueue *q)
 void h2_iq_sort(h2_iqueue *q, h2_iq_cmp *cmp, void *ctx)
 {
     /* Assume that changes in ordering are minimal. This needs,
-     * best case, q->nelts - 1 comparisions to check that nothing
+     * best case, q->nelts - 1 comparisons to check that nothing
      * changed.
      */
     if (q->nelts > 0) {

Modified: httpd/httpd/trunk/modules/lua/lua_request.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/lua/lua_request.c?rev=1827669&r1=1827668&r2=1827669&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/lua/lua_request.c (original)
+++ httpd/httpd/trunk/modules/lua/lua_request.c Sat Mar 24 20:05:19 2018
@@ -334,7 +334,7 @@ static char* ap_lua_binstrstr (const cha
     return NULL;
 } 
 
-/* r:parsebody(): Parses regular (url-enocded) or multipart POST data and returns two tables*/
+/* r:parsebody(): Parses regular (url-encoded) or multipart POST data and returns two tables*/
 static int req_parsebody(lua_State *L)
 {
     apr_array_header_t          *pairs;
@@ -1599,7 +1599,7 @@ static int lua_ap_set_context_info(lua_S
 
 /**
  * ap_os_escape_path (apr_pool_t *p, const char *path, int partial)
- * convert an OS path to a URL in an OS dependant way.
+ * convert an OS path to a URL in an OS dependent way.
  * @param p The pool to allocate from
  * @param path The path to convert
  * @param partial if set, assume that the path will be appended to something

Modified: httpd/httpd/trunk/modules/mappers/mod_imagemap.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/mappers/mod_imagemap.c?rev=1827669&r1=1827668&r2=1827669&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/mappers/mod_imagemap.c (original)
+++ httpd/httpd/trunk/modules/mappers/mod_imagemap.c Sat Mar 24 20:05:19 2018
@@ -858,7 +858,7 @@ menu_bail:
         /* There's not much else we can do ... we've already sent the headers
          * to the client.
          */
-        ap_rputs("\n\n[an internal server error occured]\n", r);
+        ap_rputs("\n\n[an internal server error occurred]\n", r);
         menu_footer(r);
         return OK;
     }

Modified: httpd/httpd/trunk/modules/proxy/mod_serf.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_serf.h?rev=1827669&r1=1827668&r2=1827669&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_serf.h (original)
+++ httpd/httpd/trunk/modules/proxy/mod_serf.h Sat Mar 24 20:05:19 2018
@@ -77,7 +77,7 @@ struct ap_serf_cluster_provider_t {
      * unable to contact any of the servers, a 502 will be returned to the
      * client.
      *
-     * Returns OK on sucess, all other return codes will result in a 500.
+     * Returns OK on success, all other return codes will result in a 500.
      *
      * This field must be set.
      */

Modified: httpd/httpd/trunk/modules/ssl/mod_ssl_ct.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/mod_ssl_ct.c?rev=1827669&r1=1827668&r2=1827669&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ssl/mod_ssl_ct.c (original)
+++ httpd/httpd/trunk/modules/ssl/mod_ssl_ct.c Sat Mar 24 20:05:19 2018
@@ -2387,7 +2387,7 @@ static int ssl_ct_init_server(server_rec
                                            NULL, NULL,
                                            client_extension_parse_callback, cbi)) {
             ap_log_error(APLOG_MARK, APLOG_EMERG, 0, s,
-                         APLOGNO(02740) "Unable to initalize Certificate "
+                         APLOGNO(02740) "Unable to initialize Certificate "
                          "Transparency client extension callbacks "
                          "(callback for %d already registered?)",
                          CT_EXTENSION_TYPE);
@@ -2409,7 +2409,7 @@ static int ssl_ct_init_server(server_rec
                                            NULL, NULL,
                                            server_extension_parse_callback, cbi)) {
             ap_log_error(APLOG_MARK, APLOG_EMERG, 0, s,
-                         APLOGNO(02741) "Unable to initalize Certificate "
+                         APLOGNO(02741) "Unable to initialize Certificate "
                          "Transparency server extension callback "
                          "(callbacks for %d already registered?)",
                          CT_EXTENSION_TYPE);

Modified: httpd/httpd/trunk/server/apreq_cookie.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/apreq_cookie.c?rev=1827669&r1=1827668&r2=1827669&view=diff
==============================================================================
--- httpd/httpd/trunk/server/apreq_cookie.c (original)
+++ httpd/httpd/trunk/server/apreq_cookie.c Sat Mar 24 20:05:19 2018
@@ -429,7 +429,7 @@ APREQ_DECLARE(apr_status_t)apreq_parse_c
 APREQ_DECLARE(int) apreq_cookie_serialize(const apreq_cookie_t *c,
                                           char *buf, apr_size_t len)
 {
-    /*  The format string must be large enough to accomodate all
+    /*  The format string must be large enough to accommodate all
      *  of the cookie attributes.  The current attributes sum to
      *  ~90 characters (w/ 6-8 padding chars per attr), so anything
      *  over 100 should be fine.

Modified: httpd/httpd/trunk/server/apreq_module_cgi.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/apreq_module_cgi.c?rev=1827669&r1=1827668&r2=1827669&view=diff
==============================================================================
--- httpd/httpd/trunk/server/apreq_module_cgi.c (original)
+++ httpd/httpd/trunk/server/apreq_module_cgi.c Sat Mar 24 20:05:19 2018
@@ -42,7 +42,7 @@
 
 /** Interactive patch:
  * TODO Don't use 65K buffer
- * TODO Handle empty/non-existant parameters
+ * TODO Handle empty/non-existent parameters
  * TODO Allow body elements to be files
  * TODO When running body/get/cookies all at once, include previous cached
  * values (and don't start at 0 in count)
@@ -947,7 +947,7 @@ static apr_status_t ba_cleanup(void *dat
  Always check query_string before prompting user,
   but rewrite body/cookies to get if interactive
 
- Definately more work needed here...
+ Definitely more work needed here...
 */
 static int is_interactive_mode(apr_pool_t *pool)
 {