Fix a few typos.

contrib/runuwsgi.py

@@ -58,7 +58,7 @@ def handle(self, *args, **options):
         # exec the uwsgi binary
         os.execvp('uwsgi', ('uwsgi',))
 
-    def usage(self, subcomand):
+    def usage(self, subcommand):
         return r"""
 run this project on the uWSGI server
 

core/cache.c

@@ -1238,7 +1238,7 @@ struct uwsgi_cache *uwsgi_cache_create(char *arg) {
 		uwsgi.caches = uc;
 	}
 
-	// default (old-stye) cache ?
+	// default (old-style) cache ?
 	if (!arg) {
 		uc->name = "default";
 		uc->name_len = strlen(uc->name);

core/config.c

@@ -760,7 +760,7 @@ char *uwsgi_get_optname_by_index(int index) {
 
 	translate as:
 
-		step1 = proceses cpu_cores = 2 8 = 28 (string concatenation)
+		step1 = processes cpu_cores = 2 8 = 28 (string concatenation)
 
 		step1 + = step1_apply_func_plus (func token)
 

core/emperor.c

@@ -2905,8 +2905,8 @@ void uwsgi_emperor_simple_do_with_attrs(struct uwsgi_emperor_scanner *ues, char
 		}
 		// check if mtime is changed and the uWSGI instance must be reloaded
 		if (ts > ui_current->last_mod) {
-			// now we neeed a special check for allowing an instance to move to "on_demand" mode (and back)
-			// allowing means "stoppping the instance"
+			// now we need a special check for allowing an instance to move to "on_demand" mode (and back)
+			// allowing means "stopping the instance"
 			if ((!ui_current->socket_name && ui_current->on_demand_fd == -1) && socket_name) {
 				uwsgi_log("[uwsgi-emperor] %s -> requested move to \"on demand\" mode for socket \"%s\" ...\n", name, socket_name);
 				emperor_stop(ui_current);

core/fork_server.c

@@ -103,7 +103,7 @@ void uwsgi_fork_server(char *socket) {
 		}
 		else if (pid > 0) {
 			free(body_argv);
-			// close inherited decriptors 
+			// close inherited descriptors 
 			int i;
 			for(i=0;i<fds_count;i++) close(fds[i]);
 			// wait for child death...
@@ -112,7 +112,7 @@ void uwsgi_fork_server(char *socket) {
 		}
 		else {
 			// close Emperor channels
-			// we do not close others file desctiptor as lot
+			// we do not close others file descriptor as lot
 			// of funny tricks could be accomplished with them
 			if (uwsgi.has_emperor) {
 				close(uwsgi.emperor_fd);

core/master.c

@@ -167,7 +167,7 @@ void uwsgi_master_check_mercy() {
 		if (uwsgi.workers[i].pid > 0 && uwsgi.workers[i].cursed_at) {
 			if (uwsgi_now() > uwsgi.workers[i].no_mercy_at) {
 				uwsgi_log_verbose("worker %d (pid: %d) is taking too much time to die...NO MERCY !!!\n", i, uwsgi.workers[i].pid);
-				// yes that look strangem but we avoid callign it again if we skip waitpid() call below
+				// yes that looks strange but we avoid calling it again if we skip waitpid() call below
 				uwsgi_curse(i, SIGKILL);
 			}
 		}
@@ -659,7 +659,7 @@ int master_loop(char **argv, char **environ) {
 
 		// check for death (before reload !!!)
 		uwsgi_master_check_death();
-		// check for realod
+		// check for reload
 		if (uwsgi_master_check_reload(argv)) {
 			return -1;
 		}
@@ -1082,7 +1082,7 @@ int master_loop(char **argv, char **environ) {
 		}
 		// manage_next_request is zero, but killed by signal...
 		else if (WIFSIGNALED(waitpid_status)) {
-			uwsgi_log("DAMN ! worker %d (pid: %d) MISTERIOUSLY killed by signal %d :( trying respawn ...\n", thewid, (int) diedpid, (int) WTERMSIG(waitpid_status));
+			uwsgi_log("DAMN ! worker %d (pid: %d) MYSTERIOUSLY killed by signal %d :( trying respawn ...\n", thewid, (int) diedpid, (int) WTERMSIG(waitpid_status));
 		}
 
 		if (uwsgi.workers[thewid].cheaped == 1) {

core/master_utils.c

@@ -237,7 +237,7 @@ int uwsgi_cheaper_algo_manual(int can_spawn) {
 
         when at least one worker is free, the overload_count is decremented and the idle_count is incremented.
         If overload_count reaches 0, the system will count active workers (the ones uncheaped) and busy workers (the ones running a request)
-	if there is exacly 1 free worker we are in "stable state" (1 spare worker available). no worker will be touched.
+	if there is exactly 1 free worker we are in "stable state" (1 spare worker available). no worker will be touched.
 	if the number of active workers is higher than uwsgi.cheaper_count and at least uwsgi.cheaper_overload cycles are passed from the last
         "cheap it" procedure, then cheap a worker.
 
@@ -351,7 +351,7 @@ int uwsgi_cheaper_algo_spare(int can_spawn) {
 
 	This algorithm increase workers *before* overloaded, and decrease workers slowly.
 
-	This algorithm uses these options: chaper, cheaper-initial, cheaper-step and cheaper-idle.
+	This algorithm uses these options: cheaper, cheaper-initial, cheaper-step and cheaper-idle.
 
 	* When number of idle workers is smaller than cheaper count, increase
 	  min(cheaper-step, cheaper - idle workers) workers.
@@ -506,7 +506,7 @@ void uwsgi_reload(char **argv) {
 		uwsgi_error("uwsgi_reload()/chdir()");
 	}
 
-	/* check fd table (a module can obviosly open some fd on initialization...) */
+	/* check fd table (a module can obviously open some fd on initialization...) */
 	uwsgi_log("closing all non-uwsgi socket fds > 2 (max_fd = %d)...\n", (int) uwsgi.max_fd);
 	for (i = 3; i < (int) uwsgi.max_fd; i++) {
 		if (uwsgi.close_on_exec2) fcntl(i, F_SETFD, 0);

core/signal.c

@@ -336,7 +336,7 @@ void uwsgi_route_signal(uint8_t sig) {
 			}
 		}
 	}
-	// send to al lactive workers
+	// send to all active workers
 	else if (!strcmp(use->receiver, "active-workers")) {
                 for (i = 1; i <= uwsgi.numproc; i++) {
 			if (uwsgi.workers[i].pid > 0 && !uwsgi.workers[i].cheaped && !uwsgi.workers[i].suspended) {

core/spooler.c

@@ -743,7 +743,7 @@ void uwsgi_spooler_cheap_check() {
 		// this trick for avoiding spawning multiple processes for the same dir
 		// in the same cycle
 		if (!last_managed || strcmp(last_managed, uspool->dir)) {
-			// unfortunately, reusing readdir/scandir of the spooler is too dungeorus
+			// unfortunately, reusing readdir/scandir of the spooler is too dangerous
 			// as the code is run in the master, let's do a simpler check
         		struct dirent *dp;
 			DIR *sdir = opendir(uspool->dir);

core/utils.c

@@ -4502,7 +4502,7 @@ void uwsgi_setns(char *path) {
 		exit(1);
 	}
 
-	// cound be overwritten
+	// count be overwritten
 	int count = 64;
 
 	uwsgi_log("joining namespaces from %s ...\n", path);

core/uwsgi.c

@@ -107,7 +107,7 @@ static struct uwsgi_option uwsgi_base_options[] = {
 	{"declare-option", required_argument, 0, "declare a new uWSGI custom option", uwsgi_opt_add_custom_option, NULL, UWSGI_OPT_IMMEDIATE},
 	{"declare-option2", required_argument, 0, "declare a new uWSGI custom option (non-immediate)", uwsgi_opt_add_custom_option, NULL, 0},
 
-	{"resolve", required_argument, 0, "place the result of a dns query in the specified placeholder, sytax: placeholder=name (immediate option)", uwsgi_opt_resolve, NULL, UWSGI_OPT_IMMEDIATE},
+	{"resolve", required_argument, 0, "place the result of a dns query in the specified placeholder, syntax: placeholder=name (immediate option)", uwsgi_opt_resolve, NULL, UWSGI_OPT_IMMEDIATE},
 
 	{"for", required_argument, 0, "(opt logic) for cycle", uwsgi_opt_logic, (void *) uwsgi_logic_opt_for, UWSGI_OPT_IMMEDIATE},
 	{"for-glob", required_argument, 0, "(opt logic) for cycle (expand glob)", uwsgi_opt_logic, (void *) uwsgi_logic_opt_for_glob, UWSGI_OPT_IMMEDIATE},
@@ -235,7 +235,7 @@ static struct uwsgi_option uwsgi_base_options[] = {
 	{"emperor-command-socket", required_argument, 0, "enable the Emperor command socket", uwsgi_opt_set_str, &uwsgi.emperor_command_socket, 0},
 	{"emperor-wait-for-command", no_argument, 0, "always wait for a 'spawn' Emperor command before starting a vassal", uwsgi_opt_true, &uwsgi.emperor_wait_for_command, 0},
 	{"emperor-wait-for-command-ignore", required_argument, 0, "ignore the emperor-wait-for-command directive for the specified vassal", uwsgi_opt_add_string_list, &uwsgi.emperor_wait_for_command_ignore, 0},
-	{"early-emperor", no_argument, 0, "spawn the emperor as soon as possibile", uwsgi_opt_true, &uwsgi.early_emperor, 0},
+	{"early-emperor", no_argument, 0, "spawn the emperor as soon as possible", uwsgi_opt_true, &uwsgi.early_emperor, 0},
 	{"emperor-broodlord", required_argument, 0, "run the emperor in BroodLord mode", uwsgi_opt_set_int, &uwsgi.emperor_broodlord, 0},
 	{"emperor-throttle", required_argument, 0, "set throttling level (in milliseconds) for bad behaving vassals (default 1000)", uwsgi_opt_set_int, &uwsgi.emperor_throttle, 0},
 	{"emperor-max-throttle", required_argument, 0, "set max throttling level (in milliseconds) for bad behaving vassals (default 3 minutes)", uwsgi_opt_set_int, &uwsgi.emperor_max_throttle, 0},
@@ -697,7 +697,7 @@ static struct uwsgi_option uwsgi_base_options[] = {
 	{"start-unsubscribed", no_argument, 0, "configure subscriptions but do not send them (useful with master fifo)", uwsgi_opt_true, &uwsgi.subscriptions_blocked, 0},
 	{"subscription-clear-on-shutdown", no_argument, 0, "force clear instead of unsubscribe during shutdown", uwsgi_opt_true, &uwsgi.subscription_clear_on_shutdown, 0},
 
-	{"subscribe-with-modifier1", required_argument, 0, "force the specififed modifier1 when subscribing", uwsgi_opt_set_str, &uwsgi.subscribe_with_modifier1, UWSGI_OPT_MASTER},
+	{"subscribe-with-modifier1", required_argument, 0, "force the specified modifier1 when subscribing", uwsgi_opt_set_str, &uwsgi.subscribe_with_modifier1, UWSGI_OPT_MASTER},
 
 	{"snmp", optional_argument, 0, "enable the embedded snmp server", uwsgi_opt_snmp, NULL, 0},
 	{"snmp-community", required_argument, 0, "set the snmp community string", uwsgi_opt_snmp_community, NULL, 0},
@@ -805,7 +805,7 @@ static struct uwsgi_option uwsgi_base_options[] = {
 	{"log-slow", required_argument, 0, "log requests slower than the specified number of milliseconds", uwsgi_opt_set_int, &uwsgi.logging_options.slow, 0},
 	{"log-4xx", no_argument, 0, "log requests with a 4xx response", uwsgi_opt_true, &uwsgi.logging_options._4xx, 0},
 	{"log-5xx", no_argument, 0, "log requests with a 5xx response", uwsgi_opt_true, &uwsgi.logging_options._5xx, 0},
-	{"log-big", required_argument, 0, "log requestes bigger than the specified size", uwsgi_opt_set_64bit,  &uwsgi.logging_options.big, 0},
+	{"log-big", required_argument, 0, "log requests bigger than the specified size", uwsgi_opt_set_64bit,  &uwsgi.logging_options.big, 0},
 	{"log-sendfile", required_argument, 0, "log sendfile requests", uwsgi_opt_true, &uwsgi.logging_options.sendfile, 0},
 	{"log-ioerror", required_argument, 0, "log requests with io errors", uwsgi_opt_true, &uwsgi.logging_options.ioerror, 0},
 	{"log-micros", no_argument, 0, "report response time in microseconds instead of milliseconds", uwsgi_opt_true, &uwsgi.log_micros, 0},
@@ -1479,7 +1479,7 @@ void uwsgi_nuclear_blast() {
 // brutally reload
 void reap_them_all(int signum) {
 
-	// avoid reace condition in lazy mode
+	// avoid race condition in lazy mode
 	if (uwsgi_instance_is_reloading)
 		return;
 
@@ -3468,7 +3468,7 @@ int uwsgi_run() {
 	// eventually maps (or disable) sockets for the  worker
 	uwsgi_map_sockets();
 
-	// eventually set cpu affinity poilicies (OS-dependent)
+	// eventually set cpu affinity policies (OS-dependent)
 	uwsgi_set_cpu_affinity();
 
 	if (uwsgi.worker_exec) {

core/yaml.c

@@ -263,7 +263,7 @@ void uwsgi_yaml_config(char *file, char *magic_table[]) {
 				return;
 			// get the right key
 			val[0] = 0;
-			// yeah overengeneering....
+			// yeah overengineering....
 			yaml_rstrip(key);
 
 			val = yaml_lstrip(val + 2);

core/zeus.c

@@ -68,7 +68,7 @@
 */
 
 /*
-	check how many nodes the instace needs (default 1)
+	check how many nodes the instance needs (default 1)
 */
 
 int uwsgi_zeus_spawn_instance(struct uwsgi_instance *ui) {

examples/info_uwsgi.php

@@ -1,5 +1,5 @@
 uWSGI version <b><?=uwsgi_version()?></b><br/>
-workerd id: <b><?=uwsgi_worker_id()?></b><br/>
+worker id: <b><?=uwsgi_worker_id()?></b><br/>
 master pid: <b><?=uwsgi_masterpid()?></b><br/>
 
 uri: <b><?= $_SERVER['REQUEST_URI'] ?></b><br/>

plugins/dumbloop/dumb.c

@@ -30,7 +30,7 @@ static void *dumb_loop_run(void *arg1) {
                 uwsgi_setup_thread_req(core_id, wsgi_req);
         }
 
-	// this strign will be passed to the code_string function
+	// this string will be passed to the code_string function
 	char *str_core = uwsgi_num2str(core_id);
         // ok we are ready, let's run custom code
         while (uwsgi.workers[uwsgi.mywid].manage_next_request) {

plugins/emperor_amqp/amqp.c

@@ -432,7 +432,7 @@ static int amqp_wait_connection_tune(int fd) {
         	ptr = amqp_get_long(ptr, watermark, &lv); if (!ptr) { free(frame); return -1; }
         	uwsgi_log("AMQP max frame size: %d\n", lv);
         	ptr = amqp_get_short(ptr, watermark, &sv); if (!ptr) { free(frame); return -1; }
-        	uwsgi_log("AMQP heartbeath: %d\n", sv);
+        	uwsgi_log("AMQP heartbeat: %d\n", sv);
 
 		free(frame);
 		return 0;

plugins/emperor_mongodb/emperor_mongodb.cc

@@ -67,7 +67,7 @@ extern "C" void uwsgi_imperial_monitor_mongodb(struct uwsgi_emperor_scanner *ues
 			mongo::BSONObj p = cursor->next();
 
 			// checking for an empty string is not required, but we reduce the load
-			// in case of badly strctured databases
+			// in case of badly structured databases
 			const char *name = p.getStringField("name");
 			if (strlen(name) == 0) continue;
 

plugins/fastrouter/fastrouter.c

@@ -285,7 +285,7 @@ static ssize_t fr_instance_connected(struct corerouter_peer *peer) {
 }
 
 
-// called after receaving the uwsgi header (read vars)
+// called after receiving the uwsgi header (read vars)
 static ssize_t fr_recv_uwsgi_vars(struct corerouter_peer *main_peer) {
 	struct fastrouter_session *fr = (struct fastrouter_session *) main_peer->session;
 

plugins/forkptyrouter/forkptyrouter.c

@@ -76,7 +76,7 @@ static struct uwsgi_option forkptyrouter_options[] = {
 
 	{"forkptyrouter-fallback", required_argument, 0, "fallback to the specified node in case of error", uwsgi_opt_add_string_list, &ufpty.cr.fallback, 0},
 
-	{"forkptyrouter-events", required_argument, 0, "set the maximum number of concufptyent events", uwsgi_opt_set_int, &ufpty.cr.nevents, 0},
+	{"forkptyrouter-events", required_argument, 0, "set the maximum number of forkptyrouter events", uwsgi_opt_set_int, &ufpty.cr.nevents, 0},
 	{"forkptyrouter-cheap", no_argument, 0, "run the forkptyrouter in cheap mode", uwsgi_opt_true, &ufpty.cr.cheap, 0},
 
 	{"forkptyrouter-timeout", required_argument, 0, "set forkptyrouter timeout", uwsgi_opt_set_int, &ufpty.cr.socket_timeout, 0},

plugins/gevent/gevent.c

@@ -36,7 +36,7 @@ PyObject *py_uwsgi_gevent_ctrl_gl(PyObject *self, PyObject *args) {
                 PyObject *gswitch = PyEval_CallObject(ugevent.greenlet_switch, gevent_sleep_args);
 		// could be NULL on exception
 		if (!gswitch) {
-			// just for being paranid
+			// just for being paranoid
 			if (PyErr_Occurred()) {
 				PyErr_Clear();
 				break;

plugins/lua/lua_plugin.c

@@ -3218,7 +3218,7 @@ static int uwsgi_lua_request(struct wsgi_request *wsgi_req) {
 	switch(lua_type(L, -2)) {
 		case LUA_TFUNCTION:
 			// initing coroutine:
-			// pushing first argument of coroutine and call it fisrt time:
+			// pushing first argument of coroutine and call it first time:
 
 			lua_pushvalue(L, -2);
 			lua_pushvalue(L, -2);
@@ -3687,7 +3687,7 @@ static int uwsgi_lua_mule(char *file) {
 		if (lua_pcall(L, ULUA_TYPE_ISUTABLE(type), 1, 0)) {
 			ulua_log("mule%d: error running loop function: %s", uwsgi.muleid, lua_tostring(L, -1));
 
-			// loop exeption
+			// loop exception
 			return 1; // respawn pls
 		}
 	}

plugins/mongrel2/mongrel2.c

@@ -265,7 +265,7 @@ static int uwsgi_mongrel2_tnetstring_parse(struct wsgi_request *wsgi_req, char *
 		wsgi_req->len += proto_base_add_uwsgi_var(wsgi_req, "QUERY_STRING", 12, "", 0);
 	}
 
-	// reject uncomplete upload
+	// reject incomplete upload
 	if (async_upload == 1) {
 		return -1;
 	}

plugins/mono/mono_plugin.c

@@ -467,7 +467,7 @@ static int uwsgi_mono_create_app(char *key, uint16_t key_len, char *physicalDir,
 	struct uwsgi_app *app = uwsgi_add_app(id, mono_plugin.modifier1, key, key_len, uwsgi_concat2n(physicalDir, physicalDir_len, "", 0), appHost);
         app->started_at = now;
         app->startup_time = uwsgi_now() - now;
-	// get a handlet to appHost
+	// get a handler to appHost
 	mono_gchandle_new(app->callable, 1);
 	uwsgi_log("Mono asp.net app %d (%.*s) loaded in %d seconds at %p (worker %d)\n", id, key_len, key, (int) app->startup_time, appHost, uwsgi.mywid);
 

plugins/rack/rack_plugin.c

@@ -994,7 +994,7 @@ int uwsgi_rack_request(struct wsgi_request *wsgi_req) {
 #ifdef UWSGI_DEBUG
 			uwsgi_log("calling ruby GC\n");
 #endif
-			// try to limit damanges if threads are enabled...
+			// try to limit damages if threads are enabled...
 			if (wsgi_req->async_id == 0) {
 				rb_gc();
 			}
@@ -1286,7 +1286,7 @@ void uwsgi_rack_postinit_apps(void) {
 }
 
 /*
-	If the ruby VM has rb_reserved_fd_p, we avoid closign the filedescriptor needed by
+	If the ruby VM has rb_reserved_fd_p, we avoid closing the file descriptor needed by
 	modern ruby (the Matz ones) releases.
 */
 static void uwsgi_ruby_cleanup() {

plugins/rbthreads/rbthreads.c

@@ -13,7 +13,7 @@
 	the "rbthreads" loop engine must create pthreads with rb_thread_create()
 
 	The second reason is for how the GVL is managed.  We do not have
-	functions (like in CPython) to explicitely release and acquire it.
+	functions (like in CPython) to explicitly release and acquire it.
 	All happens via a function (rb_thread_call_without_gvl) calling the specified hook
 	whenever the code blocks.
 
@@ -57,7 +57,7 @@ struct uwsgi_rbthread {
 	int ret;
 	// fd to monitor
 	int fd;
-	// non-blockign timeout
+	// non-blocking timeout
 	int timeout;
 };
 

plugins/router_static/router_static.c

@@ -302,7 +302,7 @@ static int uwsgi_router_file(struct uwsgi_route *ur, char *args) {
 	}
 
 	if (!urfc->filename) {
-		uwsgi_log("you have to specifify a filename for the \"file\" router\n");
+		uwsgi_log("you have to specify a filename for the \"file\" router\n");
 		free(urfc);
 		return -1;
 	}

plugins/stats_pusher_socket/plugin.c

@@ -2,7 +2,7 @@
 
 /*
 
-this is a stats pusher plugin for sendign metrics over a udp socket
+this is a stats pusher plugin for sending metrics over a udp socket
 
 --stats-push socket:address[,prefix]
 

plugins/transformation_gzip/gzip.c

@@ -62,7 +62,7 @@ static int uwsgi_routing_func_gzip(struct wsgi_request *wsgi_req, struct uwsgi_r
 	}
 	struct uwsgi_transformation *ut = uwsgi_add_transformation(wsgi_req, transform_gzip, utgz);
 	ut->can_stream = 1;
-	// this is the trasformation clearing the memory
+	// this is the transformation clearing the memory
 	ut = uwsgi_add_transformation(wsgi_req, transform_gzip, utgz);
 	ut->is_final = 1;
 	return UWSGI_ROUTE_NEXT;

plugins/webdav/webdav.c

@@ -988,7 +988,7 @@ static void uwsgi_webdav_dirlist(struct wsgi_request *wsgi_req, char *dir) {
                 struct dirent de;
                 if (readdir_r(d, &de, &de_r)) goto end;
                 if (de_r == NULL) break;
-		// skip items startign with a dot
+		// skip items starting with a dot
 		if (de.d_name[0] == '.') continue;
 		if (uwsgi_webdav_dirlist_add_item(ub, de.d_name, strlen(de.d_name), de.d_type == DT_DIR ? 1 : 0)) goto end;
         }

plugins/xslt/xslt.c

@@ -52,7 +52,7 @@ struct uwsgi_option uwsgi_xslt_options[] = {
 	{"xslt-ext", required_argument, 0, "search for xslt stylesheets with the specified extension", uwsgi_opt_add_string_list, &uxslt.ext, 0},
 	{"xslt-var", required_argument, 0, "get the xslt stylesheet path from the specified request var", uwsgi_opt_add_string_list, &uxslt.var, 0},
 	{"xslt-stylesheet", required_argument, 0, "if no xslt stylesheet file can be found, use the specified one", uwsgi_opt_add_string_list, &uxslt.stylesheet, 0},
-	{"xslt-content-type", required_argument, 0, "set the content-type for the xslt rsult (default: text/html)", uwsgi_opt_set_str, &uxslt.content_type, 0},
+	{"xslt-content-type", required_argument, 0, "set the content-type for the xslt result (default: text/html)", uwsgi_opt_set_str, &uxslt.content_type, 0},
 	{NULL, 0, 0, NULL, NULL, NULL, 0},
 };
 

plugins/zabbix/plugin.c

@@ -211,7 +211,7 @@ static void zabbix_template_print() {
 	if (uwsgi_buffer_append(ub,"</zabbix_export>\n", 17)) goto error;
 
 	if (write(fd, ub->buf, ub->pos) != (ssize_t) ub->pos) {
-		uwsgi_error("zabbix_template_print()/wrtie()");
+		uwsgi_error("zabbix_template_print()/write()");
 		exit(1);
 	}