diff options
| author | Veres Lajos <vlajos@gmail.com> | 2013-07-13 13:15:21 +0100 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2013-07-15 00:21:39 -0700 |
| commit | b79b13b4efbf3374ec7d28286b29928f43da6d1d (patch) | |
| tree | ae9a95ba101d77d47462cf7bb88d864de5f2aa14 | |
| parent | bb64106f64d862102c7aad40f10a3bcdc89475d2 (diff) | |
| download | php-git-b79b13b4efbf3374ec7d28286b29928f43da6d1d.tar.gz | |
less serious compatAbility fixes
| -rw-r--r-- | Zend/ZEND_CHANGES | 4 | ||||
| -rw-r--r-- | ext/mysql/php_mysql.c | 2 | ||||
| -rw-r--r-- | ext/sockets/sockets.c | 2 | ||||
| -rw-r--r-- | ext/sqlite3/php_sqlite3_structs.h | 2 | ||||
| -rw-r--r-- | ext/standard/url.c | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/Zend/ZEND_CHANGES b/Zend/ZEND_CHANGES index 4a6dc6cdcf..afb3595595 100644 --- a/Zend/ZEND_CHANGES +++ b/Zend/ZEND_CHANGES @@ -1136,7 +1136,7 @@ Changes in the Zend Engine 1.0 (supports breakpoints, expression evaluation, step-in/over, function call backtrace, and more). - The Zend Engine claims 100% compatability with the engine of PHP + The Zend Engine claims 100% compatibility with the engine of PHP 3.0, and is shamelessly lying about it. Here's why: * Static variable initializers only accept scalar values @@ -1161,6 +1161,6 @@ Changes in the Zend Engine 1.0 printed the letter { and the contents of the variable $somevar in PHP 3.0), it will result in a parse error with the Zend Engine. In this case, you would have to change the code to print - "\{$somevar"; This incompatability is due to the full variable + "\{$somevar"; This incompatibility is due to the full variable reference within quoted strings feature added in the Zend Engine. diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c index db0e5a1fc5..adaecd020d 100644 --- a/ext/mysql/php_mysql.c +++ b/ext/mysql/php_mysql.c @@ -296,7 +296,7 @@ static const zend_function_entry mysql_functions[] = { #ifdef MYSQL_HAS_SET_CHARSET PHP_FE(mysql_set_charset, arginfo_mysql_set_charset) #endif - /* for downwards compatability */ + /* for downwards compatibility */ PHP_FALIAS(mysql, mysql_db_query, arginfo_mysql_db_query) PHP_FALIAS(mysql_fieldname, mysql_field_name, arginfo_mysql_field_name) PHP_FALIAS(mysql_fieldtable, mysql_field_table, arginfo_mysql_field_seek) diff --git a/ext/sockets/sockets.c b/ext/sockets/sockets.c index 0c0380861a..d0d0294647 100644 --- a/ext/sockets/sockets.c +++ b/ext/sockets/sockets.c @@ -352,7 +352,7 @@ const zend_function_entry sockets_functions[] = { PHP_FE(socket_clear_error, arginfo_socket_clear_error) PHP_FE(socket_import_stream, arginfo_socket_import_stream) - /* for downwards compatability */ + /* for downwards compatibility */ PHP_FALIAS(socket_getopt, socket_get_option, arginfo_socket_get_option) PHP_FALIAS(socket_setopt, socket_set_option, arginfo_socket_set_option) diff --git a/ext/sqlite3/php_sqlite3_structs.h b/ext/sqlite3/php_sqlite3_structs.h index 0e813b6dfd..6c65e02ee7 100644 --- a/ext/sqlite3/php_sqlite3_structs.h +++ b/ext/sqlite3/php_sqlite3_structs.h @@ -23,7 +23,7 @@ #include <sqlite3.h> -/* for backwards compatability reasons */ +/* for backwards compatibility reasons */ #ifndef SQLITE_OPEN_READONLY #define SQLITE_OPEN_READONLY 0x00000001 #endif diff --git a/ext/standard/url.c b/ext/standard/url.c index 94f6638d64..190b4665eb 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 != ':' && p >= s; p--); } |