Commit:    227556c6a2f915339e13f8997bbd266c07dc9c41
Author:    Veres Lajos <vla...@gmail.com>         Sat, 13 Jul 2013 13:15:21 
+0100
Committer: Stanislav Malyshev <s...@php.net>      Mon, 15 Jul 2013 00:17:35 
-0700
Parents:   8c663fd4ccd8e9180ca2c0cdf46d81fa442f40ec
Branches:  PHP-5.5 master

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=227556c6a2f915339e13f8997bbd266c07dc9c41

Log:
less serious compatAbility fixes

Changed paths:
  M  Zend/ZEND_CHANGES
  M  ext/mysql/php_mysql.c
  M  ext/sockets/sockets.c
  M  ext/sqlite3/php_sqlite3_structs.h
  M  ext/standard/url.c


Diff:
diff --git a/Zend/ZEND_CHANGES b/Zend/ZEND_CHANGES
index 4a6dc6c..afb3595 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 ba81a95..3b50dd5 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_DEP_FALIAS(mysql,                           mysql_db_query,         
arginfo_mysql_db_query)
        PHP_DEP_FALIAS(mysql_fieldname,         mysql_field_name,       
arginfo_mysql_field_name)
        PHP_DEP_FALIAS(mysql_fieldtable,        mysql_field_table,      
arginfo_mysql_field_seek)
diff --git a/ext/sockets/sockets.c b/ext/sockets/sockets.c
index 10375ab..801af0a 100644
--- a/ext/sockets/sockets.c
+++ b/ext/sockets/sockets.c
@@ -344,7 +344,7 @@ const zend_function_entry sockets_functions[] = {
        PHP_FE(socket_recvmsg,                  arginfo_socket_recvmsg)
        PHP_FE(socket_cmsg_space,               arginfo_socket_cmsg_space)
 
-       /* 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 0e813b6..6c65e02 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 94f6638..190b466 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--);
        }


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to