From cd0cd3d31ee5e1b0f2cd8899b754a03578b5caef Mon Sep 17 00:00:00 2001 From: Kamil Tekiela Date: Sun, 1 Aug 2021 18:03:30 +0100 Subject: [PATCH] Fix typos (#7327) --- build/pkg.m4 | 2 +- ext/imap/php_imap.c | 2 +- ext/mysqli/mysqli.c | 2 +- ext/mysqli/mysqli_api.c | 2 +- ext/openssl/xp_ssl.c | 2 +- ext/standard/url.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build/pkg.m4 b/build/pkg.m4 index 13a88901786..f9075e56c87 100644 --- a/build/pkg.m4 +++ b/build/pkg.m4 @@ -86,7 +86,7 @@ dnl Check to see whether a particular set of modules exists. Similar to dnl PKG_CHECK_MODULES(), but does not set variables or print errors. dnl dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -dnl only at the first occurence in configure.ac, so if the first place +dnl only at the first occurrence in configure.ac, so if the first place dnl it's called might be skipped (such as if it is within an "if", you dnl have to call PKG_CHECK_EXISTS manually AC_DEFUN([PKG_CHECK_EXISTS], diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c index 3d28235e318..ab59aa790b0 100644 --- a/ext/imap/php_imap.c +++ b/ext/imap/php_imap.c @@ -3991,7 +3991,7 @@ static int _php_rfc822_len(char *str) */ len = strlen(str) + 2; p = str; - /* rfc822_cat() will escape all " and \ characters, therefor we need to increase + /* rfc822_cat() will escape all " and \ characters, therefore we need to increase * our buffer length to account for these characters. */ while ((p = strpbrk(p, "\\\""))) { diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c index e7d799bf7a1..7379c897544 100644 --- a/ext/mysqli/mysqli.c +++ b/ext/mysqli/mysqli.c @@ -1053,7 +1053,7 @@ void php_mysqli_fetch_into_hash_aux(zval *return_value, MYSQL_RES * result, zend EMPTY_SWITCH_DEFAULT_CASE() } /* even though lval is declared as unsigned, the value - * may be negative. Therefor we cannot use MYSQLI_LLU_SPEC and must + * may be negative. Therefore we cannot use MYSQLI_LLU_SPEC and must * use MYSQLI_LL_SPEC. */ snprintf(tmp, sizeof(tmp), (mysql_fetch_field_direct(result, i)->flags & UNSIGNED_FLAG)? MYSQLI_LLU_SPEC : MYSQLI_LL_SPEC, llval); diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c index c15d97075fa..2ccdee1469a 100644 --- a/ext/mysqli/mysqli_api.c +++ b/ext/mysqli/mysqli_api.c @@ -1045,7 +1045,7 @@ void mysqli_stmt_fetch_libmysql(INTERNAL_FUNCTION_PARAMETERS) #endif char tmp[22]; /* even though lval is declared as unsigned, the value - * may be negative. Therefor we cannot use MYSQLI_LLU_SPEC and must + * may be negative. Therefore we cannot use MYSQLI_LLU_SPEC and must * use MYSQLI_LL_SPEC. */ snprintf(tmp, sizeof(tmp), (stmt->stmt->fields[i].flags & UNSIGNED_FLAG)? MYSQLI_LLU_SPEC : MYSQLI_LL_SPEC, llval); diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c index 0a9491476b9..b8b8e62b67e 100644 --- a/ext/openssl/xp_ssl.c +++ b/ext/openssl/xp_ssl.c @@ -2599,7 +2599,7 @@ php_stream *php_openssl_ssl_socket_factory(const char *proto, size_t protolen, memset(sslsock, 0, sizeof(*sslsock)); sslsock->s.is_blocked = 1; - /* this timeout is used by standard stream funcs, therefor it should use the default value */ + /* this timeout is used by standard stream funcs, therefore it should use the default value */ #ifdef _WIN32 sslsock->s.timeout.tv_sec = (long)FG(default_socket_timeout); #else diff --git a/ext/standard/url.c b/ext/standard/url.c index cc44d946ef3..e3d95768fb0 100644 --- a/ext/standard/url.c +++ b/ext/standard/url.c @@ -728,7 +728,7 @@ no_name_header: if ((prev_val = zend_hash_str_find(Z_ARRVAL_P(return_value), Z_STRVAL_P(hdr), (p - Z_STRVAL_P(hdr)))) == NULL) { add_assoc_stringl_ex(return_value, Z_STRVAL_P(hdr), (p - Z_STRVAL_P(hdr)), s, (Z_STRLEN_P(hdr) - (s - Z_STRVAL_P(hdr)))); - } else { /* some headers may occur more than once, therefor we need to remake the string into an array */ + } else { /* some headers may occur more than once, therefore we need to remake the string into an array */ convert_to_array(prev_val); add_next_index_stringl(prev_val, s, (Z_STRLEN_P(hdr) - (s - Z_STRVAL_P(hdr)))); }