From a72a494f03f89ef3f6127416a043f9ca7762814b Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Sun, 17 Sep 2023 09:33:18 +0200 Subject: [PATCH 1/4] Fix typos discovered by codespell --- docs/release-process.md | 2 +- ext/mbstring/tests/data/JISX0212.txt | 2 +- ext/mbstring/tests/data/KSX1001.txt | 4 ++-- ext/reflection/tests/bug46064.phpt | 2 +- ext/reflection/tests/bug46064_2.phpt | 2 +- .../session_set_save_handler_class_012.phpt | 2 +- main/streams/xp_socket.c | 2 +- sapi/cli/tests/php_cli_server_014.phpt | 2 +- sapi/fpm/fpm/fpm_events.h | 2 +- sapi/fpm/fpm/fpm_log.c | 4 ++-- sapi/fpm/tests/response.inc | 2 +- sapi/fpm/www.conf.in | 6 +++--- win32/build/confutils.js | 2 +- win32/build/mkdist.php | 2 +- 14 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/release-process.md b/docs/release-process.md index 0ce2dfddb756b..808e1ac99d6a7 100644 --- a/docs/release-process.md +++ b/docs/release-process.md @@ -992,7 +992,7 @@ volunteers to begin the selection process for the next release managers. ```shell cd /path/to/repos/php/web-php git submodule update - cd distributions # This is the submodule refering to web-php-distributions + cd distributions # This is the submodule referring to web-php-distributions git pull origin master cd .. git add distributions diff --git a/ext/mbstring/tests/data/JISX0212.txt b/ext/mbstring/tests/data/JISX0212.txt index ae35ecacdc2b0..87927940e90d0 100644 --- a/ext/mbstring/tests/data/JISX0212.txt +++ b/ext/mbstring/tests/data/JISX0212.txt @@ -53,7 +53,7 @@ # # However, JIS X 0212 maintains the distinction between # the lowercase forms of these two elements at 0x2942 and 0x2943. -# Given the structre of these JIS encodings, it is clear that +# Given the structure of these JIS encodings, it is clear that # 0x2922 and 0x2942 are intended to be a capital/small pair. # Consequently, in the Unicode mapping, 0x2922 is treated as # LATIN CAPITAL LETTER D WITH STROKE. diff --git a/ext/mbstring/tests/data/KSX1001.txt b/ext/mbstring/tests/data/KSX1001.txt index 3ebd300b63414..202539916bff6 100644 --- a/ext/mbstring/tests/data/KSX1001.txt +++ b/ext/mbstring/tests/data/KSX1001.txt @@ -29,7 +29,7 @@ # (at ftp://ftp.unicode.org/Public/MAPPING/EASTASIA/KSC) which is # actually NOT the mapping between KS X 1001(KS C 5601-1992) and Unicode 2.0 # BUT the mapping table between UHC (Microsoft Unified Hangul Code) -# and Unicode 2.0. Hence, in this pacakge, I renamed it as UHC.TXT +# and Unicode 2.0. Hence, in this package, I renamed it as UHC.TXT # # Please, note that there was a change in naming scheme of # Korean standard for information exchange. @@ -50,7 +50,7 @@ # printf ("0x%04X 0x%04X %s\n",$k-0x8080, $u,join(' ',@rest)); # } # -# Column #1 : KS X 1001(KS C 5601-1992 excluding addtional Hangul +# Column #1 : KS X 1001(KS C 5601-1992 excluding additional Hangul # syllables defined for Johab encoding in Annex 3) # in hex as 0xXXXX # Column #2 : the Unicode (in hex as 0xXXXX) diff --git a/ext/reflection/tests/bug46064.phpt b/ext/reflection/tests/bug46064.phpt index c866ee83be72e..49d3760941e24 100644 --- a/ext/reflection/tests/bug46064.phpt +++ b/ext/reflection/tests/bug46064.phpt @@ -1,5 +1,5 @@ --TEST-- -Bug #46064 (Exception when creating ReflectionProperty object on dynamicly created property) +Bug #46064 (Exception when creating ReflectionProperty object on dynamically created property) --FILE-- i; echo 'Open:', session_id(), "\n"; // This test was written for broken return value handling - // Mimmick what was actually being tested by returning true here + // Mimic what was actually being tested by returning true here return (null === parent::open()); } public function read($key): string|false { diff --git a/main/streams/xp_socket.c b/main/streams/xp_socket.c index 6c770d77aed95..9a36a7098da4e 100644 --- a/main/streams/xp_socket.c +++ b/main/streams/xp_socket.c @@ -173,7 +173,7 @@ static ssize_t php_sockop_read(php_stream *stream, char *buf, size_t count) bool dont_wait = has_buffered_data || (sock->timeout.tv_sec == 0 && sock->timeout.tv_usec == 0); /* Set MSG_DONTWAIT if no wait is needed or there is unlimited timeout which was - * added by fix for #41984 commited in 9343c5404. */ + * added by fix for #41984 committed in 9343c5404. */ if (dont_wait || sock->timeout.tv_sec != -1) { recv_flags = MSG_DONTWAIT; } diff --git a/sapi/cli/tests/php_cli_server_014.phpt b/sapi/cli/tests/php_cli_server_014.phpt index 5be3dd1a73c74..b29a01437399a 100644 --- a/sapi/cli/tests/php_cli_server_014.phpt +++ b/sapi/cli/tests/php_cli_server_014.phpt @@ -1,5 +1,5 @@ --TEST-- -Bug #60477: Segfault after two multipart/form-data POST requestes +Bug #60477: Segfault after two multipart/form-data POST requests --SKIPIF-- Date: Sun, 17 Sep 2023 09:42:27 +0200 Subject: [PATCH 2/4] miliseconds is misspelled on purpose --- sapi/fpm/fpm/fpm_log.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sapi/fpm/fpm/fpm_log.c b/sapi/fpm/fpm/fpm_log.c index 8074ed20d89eb..bb66c081258d5 100644 --- a/sapi/fpm/fpm/fpm_log.c +++ b/sapi/fpm/fpm/fpm_log.c @@ -225,8 +225,8 @@ int fpm_log_write(char *log_format) /* {{{ */ /* milliseconds */ } else if (!strcasecmp(format, "milliseconds") || !strcasecmp(format, "milli") || - /* mili/milliseconds are supported for backwards compatibility */ - !strcasecmp(format, "milliseconds") || !strcasecmp(format, "mili") + /* mili/miliseconds are supported for backwards compatibility */ + !strcasecmp(format, "miliseconds") || !strcasecmp(format, "mili") ) { if (!test) { len2 = snprintf(b, FPM_LOG_BUFFER - len, "%.3f", proc.duration.tv_sec * 1000. + proc.duration.tv_usec / 1000.); From 8fb32a6fb5664534e92c2c35fac940acd75eef40 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Mon, 18 Sep 2023 05:29:05 +0200 Subject: [PATCH 3/4] SVN branche --> GitHub branch --- win32/build/mkdist.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/win32/build/mkdist.php b/win32/build/mkdist.php index c6e4bd28b00a7..53a8bb0311db5 100644 --- a/win32/build/mkdist.php +++ b/win32/build/mkdist.php @@ -271,7 +271,7 @@ function extract_file_from_tarball($pkg, $filename, $dest_dir) /* {{{ */ } /* include a snapshot identifier */ -$branch = "HEAD"; // TODO - determine this from SVN branch name +$branch = "HEAD"; // TODO - determine this from GitHub branch name $fp = fopen("$dist_dir/snapshot.txt", "w"); $now = date("r"); fwrite($fp, << Date: Mon, 18 Sep 2023 08:20:21 +0200 Subject: [PATCH 4/4] .gitattributes: The OSS fuzz files are binary --- .gitattributes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitattributes b/.gitattributes index ccf0353eec4f0..4c191184eb7d1 100644 --- a/.gitattributes +++ b/.gitattributes @@ -25,5 +25,5 @@ /Zend/zend_vm_handlers.h linguist-generated -diff /Zend/zend_vm_opcodes.[ch] linguist-generated -diff -# The OSS fuzz files are bunary +# The OSS fuzz files are binary /ext/date/tests/ossfuzz*.txt binary