summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
Diffstat (limited to 'ext')
-rw-r--r--ext/calendar/jewish.c2
-rw-r--r--ext/dom/node.c2
-rw-r--r--ext/filter/logical_filters.c2
-rw-r--r--ext/gmp/gmp.c2
-rw-r--r--ext/mbstring/php_mbregex.c2
-rw-r--r--ext/mysqli/mysqli.c2
-rw-r--r--ext/mysqli/mysqli_api.c2
-rw-r--r--ext/mysqli/mysqli_result_iterator.c2
-rw-r--r--ext/opcache/Optimizer/zend_func_info.h2
-rw-r--r--ext/opcache/Optimizer/zend_ssa.h2
-rw-r--r--ext/pcre/upgrade-pcre.php2
-rw-r--r--ext/pgsql/pgsql.c2
-rw-r--r--ext/session/session.c2
-rw-r--r--ext/shmop/README2
-rw-r--r--ext/simplexml/simplexml.c2
-rw-r--r--ext/soap/interop/client_round2_run.php2
-rw-r--r--ext/soap/php_http.c2
-rw-r--r--ext/spl/spl_directory.c2
-rw-r--r--ext/standard/base64.c2
-rw-r--r--ext/standard/file.c4
20 files changed, 21 insertions, 21 deletions
diff --git a/ext/calendar/jewish.c b/ext/calendar/jewish.c
index 07284ed8c2..399fcf9100 100644
--- a/ext/calendar/jewish.c
+++ b/ext/calendar/jewish.c
@@ -272,7 +272,7 @@
#define HALAKIM_PER_METONIC_CYCLE (HALAKIM_PER_LUNAR_CYCLE * (12 * 19 + 7))
#define JEWISH_SDN_OFFSET 347997
-#define JEWISH_SDN_MAX 324542846L /* 12/13/887605, greater value raises interger overflow */
+#define JEWISH_SDN_MAX 324542846L /* 12/13/887605, greater value raises integer overflow */
#define NEW_MOON_OF_CREATION 31524
#define SUNDAY 0
diff --git a/ext/dom/node.c b/ext/dom/node.c
index 0183174148..0e7f64a9bd 100644
--- a/ext/dom/node.c
+++ b/ext/dom/node.c
@@ -1372,7 +1372,7 @@ PHP_FUNCTION(dom_node_clone_node)
}
/* When deep is false Element nodes still require the attributes
- Following taken from libxml as xmlDocCopyNode doesnt do this */
+ Following taken from libxml as xmlDocCopyNode doesn't do this */
if (n->type == XML_ELEMENT_NODE && recursive == 0) {
if (n->nsDef != NULL) {
node->nsDef = xmlCopyNamespaceList(n->nsDef);
diff --git a/ext/filter/logical_filters.c b/ext/filter/logical_filters.c
index 1b685eb550..076d247946 100644
--- a/ext/filter/logical_filters.c
+++ b/ext/filter/logical_filters.c
@@ -758,7 +758,7 @@ static int _php_filter_validate_ipv6(char *str, size_t str_len) /* {{{ */
return (blocks <= 8);
}
} else if ((str - 1) == s) {
- /* dont allow leading : without another : following */
+ /* don't allow leading : without another : following */
return 0;
}
}
diff --git a/ext/gmp/gmp.c b/ext/gmp/gmp.c
index 84e7b4454c..3c92735cf6 100644
--- a/ext/gmp/gmp.c
+++ b/ext/gmp/gmp.c
@@ -604,7 +604,7 @@ static int gmp_unserialize(zval *object, zend_class_entry *ce, const unsigned ch
gmp_create(object, &gmpnum);
/* The "object" variable may be modified during the execution of this unserialize handler
- * (it may turn into a reference). Keep the original object around for futher operations. */
+ * (it may turn into a reference). Keep the original object around for further operations. */
ZVAL_COPY_VALUE(&object_copy, object);
p = buf;
diff --git a/ext/mbstring/php_mbregex.c b/ext/mbstring/php_mbregex.c
index dd1bef031a..68922b6966 100644
--- a/ext/mbstring/php_mbregex.c
+++ b/ext/mbstring/php_mbregex.c
@@ -665,7 +665,7 @@ mb_regex_groups_iter(const OnigUChar* name, const OnigUChar* name_end, int ngrou
int gn, beg, end;
/*
- * In case of duplicate groups, keep only the last suceeding one
+ * In case of duplicate groups, keep only the last succeeding one
* to be consistent with preg_match with the PCRE_DUPNAMES option.
*/
gn = onig_name_to_backref_number(reg, name, name_end, args->region);
diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c
index ae5ed4ba44..a25bc096ce 100644
--- a/ext/mysqli/mysqli.c
+++ b/ext/mysqli/mysqli.c
@@ -978,7 +978,7 @@ PHP_MINFO_FUNCTION(mysqli)
/* }}} */
-/* Dependancies */
+/* Dependencies */
static const zend_module_dep mysqli_deps[] = {
ZEND_MOD_REQUIRED("spl")
#if defined(MYSQLI_USE_MYSQLND)
diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c
index 2110f35ae1..40c7d2982d 100644
--- a/ext/mysqli/mysqli_api.c
+++ b/ext/mysqli/mysqli_api.c
@@ -542,7 +542,7 @@ mysqli_stmt_bind_result_do_bind(MY_STMT *stmt, zval *args, unsigned int argc)
MYSQLI_REPORT_STMT_ERROR(stmt->stmt);
if (rc) {
- /* dont close the statement or subsequent usage (for example ->execute()) will lead to crash */
+ /* don't close the statement or subsequent usage (for example ->execute()) will lead to crash */
for (i=0; i < var_cnt ; i++) {
if (stmt->result.buf[i].val) {
efree(stmt->result.buf[i].val);
diff --git a/ext/mysqli/mysqli_result_iterator.c b/ext/mysqli/mysqli_result_iterator.c
index ec9a9e5b2d..9b42094345 100644
--- a/ext/mysqli/mysqli_result_iterator.c
+++ b/ext/mysqli/mysqli_result_iterator.c
@@ -66,7 +66,7 @@ static void php_mysqli_result_iterator_dtor(zend_object_iterator *iter)
{
php_mysqli_result_iterator *iterator = (php_mysqli_result_iterator*)iter;
- /* cleanup handled in sxe_object_dtor as we dont always have an iterator wrapper */
+ /* cleanup handled in sxe_object_dtor as we don't always have an iterator wrapper */
zval_ptr_dtor(&iterator->intern.data);
zval_ptr_dtor(&iterator->current_row);
}
diff --git a/ext/opcache/Optimizer/zend_func_info.h b/ext/opcache/Optimizer/zend_func_info.h
index 81a52bd078..37a88d8bf0 100644
--- a/ext/opcache/Optimizer/zend_func_info.h
+++ b/ext/opcache/Optimizer/zend_func_info.h
@@ -22,7 +22,7 @@
#include "zend_ssa.h"
/* func flags */
-#define ZEND_FUNC_INDIRECT_VAR_ACCESS (1<<0) /* accesses varables by name */
+#define ZEND_FUNC_INDIRECT_VAR_ACCESS (1<<0) /* accesses variables by name */
#define ZEND_FUNC_HAS_CALLS (1<<1)
#define ZEND_FUNC_VARARG (1<<2) /* uses func_get_args() */
#define ZEND_FUNC_NO_LOOPS (1<<3)
diff --git a/ext/opcache/Optimizer/zend_ssa.h b/ext/opcache/Optimizer/zend_ssa.h
index 61c4166c64..cfb6f1dec2 100644
--- a/ext/opcache/Optimizer/zend_ssa.h
+++ b/ext/opcache/Optimizer/zend_ssa.h
@@ -113,7 +113,7 @@ typedef struct _zend_ssa_var {
zend_ssa_phi *definition_phi; /* phi that defines this value */
int use_chain; /* uses of this value, linked through opN_use_chain */
zend_ssa_phi *phi_use_chain; /* uses of this value in Phi, linked through use_chain */
- zend_ssa_phi *sym_use_chain; /* uses of this value in Pi constaints */
+ zend_ssa_phi *sym_use_chain; /* uses of this value in Pi constraints */
unsigned int no_val : 1; /* value doesn't mater (used as op1 in ZEND_ASSIGN) */
unsigned int scc_entry : 1;
unsigned int alias : 2; /* value may be changed indirectly */
diff --git a/ext/pcre/upgrade-pcre.php b/ext/pcre/upgrade-pcre.php
index 6da627d750..b0da6cdb44 100644
--- a/ext/pcre/upgrade-pcre.php
+++ b/ext/pcre/upgrade-pcre.php
@@ -61,7 +61,7 @@ function recurse($path)
die("$newfile is not available any more\n");
}
- // maintain file mtimes so that cvs doesnt get crazy
+ // maintain file mtimes so that cvs doesn't get crazy
if (file_get_contents($newfile) !== file_get_contents($file)) {
copy($newfile, $file);
}
diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c
index 36cdeac4e0..5b613a4328 100644
--- a/ext/pgsql/pgsql.c
+++ b/ext/pgsql/pgsql.c
@@ -1093,7 +1093,7 @@ static PHP_GINIT_FUNCTION(pgsql)
ZEND_TSRMLS_CACHE_UPDATE();
#endif
memset(pgsql_globals, 0, sizeof(zend_pgsql_globals));
- /* Initilize notice message hash at MINIT only */
+ /* Initialize notice message hash at MINIT only */
zend_hash_init_ex(&pgsql_globals->notices, 0, NULL, ZVAL_PTR_DTOR, 1, 0);
}
/* }}} */
diff --git a/ext/session/session.c b/ext/session/session.c
index 7c6b880cc8..3de3870234 100644
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -1544,7 +1544,7 @@ PHPAPI int php_session_start(void) /* {{{ */
PS(define_sid) = 0;
}
}
- /* Initilize session ID from non cookie values */
+ /* Initialize session ID from non cookie values */
if (!PS(use_only_cookies)) {
if (!PS(id) && (data = zend_hash_str_find(&EG(symbol_table), "_GET", sizeof("_GET") - 1))) {
ZVAL_DEREF(data);
diff --git a/ext/shmop/README b/ext/shmop/README
index c4970376b0..2553f3fe18 100644
--- a/ext/shmop/README
+++ b/ext/shmop/README
@@ -26,7 +26,7 @@ int shmop_open(int key, string flags, int mode, int size)
mode - acsess mode same as for a file (0644) for example
size - size of the block in bytes
- returns an indentifier
+ returns an identifier
char shmop_read(int shmid, int start, int count)
diff --git a/ext/simplexml/simplexml.c b/ext/simplexml/simplexml.c
index 1abf68fcc5..92e6de107a 100644
--- a/ext/simplexml/simplexml.c
+++ b/ext/simplexml/simplexml.c
@@ -2410,7 +2410,7 @@ static void php_sxe_iterator_dtor(zend_object_iterator *iter) /* {{{ */
{
php_sxe_iterator *iterator = (php_sxe_iterator *)iter;
- /* cleanup handled in sxe_object_dtor as we dont always have an iterator wrapper */
+ /* cleanup handled in sxe_object_dtor as we don't always have an iterator wrapper */
if (!Z_ISUNDEF(iterator->intern.data)) {
zval_ptr_dtor(&iterator->intern.data);
}
diff --git a/ext/soap/interop/client_round2_run.php b/ext/soap/interop/client_round2_run.php
index d9a2af0aeb..f850448ce9 100644
--- a/ext/soap/interop/client_round2_run.php
+++ b/ext/soap/interop/client_round2_run.php
@@ -21,7 +21,7 @@ require_once 'client_round2_interop.php';
$iop = new Interop_Client();
$iop->html = 0;
-// force a fetch of endpoints, this happens irregardless if no endpoints in database
+// force a fetch of endpoints, this happens regardless if no endpoints in database
$iop->fetchEndpoints();
// set some options
diff --git a/ext/soap/php_http.c b/ext/soap/php_http.c
index 7a2410de82..fc068bf4d1 100644
--- a/ext/soap/php_http.c
+++ b/ext/soap/php_http.c
@@ -946,7 +946,7 @@ try_again:
/* Grab and send back every cookie */
/* Not going to worry about Path: because
- we shouldn't be changing urls so path dont
+ we shouldn't be changing urls so path doesn't
matter too much
*/
cookie_itt = strstr(ZSTR_VAL(http_headers), "Set-Cookie: ");
diff --git a/ext/spl/spl_directory.c b/ext/spl/spl_directory.c
index 471239dd31..0554226ad8 100644
--- a/ext/spl/spl_directory.c
+++ b/ext/spl/spl_directory.c
@@ -2914,7 +2914,7 @@ SPL_METHOD(SplFileObject, fread)
ZVAL_NEW_STR(return_value, zend_string_alloc(length, 0));
Z_STRLEN_P(return_value) = php_stream_read(intern->u.file.stream, Z_STRVAL_P(return_value), length);
- /* needed because recv/read/gzread doesnt put a null at the end*/
+ /* needed because recv/read/gzread doesn't put a null at the end*/
Z_STRVAL_P(return_value)[Z_STRLEN_P(return_value)] = 0;
}
diff --git a/ext/standard/base64.c b/ext/standard/base64.c
index 4a3a76ac0a..fb6d491acf 100644
--- a/ext/standard/base64.c
+++ b/ext/standard/base64.c
@@ -396,7 +396,7 @@ static __m128i php_base64_encode_ssse3_translate(__m128i in)
/* mask is 0xFF (-1) for range #[1..4] and 0x00 for range #0: */
mask = _mm_cmpgt_epi8(in, _mm_set1_epi8(25));
- /* substract -1, so add 1 to indices for range #[1..4], All indices are now correct: */
+ /* subtract -1, so add 1 to indices for range #[1..4], All indices are now correct: */
indices = _mm_sub_epi8(indices, mask);
/* Add offsets to input values: */
diff --git a/ext/standard/file.c b/ext/standard/file.c
index fd44133639..7596f0e18f 100644
--- a/ext/standard/file.c
+++ b/ext/standard/file.c
@@ -1121,7 +1121,7 @@ PHPAPI PHP_FUNCTION(fgetss)
len = (size_t) bytes;
buf = safe_emalloc(sizeof(char), (len + 1), 0);
- /*needed because recv doesnt set null char at end*/
+ /*needed because recv doesn't set null char at end*/
memset(buf, 0, len + 1);
}
@@ -1816,7 +1816,7 @@ PHPAPI PHP_FUNCTION(fread)
ZVAL_NEW_STR(return_value, zend_string_alloc(len, 0));
Z_STRLEN_P(return_value) = php_stream_read(stream, Z_STRVAL_P(return_value), len);
- /* needed because recv/read/gzread doesnt put a null at the end*/
+ /* needed because recv/read/gzread doesn't put a null at the end*/
Z_STRVAL_P(return_value)[Z_STRLEN_P(return_value)] = 0;
if (Z_STRLEN_P(return_value) < len / 2) {
View Lorry Controller Status