Skip to content

Commit 06fdf35

Browse files
vlajossmalyshev
authored andcommitted
1 parent 38229d1 commit 06fdf35

File tree

88 files changed

+200
-200
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+200
-200
lines changed

INSTALL

+1-1
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ Table of Contents
155155
a list of all available options along with short explanations running
156156
./configure --help. Our manual documents the different options
157157
separately. You will find the core options in the appendix, while the
158-
different extension specific options are descibed on the reference
158+
different extension specific options are described on the reference
159159
pages.
160160

161161
When PHP is configured, you are ready to build the module and/or

README.TESTING2

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ the original run-tests.php script. server-tests is *not* used by
88
'make test'. server-tests was developed to provide support for
99
testing PHP under it's primary environment, HTTP, and can run the
1010
PHP tests under any of the SAPI modules that are direct executables,
11-
or are accessable via HTTP.
11+
or are accessible via HTTP.
1212

1313
[New features]
1414
----------------
@@ -95,7 +95,7 @@ include:
9595
$filename full native path to file, will become PATH_TRANSLATED
9696
$filepath =dirname($filename)
9797
$scriptname this is what will become SCRIPT_NAME unless you override it
98-
$docroot the equivelant of DOCUMENT_ROOT under Apache
98+
$docroot the equivalent of DOCUMENT_ROOT under Apache
9999
$cwd the directory that the test is being initiated from
100100
$this->conf all server-tests configuration vars
101101
$this->env all environment variables that will get passed to the test
@@ -105,7 +105,7 @@ include:
105105
This section is also eval'd, and is similar in nature to --ENV--. However,
106106
this section is used to build the url used in an HTTP request. Valid values
107107
to set in this section would include:
108-
SCRIPT_NAME The inital part of the request url
108+
SCRIPT_NAME The initial part of the request url
109109
PATH_INFO The pathinfo part of a request url
110110
FRAGMENT The fragment section of a url (after #)
111111
QUERY_STRING The query part of a url (after ?)

ext/calendar/julian.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
*
4848
* CALENDAR OVERVIEW
4949
*
50-
* Julias Ceasar created the calendar in 46 B.C. as a modified form of
50+
* Julius Caesar created the calendar in 46 B.C. as a modified form of
5151
* the old Roman republican calendar which was based on lunar cycles.
5252
* The new Julian calendar set fixed lengths for the months, abandoning
5353
* the lunar cycle. It also specified that there would be exactly 12

ext/calendar/tests/unixtojd.phpt

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ putenv('TZ=UTC');
2121
// -uses --INI-- section with date.timezone=UTC
2222
// -uses putenv('TZ=UTC')
2323
// date.timezone=UTC
24-
// -if ommitted from easter_date.phpt, outputs DATE_TZ_ERRMSG warning
24+
// -if omitted from easter_date.phpt, outputs DATE_TZ_ERRMSG warning
2525
// -easter_date() calls mktime() and localtime()
2626
// -whereas unixtojd(1000000000) calls localtime(1000000000)
27-
// -if ommitted from unixtojd.phpt, does NOT output DATE_TZ_ERRMSG
27+
// -if omitted from unixtojd.phpt, does NOT output DATE_TZ_ERRMSG
2828
//
2929
// unixtojd() calls php_localtime_r() which for Pacific timezone systems, returns a time -8 hours
3030
// -this incorrect localtime is passed to the julian date conversion (GregorianToSDN) function which works (probably correctly)

ext/date/lib/parse_tz.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ static ttinfo* fetch_timezone_offset(timelib_tzinfo *tz, timelib_sll ts, timelib
336336
{
337337
uint32_t i;
338338

339-
/* If there is no transistion time, we pick the first one, if that doesn't
339+
/* If there is no transition time, we pick the first one, if that doesn't
340340
* exist we return NULL */
341341
if (!tz->timecnt || !tz->trans) {
342342
*transition_time = 0;
@@ -346,8 +346,8 @@ static ttinfo* fetch_timezone_offset(timelib_tzinfo *tz, timelib_sll ts, timelib
346346
return NULL;
347347
}
348348

349-
/* If the TS is lower than the first transistion time, then we scan over
350-
* all the transistion times to find the first non-DST one, or the first
349+
/* If the TS is lower than the first transition time, then we scan over
350+
* all the transition times to find the first non-DST one, or the first
351351
* one in case there are only DST entries. Not sure which smartass came up
352352
* with this idea in the first though :) */
353353
if (ts < tz->trans[0]) {

ext/date/tests/002.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ strtotime() function
33
--SKIPIF--
44
<?php
55
if (!@putenv("TZ=EST5") || getenv("TZ") != 'EST5') {
6-
die("skip unable to change TZ enviroment variable\n");
6+
die("skip unable to change TZ environment variable\n");
77
}
88
?>
99
--FILE--

ext/date/tests/bug13142.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ if (defined('PHP_WINDOWS_VERSION_MAJOR')) {
88
die("skip. set TZ env is not supported at runtime.");
99
}
1010
if (!@putenv("TZ=US/Eastern") || getenv("TZ") != 'US/Eastern') {
11-
die("skip unable to change TZ enviroment variable\n");
11+
die("skip unable to change TZ environment variable\n");
1212
}
1313
?>
1414
--FILE--

ext/date/tests/bug26317.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Bug #26317 (military timezone offset signedness)
44
date.timezone=GMT0
55
--SKIPIF--
66
if (!@putenv("TZ=GMT0") || getenv("TZ") != 'GMT0') {
7-
die("skip unable to change TZ enviroment variable\n");
7+
die("skip unable to change TZ environment variable\n");
88
}
99
--FILE--
1010
<?php

ext/date/tests/bug26320.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Bug #26320 (strtotime handling of XML Schema/ISO 8601 format)
44
date.timezone=GMT0
55
--SKIPIF--
66
if (!@putenv("TZ=GMT0") || getenv("TZ") != 'GMT0') {
7-
die("skip unable to change TZ enviroment variable\n");
7+
die("skip unable to change TZ environment variable\n");
88
}
99
--FILE--
1010
<?php

ext/fileinfo/fileinfo.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
dl('fileinfo.' . PHP_SHLIB_SUFFIX);
44
}
55
if(!extension_loaded('fileinfo')) {
6-
die("fileinfo extension is not avaliable, please compile it.\n");
6+
die("fileinfo extension is not available, please compile it.\n");
77
}
88

99
// normal operation

ext/fileinfo/libmagic/patchlevel.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@
351351
*
352352
* Revision 1.8 93/02/19 15:01:26 ian
353353
* Numerous changes from Guy Harris too numerous to mention but including
354-
* byte-order independance, fixing "old-style masking", etc. etc. A bugfix
354+
* byte-order independence, fixing "old-style masking", etc. etc. A bugfix
355355
* for broken symlinks from martin@@d255s004.zfe.siemens.de.
356356
*
357357
* Revision 1.7 93/01/05 14:57:27 ian

ext/fileinfo/tests/magic

+7-7
Original file line numberDiff line numberDiff line change
@@ -3918,7 +3918,7 @@
39183918
>7 string x version %.2s
39193919
# We skip the path here, because it is often long (so file will
39203920
# truncate it) and mostly redundant.
3921-
# The inverted index functionality was added some time betwen
3921+
# The inverted index functionality was added some time between
39223922
# versions 11 and 15, so look for -q if version is above 14:
39233923
>7 string >14
39243924
>>10 search/100 \ -q\ with inverted index
@@ -3972,7 +3972,7 @@
39723972
# .cwk
39733973
0 string \002\000\210\003\102\117\102\117\000\001\206 Claris works document
39743974
# .plt
3975-
0 string \020\341\000\000\010\010 Claris Works pallete files .plt
3975+
0 string \020\341\000\000\010\010 Claris Works palette files .plt
39763976

39773977
# .msp a dictionary file I am not sure about this I have only one .msp file
39783978
0 string \002\271\262\000\040\002\000\164 Claris works dictionary
@@ -4443,9 +4443,9 @@
44434443
>6 byte&0x04 =0x8 \b, [4-Scr]
44444444

44454445
#------------------------------------------------------------------------------
4446-
# gameboy: file(1) magic for the Nintendo (Color) Gameboy raw ROM format
4446+
# game boy: file(1) magic for the Nintendo (Color) Game Boy raw ROM format
44474447
#
4448-
0x104 belong 0xCEED6666 Gameboy ROM:
4448+
0x104 belong 0xCEED6666 Game Boy ROM:
44494449
>0x134 string >\0 "%.16s"
44504450
>0x146 byte 0x03 \b,[SGB]
44514451
>0x147 byte 0x00 \b, [ROM ONLY]
@@ -4605,8 +4605,8 @@
46054605
0 string \x01ZZZZZ\x01 3DO "Opera" file system
46064606

46074607
# From Gurkan Sengun <gurkan@linuks.mine.nu>, www.linuks.mine.nu
4608-
0 string GBS Nintendo Gameboy Music/Audio Data
4609-
12 string GameBoy\ Music\ Module Nintendo Gameboy Music Module
4608+
0 string GBS Nintendo Game Boy Music/Audio Data
4609+
12 string GameBoy\ Music\ Module Nintendo Game Boy Music Module
46104610

46114611
# Playstations Patch Files from: From: Thomas Klausner <tk@giga.or.at>
46124612
0 string PPF30 Playstation Patch File version 3.0
@@ -15279,7 +15279,7 @@
1527915279
# $File: oasis,v 1.1 2011/03/15 02:09:38 christos Exp $
1528015280
# OASIS
1528115281
# Summary: OASIS stream file
15282-
# Long descripton: Open Artwork System Interchange Standard
15282+
# Long description: Open Artwork System Interchange Standard
1528315283
# File extension: .oas
1528415284
# Full name: Ben Cowley (bcowley@broadcom.com)
1528515285
# Philip Dixon (pdixon@broadcom.com)

ext/ftp/ftp.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ typedef struct ftpbuf
6969
ftptype_t type; /* current transfer type */
7070
int pasv; /* 0=off; 1=pasv; 2=ready */
7171
php_sockaddr_storage pasvaddr; /* passive mode address */
72-
zend_long timeout_sec; /* User configureable timeout (seconds) */
73-
int autoseek; /* User configureable autoseek flag */
72+
zend_long timeout_sec; /* User configurable timeout (seconds) */
73+
int autoseek; /* User configurable autoseek flag */
7474

7575
int nb; /* "nonblocking" transfer in progress */
7676
databuf_t *data; /* Data connection for "nonblocking" transfers */

ext/gd/libgd/gd.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -782,7 +782,7 @@ int gdImageBrightness(gdImagePtr src, int brightness);
782782
/* Set the contrast level <contrast> for the image <src> */
783783
int gdImageContrast(gdImagePtr src, double contrast);
784784

785-
/* Simply adds or substracts respectively red, green or blue to a pixel */
785+
/* Simply adds or subtracts respectively red, green or blue to a pixel */
786786
int gdImageColor(gdImagePtr src, const int red, const int green, const int blue, const int alpha);
787787

788788
/* Image convolution by a 3x3 custom matrix */

ext/gd/libgd/gd_arc_f_buggy.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* This is potentially great stuff, but fails against the test
22
program at the end. This would probably be much more
3-
efficent than the implementation currently in gd.c if the
3+
efficient than the implementation currently in gd.c if the
44
errors in the output were corrected. TBB */
55

66
#if 0

ext/gd/libgd/gdft.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -464,7 +464,7 @@ static void *fontFetch (char **error, void *key)
464464
return NULL;
465465
}
466466

467-
/* FIXME - This mapping stuff is imcomplete - where is the spec? */
467+
/* FIXME - This mapping stuff is incomplete - where is the spec? */
468468
/* EAM - It's worse than that. It's pointless to match character encodings here.
469469
* As currently written, the stored a->face->charmap only matches one of
470470
* the actual charmaps and we cannot know at this stage if it is the right

ext/gd/libgd/webpimg.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ static inline uint32 get_le32(const uint8* const data) {
169169
* Y2/U2/V2: The Y/U/V data of the second image
170170
*
171171
* Returns the PSNR (http://en.wikipedia.org/wiki/Peak_signal-to-noise_ratio)
172-
* value computed bewteen the two images
172+
* value computed between the two images
173173
*/
174174
double GetPSNRYuv(const uint8* Y1,
175175
const uint8* U1,
@@ -210,7 +210,7 @@ double GetPSNRYuv(const uint8* Y1,
210210
* imgdata: data buffer containing webp image
211211
* imgdata_size: size of the imgdata buffer
212212
*
213-
* Returns the PSNR value computed bewteen the two images
213+
* Returns the PSNR value computed between the two images
214214
*/
215215
double WebPGetPSNR(const uint8* Y1,
216216
const uint8* U1,

ext/gd/libgd/webpimg.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ typedef enum WebPResultType {
5757
* 3. p_Y/p_U/p_V : pointer to the Y/U/V data buffer (this routine will
5858
* allocate memory for the buffer, fill the buffer with
5959
* appropriate data and transfer owner ship of the buffer
60-
* to caller. Caller is reponsible for freeing the memory).
60+
* to caller. Caller is responsible for freeing the memory).
6161
* Note that the memory for Y, U, V buffers is alloacted
6262
* in one chunk, hence one should call free(*p_Y) only.
6363
* Do not try to free the U and V buffers.

ext/interbase/tests/005.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ simple default transaction test without ibase_trans()
6363
/*
6464
default transaction on default link
6565
First open transaction on link will be default.
66-
$tr_def_l1 may be ommited. All queryes without link and trans
66+
$tr_def_l1 may be omitted. All queryes without link and trans
6767
parameters run in this context
6868
*/
6969

ext/libxml/libxml.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1143,7 +1143,7 @@ zval *php_libxml_register_export(zend_class_entry *ce, php_libxml_export_node ex
11431143
{
11441144
php_libxml_func_handler export_hnd;
11451145

1146-
/* Initialize in case this module hasnt been loaded yet */
1146+
/* Initialize in case this module hasn't been loaded yet */
11471147
php_libxml_initialize();
11481148
export_hnd.export_func = export_function;
11491149

ext/mbstring/README_PHP3-i18n-ja

+2-2
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,7 @@ o i18n.internal_encoding - internal encoding
371371
encodings, following conditions have to be satisfied in order
372372
to use them:
373373
- per byte encoding
374-
- single byte charactor in range of 00h-7fh which is compatible
374+
- single byte character in range of 00h-7fh which is compatible
375375
with ASCII
376376
- multibyte without 00h-7fh
377377
In case of Japanese, EUC-JP and UTF-8 are the only encoding that
@@ -408,7 +408,7 @@ o i18n.script_encoding - script encoding
408408
entering the script parser.
409409

410410
Be aware that auto detection may fail under some conditions.
411-
For best auto detection, add multibyte charactor at beginning of
411+
For best auto detection, add multibyte character at beginning of
412412
script.
413413

414414

ext/mbstring/libmbfl/filters/unicode_prop.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
*
2323
*/
2424

25-
/* charactor property table */
25+
/* character property table */
2626
#define MBFL_CHP_CTL 0x01
2727
#define MBFL_CHP_DIGIT 0x02
2828
#define MBFL_CHP_UALPHA 0x04

ext/mbstring/libmbfl/mbfl/mbfl_consts.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
#define MBFL_ENCTYPE_ENC_STRM 0x00002000
4646
#define MBFL_ENCTYPE_GL_UNSAFE 0x00004000
4747

48-
/* wchar plane, special charactor */
48+
/* wchar plane, special character */
4949
#define MBFL_WCSPLANE_MASK 0xffff
5050
#define MBFL_WCSPLANE_UCS2MAX 0x00010000
5151
#define MBFL_WCSPLANE_UTF32MAX 0x00110000

ext/mbstring/tests/mb_strtolower_variation3.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ function_exists('mb_strtolower') or die("skip mb_strtolower() is not available i
1414

1515
/*
1616
* Pass a Japanese string and a mixed Japanese and ASCII string to mb_strtolower
17-
* to check correct conversion is occuring (Japanese characters should not be converted).
17+
* to check correct conversion is occurring (Japanese characters should not be converted).
1818
*/
1919

2020
echo "*** Testing mb_strtolower() : usage variations ***\n";

ext/mbstring/tests/mb_strtoupper_variation3.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ function_exists('mb_strtoupper') or die("skip mb_strtoupper() is not available i
1414

1515
/*
1616
* Pass a Japanese string and a mixed Japanese and ASCII string to mb_strtolower
17-
* to check correct conversion is occuring (Japanese characters should not be converted).
17+
* to check correct conversion is occurring (Japanese characters should not be converted).
1818
*/
1919

2020
echo "*** Testing mb_strtoupper() : usage variations ***\n";

ext/mcrypt/tests/mcrypt_ecb_3des_decrypt.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ $cipher = MCRYPT_TRIPLEDES;
2323
$data = b"This is the secret message which must be encrypted";
2424
$mode = MCRYPT_DECRYPT;
2525

26-
// tripledes uses keys upto 192 bits (24 bytes)
26+
// tripledes uses keys up to 192 bits (24 bytes)
2727
$keys = array(
2828
b'12345678',
2929
b'12345678901234567890',

ext/mcrypt/tests/mcrypt_ecb_3des_encrypt.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ $cipher = MCRYPT_TRIPLEDES;
2323
$data = b"This is the secret message which must be encrypted";
2424
$mode = MCRYPT_ENCRYPT;
2525

26-
// tripledes uses keys upto 192 bits (24 bytes)
26+
// tripledes uses keys up to 192 bits (24 bytes)
2727
$keys = array(
2828
b'12345678',
2929
b'12345678901234567890',

ext/mcrypt/tests/mcrypt_encrypt_3des_cbc.phpt

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ echo "*** Testing mcrypt_encrypt() : TripleDES functionality ***\n";
2121
//test tripledes, aes
2222
//test different lengths of key, iv
2323
//test no iv being passed on CBC, ECB
24-
//test upto 32 bytes with unlimited strength
24+
//test up to 32 bytes with unlimited strength
2525

2626
$cipher = MCRYPT_TRIPLEDES;
2727
$mode = MCRYPT_MODE_CBC;
2828
$data = b'This is the secret message which must be encrypted';
2929

30-
// tripledes uses keys upto 192 bits (24 bytes)
30+
// tripledes uses keys up to 192 bits (24 bytes)
3131
$keys = array(
3232
b'12345678',
3333
b'12345678901234567890',

ext/mcrypt/tests/mcrypt_encrypt_3des_ecb.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ $cipher = MCRYPT_TRIPLEDES;
2020
$mode = MCRYPT_MODE_ECB;
2121
$data = b'This is the secret message which must be encrypted';
2222

23-
// tripledes uses keys upto 192 bits (24 bytes)
23+
// tripledes uses keys up to 192 bits (24 bytes)
2424
$keys = array(
2525
b'12345678',
2626
b'12345678901234567890',

ext/mcrypt/tests/mcrypt_rijndael128_128BitKey.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ $cipher = MCRYPT_RIJNDAEL_128;
3030
$mode = MCRYPT_MODE_CBC;
3131
$data = b'This is the secret message which must be encrypted';
3232

33-
// keys upto 128 bits (16 bytes)
33+
// keys up to 128 bits (16 bytes)
3434
$keys = array(
3535
null,
3636
'',

ext/mysqli/tests/mysqli_ps_select_union.phpt

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ require_once('skipifconnectfailure.inc');
4444
if ($IS_MYSQLND) {
4545
/*
4646
Advantage mysqlnd -
47-
The metadata mysqlnd has availabe after prepare is better than
48-
the one made availabe by the MySQL Client Library (libmysql).
47+
The metadata mysqlnd has available after prepare is better than
48+
the one made available by the MySQL Client Library (libmysql).
4949
"libmysql" will give wrong results and that is OK -
5050
http://bugs.mysql.com/bug.php?id=47483
5151
*/

0 commit comments

Comments
 (0)