Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
vlajos authored and smalyshev committed Nov 23, 2014
1 parent 38229d1 commit 06fdf35
Show file tree
Hide file tree
Showing 88 changed files with 200 additions and 200 deletions.
2 changes: 1 addition & 1 deletion INSTALL
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ Table of Contents
a list of all available options along with short explanations running
./configure --help. Our manual documents the different options
separately. You will find the core options in the appendix, while the
different extension specific options are descibed on the reference
different extension specific options are described on the reference
pages.

When PHP is configured, you are ready to build the module and/or
Expand Down
6 changes: 3 additions & 3 deletions README.TESTING2
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ the original run-tests.php script. server-tests is *not* used by
'make test'. server-tests was developed to provide support for
testing PHP under it's primary environment, HTTP, and can run the
PHP tests under any of the SAPI modules that are direct executables,
or are accessable via HTTP.
or are accessible via HTTP.

[New features]
----------------
Expand Down Expand Up @@ -95,7 +95,7 @@ include:
$filename full native path to file, will become PATH_TRANSLATED
$filepath =dirname($filename)
$scriptname this is what will become SCRIPT_NAME unless you override it
$docroot the equivelant of DOCUMENT_ROOT under Apache
$docroot the equivalent of DOCUMENT_ROOT under Apache
$cwd the directory that the test is being initiated from
$this->conf all server-tests configuration vars
$this->env all environment variables that will get passed to the test
Expand All @@ -105,7 +105,7 @@ include:
This section is also eval'd, and is similar in nature to --ENV--. However,
this section is used to build the url used in an HTTP request. Valid values
to set in this section would include:
SCRIPT_NAME The inital part of the request url
SCRIPT_NAME The initial part of the request url
PATH_INFO The pathinfo part of a request url
FRAGMENT The fragment section of a url (after #)
QUERY_STRING The query part of a url (after ?)
Expand Down
2 changes: 1 addition & 1 deletion ext/calendar/julian.c
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
*
* CALENDAR OVERVIEW
*
* Julias Ceasar created the calendar in 46 B.C. as a modified form of
* Julius Caesar created the calendar in 46 B.C. as a modified form of
* the old Roman republican calendar which was based on lunar cycles.
* The new Julian calendar set fixed lengths for the months, abandoning
* the lunar cycle. It also specified that there would be exactly 12
Expand Down
4 changes: 2 additions & 2 deletions ext/calendar/tests/unixtojd.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ putenv('TZ=UTC');
// -uses --INI-- section with date.timezone=UTC
// -uses putenv('TZ=UTC')
// date.timezone=UTC
// -if ommitted from easter_date.phpt, outputs DATE_TZ_ERRMSG warning
// -if omitted from easter_date.phpt, outputs DATE_TZ_ERRMSG warning
// -easter_date() calls mktime() and localtime()
// -whereas unixtojd(1000000000) calls localtime(1000000000)
// -if ommitted from unixtojd.phpt, does NOT output DATE_TZ_ERRMSG
// -if omitted from unixtojd.phpt, does NOT output DATE_TZ_ERRMSG
//
// unixtojd() calls php_localtime_r() which for Pacific timezone systems, returns a time -8 hours
// -this incorrect localtime is passed to the julian date conversion (GregorianToSDN) function which works (probably correctly)
Expand Down
6 changes: 3 additions & 3 deletions ext/date/lib/parse_tz.c
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@ static ttinfo* fetch_timezone_offset(timelib_tzinfo *tz, timelib_sll ts, timelib
{
uint32_t i;

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

/* If the TS is lower than the first transistion time, then we scan over
* all the transistion times to find the first non-DST one, or the first
/* If the TS is lower than the first transition time, then we scan over
* all the transition times to find the first non-DST one, or the first
* one in case there are only DST entries. Not sure which smartass came up
* with this idea in the first though :) */
if (ts < tz->trans[0]) {
Expand Down
2 changes: 1 addition & 1 deletion ext/date/tests/002.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ strtotime() function
--SKIPIF--
<?php
if (!@putenv("TZ=EST5") || getenv("TZ") != 'EST5') {
die("skip unable to change TZ enviroment variable\n");
die("skip unable to change TZ environment variable\n");
}
?>
--FILE--
Expand Down
2 changes: 1 addition & 1 deletion ext/date/tests/bug13142.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ if (defined('PHP_WINDOWS_VERSION_MAJOR')) {
die("skip. set TZ env is not supported at runtime.");
}
if (!@putenv("TZ=US/Eastern") || getenv("TZ") != 'US/Eastern') {
die("skip unable to change TZ enviroment variable\n");
die("skip unable to change TZ environment variable\n");
}
?>
--FILE--
Expand Down
2 changes: 1 addition & 1 deletion ext/date/tests/bug26317.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Bug #26317 (military timezone offset signedness)
date.timezone=GMT0
--SKIPIF--
if (!@putenv("TZ=GMT0") || getenv("TZ") != 'GMT0') {
die("skip unable to change TZ enviroment variable\n");
die("skip unable to change TZ environment variable\n");
}
--FILE--
<?php
Expand Down
2 changes: 1 addition & 1 deletion ext/date/tests/bug26320.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Bug #26320 (strtotime handling of XML Schema/ISO 8601 format)
date.timezone=GMT0
--SKIPIF--
if (!@putenv("TZ=GMT0") || getenv("TZ") != 'GMT0') {
die("skip unable to change TZ enviroment variable\n");
die("skip unable to change TZ environment variable\n");
}
--FILE--
<?php
Expand Down
2 changes: 1 addition & 1 deletion ext/fileinfo/fileinfo.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
dl('fileinfo.' . PHP_SHLIB_SUFFIX);
}
if(!extension_loaded('fileinfo')) {
die("fileinfo extension is not avaliable, please compile it.\n");
die("fileinfo extension is not available, please compile it.\n");
}

// normal operation
Expand Down
2 changes: 1 addition & 1 deletion ext/fileinfo/libmagic/patchlevel.h
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@
*
* Revision 1.8 93/02/19 15:01:26 ian
* Numerous changes from Guy Harris too numerous to mention but including
* byte-order independance, fixing "old-style masking", etc. etc. A bugfix
* byte-order independence, fixing "old-style masking", etc. etc. A bugfix
* for broken symlinks from martin@@d255s004.zfe.siemens.de.
*
* Revision 1.7 93/01/05 14:57:27 ian
Expand Down
14 changes: 7 additions & 7 deletions ext/fileinfo/tests/magic
Original file line number Diff line number Diff line change
Expand Up @@ -3918,7 +3918,7 @@
>7 string x version %.2s
# We skip the path here, because it is often long (so file will
# truncate it) and mostly redundant.
# The inverted index functionality was added some time betwen
# The inverted index functionality was added some time between
# versions 11 and 15, so look for -q if version is above 14:
>7 string >14
>>10 search/100 \ -q\ with inverted index
Expand Down Expand Up @@ -3972,7 +3972,7 @@
# .cwk
0 string \002\000\210\003\102\117\102\117\000\001\206 Claris works document
# .plt
0 string \020\341\000\000\010\010 Claris Works pallete files .plt
0 string \020\341\000\000\010\010 Claris Works palette files .plt

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

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

# From Gurkan Sengun <[email protected]>, www.linuks.mine.nu
0 string GBS Nintendo Gameboy Music/Audio Data
12 string GameBoy\ Music\ Module Nintendo Gameboy Music Module
0 string GBS Nintendo Game Boy Music/Audio Data
12 string GameBoy\ Music\ Module Nintendo Game Boy Music Module

# Playstations Patch Files from: From: Thomas Klausner <[email protected]>
0 string PPF30 Playstation Patch File version 3.0
Expand Down Expand Up @@ -15279,7 +15279,7 @@
# $File: oasis,v 1.1 2011/03/15 02:09:38 christos Exp $
# OASIS
# Summary: OASIS stream file
# Long descripton: Open Artwork System Interchange Standard
# Long description: Open Artwork System Interchange Standard
# File extension: .oas
# Full name: Ben Cowley ([email protected])
# Philip Dixon ([email protected])
Expand Down
4 changes: 2 additions & 2 deletions ext/ftp/ftp.h
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@ typedef struct ftpbuf
ftptype_t type; /* current transfer type */
int pasv; /* 0=off; 1=pasv; 2=ready */
php_sockaddr_storage pasvaddr; /* passive mode address */
zend_long timeout_sec; /* User configureable timeout (seconds) */
int autoseek; /* User configureable autoseek flag */
zend_long timeout_sec; /* User configurable timeout (seconds) */
int autoseek; /* User configurable autoseek flag */

int nb; /* "nonblocking" transfer in progress */
databuf_t *data; /* Data connection for "nonblocking" transfers */
Expand Down
2 changes: 1 addition & 1 deletion ext/gd/libgd/gd.h
Original file line number Diff line number Diff line change
Expand Up @@ -782,7 +782,7 @@ int gdImageBrightness(gdImagePtr src, int brightness);
/* Set the contrast level <contrast> for the image <src> */
int gdImageContrast(gdImagePtr src, double contrast);

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

/* Image convolution by a 3x3 custom matrix */
Expand Down
2 changes: 1 addition & 1 deletion ext/gd/libgd/gd_arc_f_buggy.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* This is potentially great stuff, but fails against the test
program at the end. This would probably be much more
efficent than the implementation currently in gd.c if the
efficient than the implementation currently in gd.c if the
errors in the output were corrected. TBB */

#if 0
Expand Down
2 changes: 1 addition & 1 deletion ext/gd/libgd/gdft.c
Original file line number Diff line number Diff line change
Expand Up @@ -464,7 +464,7 @@ static void *fontFetch (char **error, void *key)
return NULL;
}

/* FIXME - This mapping stuff is imcomplete - where is the spec? */
/* FIXME - This mapping stuff is incomplete - where is the spec? */
/* EAM - It's worse than that. It's pointless to match character encodings here.
* As currently written, the stored a->face->charmap only matches one of
* the actual charmaps and we cannot know at this stage if it is the right
Expand Down
4 changes: 2 additions & 2 deletions ext/gd/libgd/webpimg.c
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ static inline uint32 get_le32(const uint8* const data) {
* Y2/U2/V2: The Y/U/V data of the second image
*
* Returns the PSNR (http://en.wikipedia.org/wiki/Peak_signal-to-noise_ratio)
* value computed bewteen the two images
* value computed between the two images
*/
double GetPSNRYuv(const uint8* Y1,
const uint8* U1,
Expand Down Expand Up @@ -210,7 +210,7 @@ double GetPSNRYuv(const uint8* Y1,
* imgdata: data buffer containing webp image
* imgdata_size: size of the imgdata buffer
*
* Returns the PSNR value computed bewteen the two images
* Returns the PSNR value computed between the two images
*/
double WebPGetPSNR(const uint8* Y1,
const uint8* U1,
Expand Down
2 changes: 1 addition & 1 deletion ext/gd/libgd/webpimg.h
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ typedef enum WebPResultType {
* 3. p_Y/p_U/p_V : pointer to the Y/U/V data buffer (this routine will
* allocate memory for the buffer, fill the buffer with
* appropriate data and transfer owner ship of the buffer
* to caller. Caller is reponsible for freeing the memory).
* to caller. Caller is responsible for freeing the memory).
* Note that the memory for Y, U, V buffers is alloacted
* in one chunk, hence one should call free(*p_Y) only.
* Do not try to free the U and V buffers.
Expand Down
2 changes: 1 addition & 1 deletion ext/interbase/tests/005.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ simple default transaction test without ibase_trans()
/*
default transaction on default link
First open transaction on link will be default.
$tr_def_l1 may be ommited. All queryes without link and trans
$tr_def_l1 may be omitted. All queryes without link and trans
parameters run in this context
*/

Expand Down
2 changes: 1 addition & 1 deletion ext/libxml/libxml.c
Original file line number Diff line number Diff line change
Expand Up @@ -1143,7 +1143,7 @@ zval *php_libxml_register_export(zend_class_entry *ce, php_libxml_export_node ex
{
php_libxml_func_handler export_hnd;

/* Initialize in case this module hasnt been loaded yet */
/* Initialize in case this module hasn't been loaded yet */
php_libxml_initialize();
export_hnd.export_func = export_function;

Expand Down
4 changes: 2 additions & 2 deletions ext/mbstring/README_PHP3-i18n-ja
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,7 @@ o i18n.internal_encoding - internal encoding
encodings, following conditions have to be satisfied in order
to use them:
- per byte encoding
- single byte charactor in range of 00h-7fh which is compatible
- single byte character in range of 00h-7fh which is compatible
with ASCII
- multibyte without 00h-7fh
In case of Japanese, EUC-JP and UTF-8 are the only encoding that
Expand Down Expand Up @@ -408,7 +408,7 @@ o i18n.script_encoding - script encoding
entering the script parser.

Be aware that auto detection may fail under some conditions.
For best auto detection, add multibyte charactor at beginning of
For best auto detection, add multibyte character at beginning of
script.


Expand Down
2 changes: 1 addition & 1 deletion ext/mbstring/libmbfl/filters/unicode_prop.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
*
*/

/* charactor property table */
/* character property table */
#define MBFL_CHP_CTL 0x01
#define MBFL_CHP_DIGIT 0x02
#define MBFL_CHP_UALPHA 0x04
Expand Down
2 changes: 1 addition & 1 deletion ext/mbstring/libmbfl/mbfl/mbfl_consts.h
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
#define MBFL_ENCTYPE_ENC_STRM 0x00002000
#define MBFL_ENCTYPE_GL_UNSAFE 0x00004000

/* wchar plane, special charactor */
/* wchar plane, special character */
#define MBFL_WCSPLANE_MASK 0xffff
#define MBFL_WCSPLANE_UCS2MAX 0x00010000
#define MBFL_WCSPLANE_UTF32MAX 0x00110000
Expand Down
2 changes: 1 addition & 1 deletion ext/mbstring/tests/mb_strtolower_variation3.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ function_exists('mb_strtolower') or die("skip mb_strtolower() is not available i

/*
* Pass a Japanese string and a mixed Japanese and ASCII string to mb_strtolower
* to check correct conversion is occuring (Japanese characters should not be converted).
* to check correct conversion is occurring (Japanese characters should not be converted).
*/

echo "*** Testing mb_strtolower() : usage variations ***\n";
Expand Down
2 changes: 1 addition & 1 deletion ext/mbstring/tests/mb_strtoupper_variation3.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ function_exists('mb_strtoupper') or die("skip mb_strtoupper() is not available i

/*
* Pass a Japanese string and a mixed Japanese and ASCII string to mb_strtolower
* to check correct conversion is occuring (Japanese characters should not be converted).
* to check correct conversion is occurring (Japanese characters should not be converted).
*/

echo "*** Testing mb_strtoupper() : usage variations ***\n";
Expand Down
2 changes: 1 addition & 1 deletion ext/mcrypt/tests/mcrypt_ecb_3des_decrypt.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ $cipher = MCRYPT_TRIPLEDES;
$data = b"This is the secret message which must be encrypted";
$mode = MCRYPT_DECRYPT;

// tripledes uses keys upto 192 bits (24 bytes)
// tripledes uses keys up to 192 bits (24 bytes)
$keys = array(
b'12345678',
b'12345678901234567890',
Expand Down
2 changes: 1 addition & 1 deletion ext/mcrypt/tests/mcrypt_ecb_3des_encrypt.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ $cipher = MCRYPT_TRIPLEDES;
$data = b"This is the secret message which must be encrypted";
$mode = MCRYPT_ENCRYPT;

// tripledes uses keys upto 192 bits (24 bytes)
// tripledes uses keys up to 192 bits (24 bytes)
$keys = array(
b'12345678',
b'12345678901234567890',
Expand Down
4 changes: 2 additions & 2 deletions ext/mcrypt/tests/mcrypt_encrypt_3des_cbc.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ echo "*** Testing mcrypt_encrypt() : TripleDES functionality ***\n";
//test tripledes, aes
//test different lengths of key, iv
//test no iv being passed on CBC, ECB
//test upto 32 bytes with unlimited strength
//test up to 32 bytes with unlimited strength

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

// tripledes uses keys upto 192 bits (24 bytes)
// tripledes uses keys up to 192 bits (24 bytes)
$keys = array(
b'12345678',
b'12345678901234567890',
Expand Down
2 changes: 1 addition & 1 deletion ext/mcrypt/tests/mcrypt_encrypt_3des_ecb.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ $cipher = MCRYPT_TRIPLEDES;
$mode = MCRYPT_MODE_ECB;
$data = b'This is the secret message which must be encrypted';

// tripledes uses keys upto 192 bits (24 bytes)
// tripledes uses keys up to 192 bits (24 bytes)
$keys = array(
b'12345678',
b'12345678901234567890',
Expand Down
2 changes: 1 addition & 1 deletion ext/mcrypt/tests/mcrypt_rijndael128_128BitKey.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ $cipher = MCRYPT_RIJNDAEL_128;
$mode = MCRYPT_MODE_CBC;
$data = b'This is the secret message which must be encrypted';

// keys upto 128 bits (16 bytes)
// keys up to 128 bits (16 bytes)
$keys = array(
null,
'',
Expand Down
4 changes: 2 additions & 2 deletions ext/mysqli/tests/mysqli_ps_select_union.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ require_once('skipifconnectfailure.inc');
if ($IS_MYSQLND) {
/*
Advantage mysqlnd -
The metadata mysqlnd has availabe after prepare is better than
the one made availabe by the MySQL Client Library (libmysql).
The metadata mysqlnd has available after prepare is better than
the one made available by the MySQL Client Library (libmysql).
"libmysql" will give wrong results and that is OK -
http://bugs.mysql.com/bug.php?id=47483
*/
Expand Down
Loading

0 comments on commit 06fdf35

Please sign in to comment.