]> granicus.if.org Git - php/commitdiff
less serious compatAbility fixes
authorVeres Lajos <vlajos@gmail.com>
Sat, 13 Jul 2013 12:15:21 +0000 (13:15 +0100)
committerStanislav Malyshev <stas@php.net>
Mon, 15 Jul 2013 07:21:39 +0000 (00:21 -0700)
Zend/ZEND_CHANGES
ext/mysql/php_mysql.c
ext/sockets/sockets.c
ext/sqlite3/php_sqlite3_structs.h
ext/standard/url.c

index 4a6dc6cdcf166d1dc078bd0ffbe104f2c7530443..afb3595595f43e050e0095c261c7a67e4d846317 100644 (file)
@@ -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.
index db0e5a1fc5089fcd5106223e62d589c7fcfc5561..adaecd020da9e4699828ac8a706446f42435a05f 100644 (file)
@@ -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)
index 0c0380861ace46554a8dde6e23bcc48614b4ba3a..d0d02946477d7b4867ffdb1ba9a5e81e6a3eb698 100644 (file)
@@ -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)
 
index 0e813b6dfdc87044cfd0af153253ad2641e07c6f..6c65e02ee7f9bdb95efe04951dc0a1363645952d 100644 (file)
@@ -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
index 94f6638d6472185c89c65947421ede92f1260995..190b4665ebe76a1607feae71b0a463559ed4126b 100644 (file)
@@ -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--);
        }