summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
Diffstat (limited to 'ext')
-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
8 files changed, 8 insertions, 8 deletions
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 6b66dce3df..b7ea5ec54f 100644
--- a/ext/json/json.c
+++ b/ext/json/json.c
@@ -382,7 +382,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 fbf8ea031c..245d2f6ef1 100644
--- a/ext/mysqlnd/mysqlnd_result.c
+++ b/ext/mysqlnd/mysqlnd_result.c
@@ -1151,7 +1151,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 1f1e860035..1e5fd3274a 100644
--- a/ext/pcre/pcrelib/ChangeLog
+++ b/ext/pcre/pcrelib/ChangeLog
@@ -5311,7 +5311,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 5927e05562..3e7106ed25 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--);
}