summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVeres Lajos <vlajos@gmail.com>2014-08-12 22:00:23 +0100
committerLior Kaplan <kaplanlior@gmail.com>2014-08-17 15:44:02 +0300
commit3f42f2f5d1c8026b6e1d21b91857a08d918c28c8 (patch)
tree9d007c39909e160f3ba313545de32e0dba73cfa3
parent0407bdf252004cce08e383bc0f4aa0bbc69c9a25 (diff)
downloadphp-git-3f42f2f5d1c8026b6e1d21b91857a08d918c28c8.tar.gz
typofixes
-rw-r--r--acinclude.m42
-rw-r--r--ext/ereg/tests/eregi_basic.phpt2
-rw-r--r--ext/json/json.c2
-rw-r--r--ext/mysqlnd/mysqlnd_result.c2
-rw-r--r--ext/pcre/pcrelib/ChangeLog2
-rw-r--r--ext/soap/interop/client_round2_interop.php2
-rw-r--r--ext/spl/php_spl.c2
-rw-r--r--ext/standard/tests/strings/dirname_basic.phpt2
-rw-r--r--ext/standard/url.c2
-rw-r--r--scripts/dev/find_tested.php2
-rwxr-xr-xserver-tests-config.php2
-rw-r--r--win32/build/confutils.js2
-rw-r--r--win32/sendmail.h2
13 files changed, 13 insertions, 13 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index 25f3655112..4fd452ee92 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2800,7 +2800,7 @@ AC_DEFUN([PHP_DETECT_ICC],
dnl PHP_DETECT_SUNCC
dnl Detect if the systems default compiler is suncc.
-dnl We also set some usefull CFLAGS if the user didn't set any
+dnl We also set some useful CFLAGS if the user didn't set any
AC_DEFUN([PHP_DETECT_SUNCC],[
SUNCC="no"
AC_MSG_CHECKING([for suncc])
diff --git a/ext/ereg/tests/eregi_basic.phpt b/ext/ereg/tests/eregi_basic.phpt
index 14b4b7d395..cbcfdb6554 100644
--- a/ext/ereg/tests/eregi_basic.phpt
+++ b/ext/ereg/tests/eregi_basic.phpt
@@ -9,7 +9,7 @@ Test eregi() function : basic functionality - confirm case insensitivity
*/
/*
- * Test basic funtionality of eregi()
+ * Test basic functionality of eregi()
*/
echo "*** Testing eregi() : basic functionality ***\n";
diff --git a/ext/json/json.c b/ext/json/json.c
index b3240e1b4b..87de49cb8c 100644
--- a/ext/json/json.c
+++ b/ext/json/json.c
@@ -368,7 +368,7 @@ static int json_utf8_to_utf16(unsigned short *utf16, char utf8[], int len) /* {{
}
}
} else {
- /* Only check if utf8 string is valid, and compute utf16 lenght */
+ /* Only check if utf8 string is valid, and compute utf16 length */
for (j=0 ; pos < len ; j++) {
us = php_next_utf8_char((const unsigned char *)utf8, len, &pos, &status);
if (status != SUCCESS) {
diff --git a/ext/mysqlnd/mysqlnd_result.c b/ext/mysqlnd/mysqlnd_result.c
index 0814926483..bb4dc09c7b 100644
--- a/ext/mysqlnd/mysqlnd_result.c
+++ b/ext/mysqlnd/mysqlnd_result.c
@@ -1182,7 +1182,7 @@ MYSQLND_METHOD(mysqlnd_res, store_result_fetch_data)(MYSQLND_CONN_DATA * const c
No need to FREE_ALLOCA as we can reuse the
'lengths' and 'fields' arrays. For lengths its absolutely safe.
'fields' is reused because the ownership of the strings has been
- transfered above.
+ transferred above.
*/
}
/* Overflow ? */
diff --git a/ext/pcre/pcrelib/ChangeLog b/ext/pcre/pcrelib/ChangeLog
index ed164fed0f..e5c6bc8a70 100644
--- a/ext/pcre/pcrelib/ChangeLog
+++ b/ext/pcre/pcrelib/ChangeLog
@@ -4935,7 +4935,7 @@ by an auxiliary program - but can then be edited by hand if required. There are
now no calls to isalnum(), isspace(), isdigit(), isxdigit(), tolower() or
toupper() in the code.
-7. Turn the malloc/free funtions variables into pcre_malloc and pcre_free and
+7. Turn the malloc/free functions variables into pcre_malloc and pcre_free and
make them global. Abolish the function for setting them, as the caller can now
set them directly.
diff --git a/ext/soap/interop/client_round2_interop.php b/ext/soap/interop/client_round2_interop.php
index b8ee893d8d..fd5767cc17 100644
--- a/ext/soap/interop/client_round2_interop.php
+++ b/ext/soap/interop/client_round2_interop.php
@@ -373,7 +373,7 @@ class Interop_Client
}
$soap =& $endpoint_info['client'];
- # XXX how do we determine a failure on retreiving/parsing wsdl?
+ # XXX how do we determine a failure on retrieving/parsing wsdl?
if ($soap->wsdl->fault) {
$fault = $soap->wsdl->fault;
$soap_test->setResult(0,'WSDL',
diff --git a/ext/spl/php_spl.c b/ext/spl/php_spl.c
index a37a453c8c..473ab00963 100644
--- a/ext/spl/php_spl.c
+++ b/ext/spl/php_spl.c
@@ -326,7 +326,7 @@ PHP_FUNCTION(spl_autoload)
RETURN_FALSE;
}
- if (file_exts == NULL) { /* autoload_extensions is not intialzed, set to defaults */
+ if (file_exts == NULL) { /* autoload_extensions is not initialzed, set to defaults */
copy = pos1 = estrndup(SPL_DEFAULT_FILE_EXTENSIONS, sizeof(SPL_DEFAULT_FILE_EXTENSIONS)-1);
} else {
copy = pos1 = estrndup(file_exts, file_exts_len);
diff --git a/ext/standard/tests/strings/dirname_basic.phpt b/ext/standard/tests/strings/dirname_basic.phpt
index 2b5e4d43d9..33fee611e0 100644
--- a/ext/standard/tests/strings/dirname_basic.phpt
+++ b/ext/standard/tests/strings/dirname_basic.phpt
@@ -1,5 +1,5 @@
--TEST--
-Test dirname() function : basic funtionality
+Test dirname() function : basic functionality
--FILE--
<?php
/* Prototype: string dirname ( string $path );
diff --git a/ext/standard/url.c b/ext/standard/url.c
index d8271a18ed..fe1b2fe112 100644
--- a/ext/standard/url.c
+++ b/ext/standard/url.c
@@ -266,7 +266,7 @@ PHPAPI php_url *php_url_parse_ex(char const *str, int length)
p = s;
} else {
/* memrchr is a GNU specific extension
- Emulate for wide compatability */
+ Emulate for wide compatibility */
for(p = e; p >= s && *p != ':'; p--);
}
diff --git a/scripts/dev/find_tested.php b/scripts/dev/find_tested.php
index f95c46251c..e841e2e959 100644
--- a/scripts/dev/find_tested.php
+++ b/scripts/dev/find_tested.php
@@ -88,7 +88,7 @@ function mark_methods_as_tested($method_info, $phpt_files) {
foreach($tested_functions as $tested_function) {
- // go through method info array marking this funtion as tested
+ // go through method info array marking this function as tested
foreach($method_info as &$current_method_record) {
if (strcasecmp($tested_function, $current_method_record[METHOD_NAME]) == 0) {
// matched the method name
diff --git a/server-tests-config.php b/server-tests-config.php
index 0ddff28cb2..a4fa88a5b2 100755
--- a/server-tests-config.php
+++ b/server-tests-config.php
@@ -52,7 +52,7 @@ $conf = array(
/* file extension of pages requested via http
this allows for php to be configured to parse
- extensions other than php, usefull for multiple
+ extensions other than php, useful for multiple
configurations under a single webserver */
'TEST_WEB_EXT' => 'php',
diff --git a/win32/build/confutils.js b/win32/build/confutils.js
index 8da760406c..2151361368 100644
--- a/win32/build/confutils.js
+++ b/win32/build/confutils.js
@@ -1499,7 +1499,7 @@ function output_as_table(header, ar_out)
{
var l = header.length;
var cols = 80;
- var fixedlenght = "";
+ var fixedlength = "";
var t = 0;
var i,j,k,m;
var out = "| ";
diff --git a/win32/sendmail.h b/win32/sendmail.h
index 0a7698e2fe..6fed77ea06 100644
--- a/win32/sendmail.h
+++ b/win32/sendmail.h
@@ -5,7 +5,7 @@
#endif
#define HOST_NAME_LEN 256
-#define MAX_APPNAME_LENGHT 100
+#define MAX_APPNAME_LENGTH 100
#define MAIL_BUFFER_SIZE (1024*4) /* 4k buffer */
/* Return values */
#define MIN_ERROR_INDEX 0 /* Always 0 like SUCCESS */