[PHP-CVS] com php-src: Fix bug #62665: add curl.cainfo to php.ini: NEWS php.ini-development php.ini-production

2013-07-15 Thread Stanislav Malyshev 
Commit:2bad01e61ba2677e1e8303f9b56574ebb7ba3f00
Author:Stanislav Malyshev s...@php.net Sun, 14 Jul 2013 23:53:55 
-0700
Parents:   a51b5d5f349aa52abed3100848f658f1995c
Branches:  PHP-5.4 PHP-5.5 master

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

Log:
Fix bug #62665: add curl.cainfo to php.ini

Conflicts:

php.ini-development
php.ini-production

Bugs:
https://bugs.php.net/62665

Changed paths:
  M  NEWS
  M  php.ini-development
  M  php.ini-production


Diff:
diff --git a/NEWS b/NEWS
index 2ff1675..52eab40 100644
--- a/NEWS
+++ b/NEWS
@@ -24,6 +24,9 @@ PHP   
 NEWS
   . Fixed bug #65066 (Cli server not responsive when responding with 422 http
 status code). (Adam)
 
+- CURL:
+  . Fixed bug #62665 (curl.cainfo doesn't appear in php.ini). (Lior Kaplan)
+
 - FPM:
   . Fixed bug #63983 (enabling FPM borks compile on FreeBSD).
 (chibisuke at web dot de, Felipe)
@@ -55,7 +58,7 @@ PHP   
 NEWS
   . Allowed PDO_OCI to compile with Oracle Database 12c client libraries.
 (Chris Jones)
 
--PDO_dblib:
+- PDO_dblib:
   . Fixed bug #65219 (PDO/dblib not working anymore (use dbName not sent)). 
 (Stanley Sufficool)
 
diff --git a/php.ini-development b/php.ini-development
index 4ff4192..aee8b48 100644
--- a/php.ini-development
+++ b/php.ini-development
@@ -1856,6 +1856,11 @@ ldap.max_links = -1
 [dba]
 ;dba.default_handler=
 
+[curl]
+; A default value for the CURLOPT_CAINFO option. This is required to be an
+; absolute path.
+;curl.cainfo =
+
 ; Local Variables:
 ; tab-width: 4
 ; End:
diff --git a/php.ini-production b/php.ini-production
index 814455b..2df1264 100644
--- a/php.ini-production
+++ b/php.ini-production
@@ -1856,6 +1856,11 @@ ldap.max_links = -1
 [dba]
 ;dba.default_handler=
 
+[curl]
+; A default value for the CURLOPT_CAINFO option. This is required to be an
+; absolute path.
+;curl.cainfo =
+
 ; Local Variables:
 ; tab-width: 4
 ; End:


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

[PHP-CVS] com php-src: Merge branch 'PHP-5.4' into PHP-5.5: php.ini-development php.ini-production

2013-07-15 Thread Stanislav Malyshev 
Commit:8c663fd4ccd8e9180ca2c0cdf46d81fa442f40ec
Author:Stanislav Malyshev s...@php.net Sun, 14 Jul 2013 23:56:59 
-0700
Parents:   07ab23655a993fa8810def7ac9a5097058e1770f 
2bad01e61ba2677e1e8303f9b56574ebb7ba3f00
Branches:  PHP-5.5 master

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

Log:
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix bug #62665: add curl.cainfo to php.ini

Conflicts:
php.ini-development
php.ini-production

Bugs:
https://bugs.php.net/62665

Changed paths:
  MM  php.ini-development
  MM  php.ini-production


Diff:
diff --cc php.ini-development
index b23321a,aee8b48..b7f0b30
--- a/php.ini-development
+++ b/php.ini-development
@@@ -1860,102 -1856,11 +1860,107 @@@ ldap.max_links = -
  [dba]
  ;dba.default_handler=
  
 +[opcache]
 +; Determines if Zend OPCache is enabled
 +;opcache.enable=0
 +
 +; Determines if Zend OPCache is enabled for the CLI version of PHP
 +;opcache.enable_cli=0
 +
 +; The OPcache shared memory storage size.
 +;opcache.memory_consumption=64
 +
 +; The amount of memory for interned strings in Mbytes.
 +;opcache.interned_strings_buffer=4
 +
 +; The maximum number of keys (scripts) in the OPcache hash table.
 +; Only numbers between 200 and 10 are allowed.
 +;opcache.max_accelerated_files=2000
 +
 +; The maximum percentage of wasted memory until a restart is scheduled.
 +;opcache.max_wasted_percentage=5
 +
 +; When this directive is enabled, the OPcache appends the current working
 +; directory to the script key, thus eliminating possible collisions between
 +; files with the same name (basename). Disabling the directive improves
 +; performance, but may break existing applications.
 +;opcache.use_cwd=1
 +
 +; When disabled, you must reset the OPcache manually or restart the
 +; webserver for changes to the filesystem to take effect.
 +;opcache.validate_timestamps=1
 +
 +; How often (in seconds) to check file timestamps for changes to the shared
 +; memory storage allocation. (1 means validate once per second, but only
 +; once per request. 0 means always validate)
 +;opcache.revalidate_freq=2
 +
 +; Enables or disables file search in include_path optimization
 +;opcache.revalidate_path=0
 +
 +; If disabled, all PHPDoc comments are dropped from the code to reduce the
 + ;size of the optimized code.
 +;opcache.save_comments=1
 +
 +; If disabled, PHPDoc comments are not loaded from SHM, so Doc Comments
 +; may be always stored (save_comments=1), but not loaded by applications
 +; that don't need them anyway.
 +;opcache.load_comments=1
 +
 +; If enabled, a fast shutdown sequence is used for the accelerated code
 +;opcache.fast_shutdown=0
 +
 +; Allow file existence override (file_exists, etc.) performance feature.
 +;opcache.enable_file_override=0
 +
 +; A bitmask, where each bit enables or disables the appropriate OPcache
 +; passes
 +;opcache.optimization_level=0x
 +
 +;opcache.inherited_hack=1
 +;opcache.dups_fix=0
 +
 +; The location of the OPcache blacklist file (wildcards allowed).
 +; Each OPcache blacklist file is a text file that holds the names of files
 +; that should not be accelerated. The file format is to add each filename
 +; to a new line. The filename may be a full path or just a file prefix
 +; (i.e., /var/www/x  blacklists all the files and directories in /var/www
 +; that start with 'x'). Line starting with a ; are ignored (comments).
 +;opcache.blacklist_filename=
 +
 +; Allows exclusion of large files from being cached. By default all files
 +; are cached.
 +;opcache.max_file_size=0
 +
 +; Check the cache checksum each N requests.
 +; The default value of 0 means that the checks are disabled.
 +;opcache.consistency_checks=0
 +
 +; How long to wait (in seconds) for a scheduled restart to begin if the cache
 +; is not being accessed.
 +;opcache.force_restart_timeout=180
 +
 +; OPcache error_log file name. Empty string assumes stderr.
 +;opcache.error_log=
 +
 +; All OPcache errors go to the Web server log.
 +; By default, only fatal errors (level 0) or errors (level 1) are logged.
 +; You can also enable warnings (level 2), info messages (level 3) or
 +; debug messages (level 4).
 +;opcache.log_verbosity_level=1
 +
 +; Preferred Shared Memory back-end. Leave empty and let the system decide.
 +;opcache.preferred_memory_model=
 +
 +; Protect the shared memory from unexpected writing during script execution.
 +; Useful for internal debugging only.
 +;opcache.protect_memory=0
 +
+ [curl]
+ ; A default value for the CURLOPT_CAINFO option. This is required to be an
+ ; absolute path.
+ ;curl.cainfo =
+ 
  ; Local Variables:
  ; tab-width: 4
  ; End:
diff --cc php.ini-production
index 8d1f359,2df1264..8b14386
--- a/php.ini-production
+++ b/php.ini-production
@@@ -1860,102 -1856,11 +1860,107 @@@ ldap.max_links = -
  [dba]
  ;dba.default_handler=
  
 +[opcache]
 +; Determines if Zend OPCache is enabled
 +;opcache.enable=0
 +
 +; Determines if Zend OPCache

[PHP-CVS] com php-src: Merge branch 'PHP-5.5': php.ini-development php.ini-production

2013-07-15 Thread Stanislav Malyshev 
Commit:2c8a4af892151f9991345e57d67f27b19b9ff6ef
Author:Stanislav Malyshev s...@php.net Sun, 14 Jul 2013 23:57:16 
-0700
Parents:   50f15bb9219422a0a7e4d86cc03e5d10ed330d85 
8c663fd4ccd8e9180ca2c0cdf46d81fa442f40ec
Branches:  master

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

Log:
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fix bug #62665: add curl.cainfo to php.ini

Bugs:
https://bugs.php.net/62665

Changed paths:
  MM  php.ini-development
  MM  php.ini-production


Diff:



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

[PHP-CVS] com php-src: revert false fix: ext/standard/tests/general_functions/003.phpt

2013-07-15 Thread Stanislav Malyshev 
Commit:2c73ce4363c209dc9e094c34be4cac22ba8d30e8
Author:Veres Lajos vla...@gmail.com Sun, 14 Jul 2013 22:32:28 
+0100
Committer: Stanislav Malyshev s...@php.net  Mon, 15 Jul 2013 00:23:17 
-0700
Parents:   e9a95d78ef7c43bc6b6478b9370047d854b20024
Branches:  PHP-5.4 PHP-5.5 master

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

Log:
revert false fix

Changed paths:
  M  ext/standard/tests/general_functions/003.phpt


Diff:
diff --git a/ext/standard/tests/general_functions/003.phpt 
b/ext/standard/tests/general_functions/003.phpt
index 08e53b2..7ad90c8 100644
--- a/ext/standard/tests/general_functions/003.phpt
+++ b/ext/standard/tests/general_functions/003.phpt
@@ -43,7 +43,7 @@ $n += test_me(bug #7368, 2,  1345, 1234);
 $n += test_me(bug #6562, 1,debugg,debug);
 $n += test_me(bug #6562, 1,ddebug,debug);
 $n += test_me(bug #6562, 2,   debbbug,debug);
-$n += test_me(bug #6562, 1, debugging, debugging);
+$n += test_me(bug #6562, 1, debugging, debuging);
 
 $n += test_me(bug #16473, 2, a, bc);
 $n += test_me(bug #16473, 2, xa, xbc);


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

[PHP-CVS] com php-src: less serious compatAbility fixes: Zend/ZEND_CHANGES ext/mysql/php_mysql.c ext/sockets/sockets.c ext/sqlite3/php_sqlite3_structs.h ext/standard/url.c

2013-07-15 Thread Stanislav Malyshev 
Commit:b79b13b4efbf3374ec7d28286b29928f43da6d1d
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:21:39 
-0700
Parents:   bb64106f64d862102c7aad40f10a3bcdc89475d2
Branches:  PHP-5.4 PHP-5.5 master

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

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 db0e5a1..adaecd0 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 0c03808..d0d0294 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 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 0x0001
 #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

[PHP-CVS] com php-src: typos (orig): ext/sqlite3/libsqlite/sqlite3.c

2013-07-15 Thread Stanislav Malyshev 
Commit:bb64106f64d862102c7aad40f10a3bcdc89475d2
Author:Veres Lajos vla...@gmail.com Sun, 7 Jul 2013 22:40:16 +0100
Committer: Stanislav Malyshev s...@php.net  Mon, 15 Jul 2013 00:20:49 
-0700
Parents:   2bad01e61ba2677e1e8303f9b56574ebb7ba3f00
Branches:  PHP-5.4 PHP-5.5 master

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

Log:
typos (orig)

Changed paths:
  M  ext/sqlite3/libsqlite/sqlite3.c


Diff:
diff --git a/ext/sqlite3/libsqlite/sqlite3.c b/ext/sqlite3/libsqlite/sqlite3.c
index 655b4cf..c3d3408 100644
--- a/ext/sqlite3/libsqlite/sqlite3.c
+++ b/ext/sqlite3/libsqlite/sqlite3.c
@@ -118508,7 +118508,7 @@ static int star_oh(const char *z){
 
 /*
 ** If the word ends with zFrom and xCond() is true for the stem
-** of the word that preceds the zFrom ending, then change the 
+** of the word that precede the zFrom ending, then change the 
 ** ending to zTo.
 **
 ** The input word *pz and zFrom are both in reverse order.  zTo
@@ -127688,7 +127688,7 @@ SQLITE_API int sqlite3_extension_init(
 **   * Implementations of the SQL scalar upper() and lower() functions
 ** for case mapping.
 **
-**   * Integration of ICU and SQLite collation seqences.
+**   * Integration of ICU and SQLite collation sequences.
 **
 **   * An implementation of the LIKE operator that uses ICU to 
 ** provide case-independent matching.


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

[PHP-CVS] com php-src: revert false fix: ext/standard/tests/general_functions/003.phpt

2013-07-15 Thread Stanislav Malyshev 
Commit:f23a5fbc8e8a81db0f020a49c10aae0a100e2dbf
Author:Veres Lajos vla...@gmail.com Sun, 14 Jul 2013 22:32:28 
+0100
Committer: Stanislav Malyshev s...@php.net  Mon, 15 Jul 2013 00:19:07 
-0700
Parents:   72085b0e5f2fe6e69a83d8f43f92c5fe0d8bace3
Branches:  PHP-5.5 master

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

Log:
revert false fix

Changed paths:
  M  ext/standard/tests/general_functions/003.phpt


Diff:
diff --git a/ext/standard/tests/general_functions/003.phpt 
b/ext/standard/tests/general_functions/003.phpt
index 08e53b2..7ad90c8 100644
--- a/ext/standard/tests/general_functions/003.phpt
+++ b/ext/standard/tests/general_functions/003.phpt
@@ -43,7 +43,7 @@ $n += test_me(bug #7368, 2,  1345, 1234);
 $n += test_me(bug #6562, 1,debugg,debug);
 $n += test_me(bug #6562, 1,ddebug,debug);
 $n += test_me(bug #6562, 2,   debbbug,debug);
-$n += test_me(bug #6562, 1, debugging, debugging);
+$n += test_me(bug #6562, 1, debugging, debuging);
 
 $n += test_me(bug #16473, 2, a, bc);
 $n += test_me(bug #16473, 2, xa, xbc);


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

[PHP-CVS] com php-src: less serious compatAbility fixes: Zend/ZEND_CHANGES ext/mysql/php_mysql.c ext/sockets/sockets.c ext/sqlite3/php_sqlite3_structs.h ext/standard/url.c

2013-07-15 Thread Stanislav Malyshev 
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 0x0001
 #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

[PHP-CVS] com php-src: typos (orig): Zend/zend_generators.c ext/sqlite3/libsqlite/sqlite3.c

2013-07-15 Thread Stanislav Malyshev 
Commit:b8a2b254a1a629556d2c5d6a387026b9e774c868
Author:Veres Lajos vla...@gmail.com Sun, 7 Jul 2013 22:40:16 +0100
Committer: Stanislav Malyshev s...@php.net  Mon, 15 Jul 2013 00:18:32 
-0700
Parents:   227556c6a2f915339e13f8997bbd266c07dc9c41
Branches:  PHP-5.5 master

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

Log:
typos (orig)

Changed paths:
  M  Zend/zend_generators.c
  M  ext/sqlite3/libsqlite/sqlite3.c


Diff:
diff --git a/Zend/zend_generators.c b/Zend/zend_generators.c
index 4b22eb2..1a805bb 100644
--- a/Zend/zend_generators.c
+++ b/Zend/zend_generators.c
@@ -55,7 +55,7 @@ ZEND_API void zend_generator_close(zend_generator *generator, 
zend_bool finished
zval_ptr_dtor(execute_data-current_this);
}
 
-   /* A fatal error / die occured during the generator execution. 
Trying to clean
+   /* A fatal error / die occurred during the generator execution. 
Trying to clean
 * up the stack may not be safe in this case. */
if (CG(unclean_shutdown)) {
return;
diff --git a/ext/sqlite3/libsqlite/sqlite3.c b/ext/sqlite3/libsqlite/sqlite3.c
index 784be51..9c882c9 100644
--- a/ext/sqlite3/libsqlite/sqlite3.c
+++ b/ext/sqlite3/libsqlite/sqlite3.c
@@ -118508,7 +118508,7 @@ static int star_oh(const char *z){
 
 /*
 ** If the word ends with zFrom and xCond() is true for the stem
-** of the word that preceds the zFrom ending, then change the 
+** of the word that precede the zFrom ending, then change the 
 ** ending to zTo.
 **
 ** The input word *pz and zFrom are both in reverse order.  zTo
@@ -127688,7 +127688,7 @@ SQLITE_API int sqlite3_extension_init(
 **   * Implementations of the SQL scalar upper() and lower() functions
 ** for case mapping.
 **
-**   * Integration of ICU and SQLite collation seqences.
+**   * Integration of ICU and SQLite collation sequences.
 **
 **   * An implementation of the LIKE operator that uses ICU to 
 ** provide case-independent matching.


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

[PHP-CVS] com php-src: less serious compatAbility fixes: Zend/ZEND_CHANGES ext/mysql/php_mysql.c ext/sockets/sockets.c ext/sqlite3/php_sqlite3_structs.h ext/standard/url.c

2013-07-15 Thread Stanislav Malyshev 
Commit:d17e8ac32fe1f4bbf92c4bac1826d83d8372df95
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:19:39 
-0700
Parents:   6c4af15d6c87f43ff3902e51e4ad79aa55e60d49
Branches:  master

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

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 0x0001
 #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

[PHP-CVS] com php-src: typos (orig): Zend/zend_generators.c ext/opcache/tests/compact_literals.phpt ext/openssl/openssl.c ext/sqlite3/libsqlite/sqlite3.c

2013-07-15 Thread Stanislav Malyshev 
Commit:6c4af15d6c87f43ff3902e51e4ad79aa55e60d49
Author:Veres Lajos vla...@gmail.com Sun, 7 Jul 2013 22:40:16 +0100
Committer: Stanislav Malyshev s...@php.net  Mon, 15 Jul 2013 00:19:32 
-0700
Parents:   2c8a4af892151f9991345e57d67f27b19b9ff6ef
Branches:  master

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

Log:
typos (orig)

Changed paths:
  M  Zend/zend_generators.c
  M  ext/opcache/tests/compact_literals.phpt
  M  ext/openssl/openssl.c
  M  ext/sqlite3/libsqlite/sqlite3.c


Diff:
diff --git a/Zend/zend_generators.c b/Zend/zend_generators.c
index 4b22eb2..1a805bb 100644
--- a/Zend/zend_generators.c
+++ b/Zend/zend_generators.c
@@ -55,7 +55,7 @@ ZEND_API void zend_generator_close(zend_generator *generator, 
zend_bool finished
zval_ptr_dtor(execute_data-current_this);
}
 
-   /* A fatal error / die occured during the generator execution. 
Trying to clean
+   /* A fatal error / die occurred during the generator execution. 
Trying to clean
 * up the stack may not be safe in this case. */
if (CG(unclean_shutdown)) {
return;
diff --git a/ext/opcache/tests/compact_literals.phpt 
b/ext/opcache/tests/compact_literals.phpt
index a691b91..367331f 100644
--- a/ext/opcache/tests/compact_literals.phpt
+++ b/ext/opcache/tests/compact_literals.phpt
@@ -22,7 +22,7 @@ unset($array[2]);
 
 print_r($array);
 
-echo funcion define . : . PHP_EOL;
+echo function define . : . PHP_EOL;
 if (!function_exists(dummy)) {
function dummy() {
var_dump(__FUNCTION__);
@@ -165,7 +165,7 @@ Array
 [1] = one
 [two] = 2
 )
-funcion define:
+function define:
 string(5) dummy
 string(11) lambdadummy
 string(1) A
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
index 68f3aaf..36efd1b 100644
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@ -1492,7 +1492,7 @@ PHP_FUNCTION(openssl_spki_verify)
 
pkey = X509_PUBKEY_get(spki-spkac-pubkey);
if (pkey == NULL) {
-   php_error_docref(NULL TSRMLS_CC, E_WARNING, Unable to aquire 
signed public key);
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, Unable to acquire 
signed public key);
goto cleanup;
}
 
@@ -1549,7 +1549,7 @@ PHP_FUNCTION(openssl_spki_export)
 
pkey = X509_PUBKEY_get(spki-spkac-pubkey);
if (pkey == NULL) {
-   php_error_docref(NULL TSRMLS_CC, E_WARNING, Unable to aquire 
signed public key);
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, Unable to acquire 
signed public key);
goto cleanup;
}
 
diff --git a/ext/sqlite3/libsqlite/sqlite3.c b/ext/sqlite3/libsqlite/sqlite3.c
index 784be51..9c882c9 100644
--- a/ext/sqlite3/libsqlite/sqlite3.c
+++ b/ext/sqlite3/libsqlite/sqlite3.c
@@ -118508,7 +118508,7 @@ static int star_oh(const char *z){
 
 /*
 ** If the word ends with zFrom and xCond() is true for the stem
-** of the word that preceds the zFrom ending, then change the 
+** of the word that precede the zFrom ending, then change the 
 ** ending to zTo.
 **
 ** The input word *pz and zFrom are both in reverse order.  zTo
@@ -127688,7 +127688,7 @@ SQLITE_API int sqlite3_extension_init(
 **   * Implementations of the SQL scalar upper() and lower() functions
 ** for case mapping.
 **
-**   * Integration of ICU and SQLite collation seqences.
+**   * Integration of ICU and SQLite collation sequences.
 **
 **   * An implementation of the LIKE operator that uses ICU to 
 ** provide case-independent matching.


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

[PHP-CVS] com php-src: revert false fix: ext/standard/tests/general_functions/003.phpt

2013-07-15 Thread Stanislav Malyshev 
Commit:c2088f8b816806fd882090535b45f5cde97d6216
Author:Veres Lajos vla...@gmail.com Sun, 14 Jul 2013 22:32:28 
+0100
Committer: Stanislav Malyshev s...@php.net  Mon, 15 Jul 2013 00:19:56 
-0700
Parents:   1b06e0be96774eeb59a59b80476213a8b98a8fdc
Branches:  master

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

Log:
revert false fix

Changed paths:
  M  ext/standard/tests/general_functions/003.phpt


Diff:
diff --git a/ext/standard/tests/general_functions/003.phpt 
b/ext/standard/tests/general_functions/003.phpt
index 08e53b2..7ad90c8 100644
--- a/ext/standard/tests/general_functions/003.phpt
+++ b/ext/standard/tests/general_functions/003.phpt
@@ -43,7 +43,7 @@ $n += test_me(bug #7368, 2,  1345, 1234);
 $n += test_me(bug #6562, 1,debugg,debug);
 $n += test_me(bug #6562, 1,ddebug,debug);
 $n += test_me(bug #6562, 2,   debbbug,debug);
-$n += test_me(bug #6562, 1, debugging, debugging);
+$n += test_me(bug #6562, 1, debugging, debuging);
 
 $n += test_me(bug #16473, 2, a, bc);
 $n += test_me(bug #16473, 2, xa, xbc);


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

[PHP-CVS] com php-src: fix invalid variable name at ext/spl/internal/multipleiterator.inc: ext/spl/internal/multipleiterator.inc

2013-07-15 Thread Stanislav Malyshev 
Commit:76775a3aa7555197e0479865542a7013796ecbe1
Author:kazusuke sasezaki sasez...@gmail.com Wed, 26 Jun 2013 
00:26:06 +0900
Committer: Stanislav Malyshev s...@php.net  Mon, 15 Jul 2013 00:36:19 
-0700
Parents:   2c73ce4363c209dc9e094c34be4cac22ba8d30e8
Branches:  PHP-5.4 PHP-5.5 master

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

Log:
fix invalid variable name at ext/spl/internal/multipleiterator.inc

Changed paths:
  M  ext/spl/internal/multipleiterator.inc


Diff:
diff --git a/ext/spl/internal/multipleiterator.inc 
b/ext/spl/internal/multipleiterator.inc
index 2ed71d5..3c1719e 100644
--- a/ext/spl/internal/multipleiterator.inc
+++ b/ext/spl/internal/multipleiterator.inc
@@ -163,7 +163,7 @@ class MultipleIterator implements Iterator
$retval = array();
foreach($this-iterators as $iter)
{
-   if ($it-valid())
+   if ($iter-valid())
{
if ($this-flags  self::MIT_KEYS_ASSOC)
{


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

[PHP-CVS] com php-src: fix invalid variable name at ext/spl/internal/multipleiterator.inc (key() method, too): ext/spl/internal/multipleiterator.inc

2013-07-15 Thread Stanislav Malyshev 
Commit:e617679c0ba616551df62ad370a70d5cf610c270
Author:sasezaki sasez...@gmail.com Wed, 26 Jun 2013 01:04:26 +0900
Committer: Stanislav Malyshev s...@php.net  Mon, 15 Jul 2013 00:36:29 
-0700
Parents:   76775a3aa7555197e0479865542a7013796ecbe1
Branches:  PHP-5.4 PHP-5.5 master

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

Log:
fix invalid variable name at ext/spl/internal/multipleiterator.inc (key() 
method, too)

Changed paths:
  M  ext/spl/internal/multipleiterator.inc


Diff:
diff --git a/ext/spl/internal/multipleiterator.inc 
b/ext/spl/internal/multipleiterator.inc
index 3c1719e..12df011 100644
--- a/ext/spl/internal/multipleiterator.inc
+++ b/ext/spl/internal/multipleiterator.inc
@@ -205,7 +205,7 @@ class MultipleIterator implements Iterator
$retval = array();
foreach($this-iterators as $iter)
{
-   if ($it-valid())
+   if ($iter-valid())
{
$retval[] = $iter-key();
}


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

[PHP-CVS] com php-src: Remove PWS (Personal Web Server) references: INSTALL win32/build/mkdist.php win32/install.txt win32/pws-php5cgi.reg win32/pws-php5isapi.reg

2013-07-15 Thread Stanislav Malyshev 
Commit:2ec7b1c388951d7690311669f8148c94f58c636b
Author:Bruno CHALOPIN chalo...@syspertec.com Thu, 27 Jun 2013 
15:26:36 +0200
Committer: Stanislav Malyshev s...@php.net  Mon, 15 Jul 2013 00:38:29 
-0700
Parents:   68e630b72f52aaa994cde8082f912a2d91b1b9c6
Branches:  PHP-5.5 master

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

Log:
Remove PWS (Personal Web Server) references

Changed paths:
  M  INSTALL
  M  win32/build/mkdist.php
  M  win32/install.txt
  D  win32/pws-php5cgi.reg
  D  win32/pws-php5isapi.reg


Diff:
diff --git a/INSTALL b/INSTALL
index c0cbe5f..141e4f8 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1819,7 +1819,7 @@ Installation
set of HTTP headers. The headers it did return are:
10. Windows:  I've  followed  all the instructions, but still can't get
PHP and IIS to work together!
-   11. When  running  PHP as CGI with IIS, PWS, OmniHTTPD or Xitami, I get
+   11. When  running  PHP as CGI with IIS, OmniHTTPD or Xitami, I get
the  following  error:  Security  Alert! PHP CGI cannot be accessed
directly..
12. How  do I know if my php.ini is being found and read? It seems like
@@ -2007,7 +2007,7 @@ cgi error:
   And  for  IIS4  you need to tell it that PHP is a script engine.
   Also, you will want to read this faq.
 
-   When running PHP as CGI with IIS, PWS, OmniHTTPD or Xitami, I get the
+   When running PHP as CGI with IIS, OmniHTTPD or Xitami, I get the
   following error: Security Alert! PHP CGI cannot be accessed
   directly..
   You  must set the cgi.force_redirect directive to 0. It defaults
diff --git a/win32/build/mkdist.php b/win32/build/mkdist.php
index 947af9f..23d26c9 100644
--- a/win32/build/mkdist.php
+++ b/win32/build/mkdist.php
@@ -238,8 +238,6 @@ $text_files = array(
php.ini-development = php.ini-development,
php.ini-production = php.ini-production,
win32/install.txt = install.txt,
-   win32/pws-php5cgi.reg = pws-php5cgi.reg,
-   win32/pws-php5isapi.reg = pws-php5isapi.reg,
 );
 
 foreach ($text_files as $src = $dest) {
diff --git a/win32/install.txt b/win32/install.txt
index 2883dd3..b240ad2 100644
--- a/win32/install.txt
+++ b/win32/install.txt
@@ -9,7 +9,7 @@ Installing PHP
 Windows Installer
 Manual Installation Steps
 ActiveScript
-Microsoft IIS / PWS
+Microsoft IIS
 Apache 1.3.x on Microsoft Windows
 Apache 2.0.x on Microsoft Windows
 Sun, iPlanet and Netscape servers on Microsoft Windows
@@ -211,7 +211,7 @@ Windows Installer (PHP 5.1.0 and earlier)
 
The Windows PHP installer is available from the downloads page at
http://www.php.net/downloads.php. This installs the CGI version of PHP
-   and for IIS, PWS, and Xitami, it configures the web server as well. The
+   and for IIS and Xitami, it configures the web server as well. The
installer does not include any extra external PHP extensions
(php_*.dll) as you'll only find those in the Windows Zip Package and
PECL downloads.
@@ -433,7 +433,7 @@ c:\php
follow the next step. Set the doc_root to point to your web servers
document_root. For example:
 
-doc_root = c:\inetpub\wwwroot // for IIS/PWS
+doc_root = c:\inetpub\wwwroot // for IIS
 
 doc_root = c:\apache\htdocs // for Apache
 
@@ -442,11 +442,6 @@ doc_root = c:\apache\htdocs // for Apache
what is already built in. Note that on a new installation it is
advisable to first get PHP working and tested without any
extensions before enabling them in php.ini.
- * On PWS and IIS, you can set the browscap configuration setting to
-   point to: c:\windows\system\inetsrv\browscap.ini on Windows 9x/Me,
-   c:\winnt\system32\inetsrv\browscap.ini on NT/2000, and
-   c:\windows\system32\inetsrv\browscap.ini on XP. For an up-to-date
-   browscap.ini, read the following FAQ.
 
PHP is now setup on your system. The next step is to choose a web
server, and enable it to run PHP. Choose a web server from the table of
@@ -499,7 +494,7 @@ ActiveScript
  folder, if you wish to load extensions, etc.
  __
 
-Microsoft IIS / PWS
+Microsoft IIS
 
This section contains notes and hints specific to IIS (Microsoft
Internet Information Server).
@@ -511,7 +506,7 @@ Microsoft IIS / PWS
yourself from those attacks.
  __
 
-General considerations for all installations of PHP with IIS or PWS
+General considerations for all installations of PHP with IIS
 
  * First, read the Manual Installation Instructions. Do not skip this
step as it provides crucial information for installing PHP on
@@ -543,7 +538,7 @@ General considerations for all installations of PHP with 
IIS or PWS
downloaded in the Collection of PECL

Re: [PHP-CVS] com php-src: fixed #65045: mb_convert_encoding breaks well-formed character.: ext/mbstring/libmbfl/filters/mbfilter_utf8.c ext/mbstring/libmbfl/filters/mbfilter_utf8.h ext/mbstring/libmb

2013-07-15 Thread Laruence 
Hey:

   I got one test script failed now:
ext/mbstring/tests/illformed_utf_sequences.phpt

   diff is attached..

thanks

On Sun, Jun 30, 2013 at 2:30 PM, Rui Hirokawa hirok...@php.net wrote:
 Commit:c6a7549efcca62346687b0fda5b408b963f5ab2d
 Author:Rui Hirokawa hirok...@php.net Sun, 30 Jun 2013 15:30:45 
 +0900
 Parents:   4d606cf01e5b376cac1ac336f3e54ef480033028
 Branches:  master

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

 Log:
 fixed #65045: mb_convert_encoding breaks well-formed character.

 Bugs:
 https://bugs.php.net/65045

 Changed paths:
   M  ext/mbstring/libmbfl/filters/mbfilter_utf8.c
   M  ext/mbstring/libmbfl/filters/mbfilter_utf8.h
   M  ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.c


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



-- 
Laruence  Xinchen Hui
http://www.laruence.com/

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

[PHP-CVS] com php-src: Merge branch 'PHP-5.4' into PHP-5.5: main/php_ini.c

2013-07-15 Thread Anatol Belski 
Commit:e7a4cf8d7ee68ade2901c1069f2af7ff1427
Author:Anatol Belski a...@php.net Mon, 15 Jul 2013 17:35:29 +0200
Parents:   904c5d7ba89ec411a7dcde6a848640cbb56a45f9 
9561e598a0b0abfa6f41550830791a5350a1f837
Branches:  PHP-5.5 master

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

Log:
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix buffer overrun

Changed paths:
  MM  main/php_ini.c


Diff:



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

[PHP-CVS] com php-src: kick unused var: ext/session/mod_user.c

2013-07-15 Thread Anatol Belski 
Commit:904c5d7ba89ec411a7dcde6a848640cbb56a45f9
Author:Anatol Belski a...@php.net Mon, 15 Jul 2013 17:23:16 +0200
Parents:   2ec7b1c388951d7690311669f8148c94f58c636b
Branches:  PHP-5.5 master

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

Log:
kick unused var

Changed paths:
  M  ext/session/mod_user.c


Diff:
diff --git a/ext/session/mod_user.c b/ext/session/mod_user.c
index e4261df..82fd419 100644
--- a/ext/session/mod_user.c
+++ b/ext/session/mod_user.c
@@ -187,7 +187,6 @@ PS_CREATE_SID_FUNC(user)
 {
/* maintain backwards compatibility */
if (PSF(create_sid) != NULL) {
-   zval *args[1];
char *id = NULL;
STDVARS;


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

[PHP-CVS] com php-src: fix buffer overrun: main/php_ini.c

2013-07-15 Thread Anatol Belski 
Commit:9561e598a0b0abfa6f41550830791a5350a1f837
Author:Anatol Belski a...@php.net Mon, 15 Jul 2013 17:34:36 +0200
Parents:   e617679c0ba616551df62ad370a70d5cf610c270
Branches:  PHP-5.4 PHP-5.5 master

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

Log:
fix buffer overrun

Changed paths:
  M  main/php_ini.c


Diff:
diff --git a/main/php_ini.c b/main/php_ini.c
index bceb6e5..444b4ce 100644
--- a/main/php_ini.c
+++ b/main/php_ini.c
@@ -785,7 +785,12 @@ PHPAPI void php_ini_activate_per_dir_config(char *path, 
uint path_len TSRMLS_DC)
char path_bak[MAXPATHLEN];
 #endif
 
+#if PHP_WIN32
+   /* MAX_PATH is \0-terminated, path_len == MAXPATHLEN would overrun 
path_bak */
+   if (path_len = MAXPATHLEN) {
+#else
if (path_len  MAXPATHLEN) {
+#endif
return;
}


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

[PHP-CVS] com php-src: socket: fix bug #65260 (SCM_RIGHTS): ext/sockets/conversions.c ext/sockets/tests/socket_cmsg_rights.phpt

2013-07-15 Thread Gustavo André dos Santos Lopes 
Commit:e2744f1aa33da3afade2c454b008c0de65a72da9
Author:Gustavo Lopes glo...@nebm.ist.utl.pt Mon, 15 Jul 2013 
01:44:38 +0200
Parents:   e7a4cf8d7ee68ade2901c1069f2af7ff1427
Branches:  PHP-5.5 master

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

Log:
socket: fix bug #65260 (SCM_RIGHTS)

The data for messages of type SOL_SOCKET/SCM_RIGHTS was not being
passed correctly. There were actually two bugs: (1) the number of file
descriptors being passed was being read incorrectly (the length of the
cmsg array was being read instead of that of its 'data' element), as a
result it was generally being reported as always three elements
('level', 'type' and 'data') and (2) the allocated block for writing
the file descriptors was being acessed incorrectly because a 1-based
counter was being used as if it was 0-based.

Any of these two bugs would probably be enough to cause heap
corruption.

Bugs:
https://bugs.php.net/65260

Changed paths:
  M  ext/sockets/conversions.c
  M  ext/sockets/tests/socket_cmsg_rights.phpt


Diff:
diff --git a/ext/sockets/conversions.c b/ext/sockets/conversions.c
index ea1c952..3b58b39 100644
--- a/ext/sockets/conversions.c
+++ b/ext/sockets/conversions.c
@@ -223,6 +223,7 @@ static unsigned from_array_iterate(const zval *arr,
charbuf[sizeof(element #4294967295)];
char*bufp = buf;
 
+   /* Note i starts at 1, not 0! */
 for (zend_hash_internal_pointer_reset_ex(Z_ARRVAL_P(arr), pos), i = 1;
!ctx-err.has_error
 zend_hash_get_current_data_ex(Z_ARRVAL_P(arr), (void 
**)elem, pos) == SUCCESS;
@@ -869,7 +870,14 @@ static void from_zval_write_control(const zval 
*arr,
}
 
if (entry-calc_space) {
-   data_len = entry-calc_space(arr, ctx);
+   zval **data_elem;
+   /* arr must be an array at this point */
+   if (zend_hash_find(Z_ARRVAL_P(arr), data, sizeof(data),
+   (void**)data_elem) == FAILURE) {
+   do_from_zval_err(ctx, cmsghdr should have a 'data' 
element here);
+   return;
+   }
+   data_len = entry-calc_space(*data_elem, ctx);
if (ctx-err.has_error) {
return;
}
@@ -1370,7 +1378,7 @@ static void from_zval_write_fd_array_aux(zval **elem, 
unsigned i, void **args, s
return;
}
 
-   if (php_stream_cast(stream, PHP_STREAM_AS_FD, (void **)iarr[i],
+   if (php_stream_cast(stream, PHP_STREAM_AS_FD, (void **)iarr[i 
- 1],
REPORT_ERRORS) == FAILURE) {
do_from_zval_err(ctx, cast stream to file descriptor 
failed);
return;
diff --git a/ext/sockets/tests/socket_cmsg_rights.phpt 
b/ext/sockets/tests/socket_cmsg_rights.phpt
index 8290f03..8c1734a 100644
--- a/ext/sockets/tests/socket_cmsg_rights.phpt
+++ b/ext/sockets/tests/socket_cmsg_rights.phpt
@@ -84,6 +84,7 @@ Array
 [0] = Resource id #%d
 [1] = Resource id #%d
 [2] = Resource id #%d
+[3] = Resource id #%d
 )
 
 )


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

[PHP-CVS] com php-src: NEWS for 710150c and e2744f1: NEWS

2013-07-15 Thread Gustavo André dos Santos Lopes 
Commit:ceecfaff5ac793d50426ae051fd4bec932d23bb1
Author:Gustavo Lopes glo...@nebm.ist.utl.pt Tue, 16 Jul 2013 
00:02:43 +0200
Parents:   710150ccb7d62c87eb198e5cbb13d0f1867c176f
Branches:  PHP-5.5 master

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

Log:
NEWS for 710150c and e2744f1

Changed paths:
  M  NEWS


Diff:
diff --git a/NEWS b/NEWS
index 5422b0b..f524acb 100644
--- a/NEWS
+++ b/NEWS
@@ -40,7 +40,7 @@ PHP   
 NEWS
 - Intl:
   . Add IntlCalendar::setMinimalDaysInFirstWeek()/
 intlcal_set_minimal_days_in_first_week().
-  . Fixed trailing space in the name of constant 
IntlCalendar::FIELD_FIELD_COUNT.
+  . Fixed trailing space in name of constant IntlCalendar::FIELD_FIELD_COUNT.
   . Fixed bug #62759 (Buggy grapheme_substr() on edge case). (Stas)
   . Fixed bug #61860 (Offsets may be wrong for grapheme_stri* functions).
 (Stas)
@@ -65,6 +65,10 @@ PHP  
  NEWS
 - Sockets:
   . Implemented FR #63472 (Setting SO_BINDTODEVICE with socket_set_option).
 (Damjan Cvetko)
+  . Allowed specifying paths in the abstract namespace for the functions
+socket_bind(), socket_connect() and socket_sendmsg(). (Gustavo)
+  . Fixed bug #65260 (sendmsg() ancillary data construction for SCM_RIGHTS is
+faulty). (Gustavo)
 
 - SPL:
   . Fixed bug #65136 (RecursiveDirectoryIterator segfault). (Laruence)


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

[PHP-CVS] com php-src: socket: support unix paths in the abstract namespace: ext/sockets/conversions.c ext/sockets/sockets.c ext/sockets/tests/socket_abstract_path.phpt ext/sockets/tests/socket_abstra

2013-07-15 Thread Gustavo André dos Santos Lopes 
Commit:710150ccb7d62c87eb198e5cbb13d0f1867c176f
Author:Gustavo Lopes glo...@nebm.ist.utl.pt Mon, 15 Jul 2013 
01:51:15 +0200
Parents:   e2744f1aa33da3afade2c454b008c0de65a72da9
Branches:  PHP-5.5 master

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

Log:
socket: support unix paths in the abstract namespace

Those starting with '\0'.

Changed paths:
  M  ext/sockets/conversions.c
  M  ext/sockets/sockets.c
  A  ext/sockets/tests/socket_abstract_path.phpt
  A  ext/sockets/tests/socket_abstract_path_sendmsg.phpt


Diff:
diff --git a/ext/sockets/conversions.c b/ext/sockets/conversions.c
index 3b58b39..ed55ed5 100644
--- a/ext/sockets/conversions.c
+++ b/ext/sockets/conversions.c
@@ -98,8 +98,8 @@ typedef struct {
 } field_descriptor;
 
 #define KEY_FILL_SOCKADDR fill_sockaddr
-#define KEY_RECVMSG_RET recvmsg_ret
-#define KEY_CMSG_LEN   cmsg_len
+#define KEY_RECVMSG_RET   recvmsg_ret
+#define KEY_CMSG_LEN cmsg_len
 
 const struct key_value empty_key_value_list[] = {{0}};
 
@@ -667,6 +667,13 @@ static void from_zval_write_sun_path(const zval *path, 
char *sockaddr_un_c, ser_
path = lzval;
}
 
+   /* code in this file relies on the path being nul terminated, even 
though
+* this is not required, at least on linux for abstract paths. It also
+* assumes that the path is not empty */
+   if (Z_STRLEN_P(path) == 0) {
+   do_from_zval_err(ctx, %s, the path is cannot be empty);
+   return;
+   }
if (Z_STRLEN_P(path) = sizeof(saddr-sun_path)) {
do_from_zval_err(ctx, the path is too long, the maximum 
permitted 
length is %ld, sizeof(saddr-sun_path) - 1);
@@ -768,10 +775,22 @@ static void from_zval_write_sockaddr_aux(const zval 
*container,
return;
}
*sockaddr_ptr = accounted_ecalloc(1, sizeof(struct 
sockaddr_un), ctx);
-   *sockaddr_len = sizeof(struct sockaddr_un);
if (fill_sockaddr) {
+   struct sockaddr_un *sock_un = (struct 
sockaddr_un*)*sockaddr_ptr;
+
from_zval_write_sockaddr_un(container, 
(char*)*sockaddr_ptr, ctx);
(*sockaddr_ptr)-sa_family = AF_UNIX;
+
+   /* calculating length is more complicated here. Giving 
the size of
+* struct sockaddr_un here and relying on the nul 
termination of
+* sun_path does not work for paths in the abstract 
namespace. Note
+* that we always assume the path is not empty and nul 
terminated */
+   *sockaddr_len = offsetof(struct sockaddr_un, sun_path) +
+   (sock_un-sun_path[0] == '\0'
+   ? (1 + strlen(sock_un-sun_path[1]))
+   : strlen(sock_un-sun_path));
+   } else {
+   *sockaddr_len = sizeof(struct sockaddr_un);
}
break;
 
diff --git a/ext/sockets/sockets.c b/ext/sockets/sockets.c
index 801af0a..b226d94 100644
--- a/ext/sockets/sockets.c
+++ b/ext/sockets/sockets.c
@@ -1479,7 +1479,7 @@ PHP_FUNCTION(socket_strerror)
 PHP_FUNCTION(socket_bind)
 {
zval*arg1;
-   php_sockaddr_storagesa_storage;
+   php_sockaddr_storagesa_storage = {0};
struct sockaddr *sock_type = (struct sockaddr*) 
sa_storage;
php_socket  *php_sock;
char*addr;
@@ -1497,10 +1497,19 @@ PHP_FUNCTION(socket_bind)
case AF_UNIX:
{
struct sockaddr_un *sa = (struct sockaddr_un *) 
sock_type;
-   memset(sa, 0, sizeof(sa_storage));
+
sa-sun_family = AF_UNIX;
-   snprintf(sa-sun_path, 108, %s, addr);
-   retval = bind(php_sock-bsd_socket, (struct 
sockaddr *) sa, SUN_LEN(sa));
+
+   if (addr_len = sizeof(sa-sun_path)) {
+   php_error_docref(NULL TSRMLS_CC, 
E_WARNING,
+   Invalid path: too long 
(maximum size is %d),
+   
(int)sizeof(sa-sun_path) - 1);
+   RETURN_FALSE;
+   }
+   memcpy(sa-sun_path, addr, addr_len);
+
+   retval = bind(php_sock-bsd_socket, (struct 
sockaddr *) sa,
+   offsetof(struct sockaddr_un, 
sun_path) + addr_len);
break;
}
 
@@ -1508,8

[PHP-CVS] com php-src: Fixed typo ensuring header str is \0 terminated: ext/session/session.c

2013-07-15 Thread Anatol Belski 
Commit:bcb39d9c6a0b0a16c9bda5a661a0897e96de09a5
Author:Anatol Belski a...@php.net Tue, 16 Jul 2013 00:14:05 +0200
Parents:   9561e598a0b0abfa6f41550830791a5350a1f837
Branches:  PHP-5.4 PHP-5.5 master

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

Log:
Fixed typo ensuring header str is \0 terminated

This was obviously intended to send an empty header if
php_gmtime_r() fails. Currently it could send garbage.

Changed paths:
  M  ext/session/session.c


Diff:
diff --git a/ext/session/session.c b/ext/session/session.c
index 3879edc..5af3ef2 100644
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -1052,7 +1052,7 @@ static inline void strcpy_gmt(char *ubuf, time_t *when) 
/* {{{ */
res = php_gmtime_r(when, tm);
 
if (!res) {
-   buf[0] = '\0';
+   ubuf[0] = '\0';
return;
}


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

[PHP-CVS] com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/session/session.c

2013-07-15 Thread Anatol Belski 
Commit:54b740a7e1ceea80690d47833a3fe667ce839522
Author:Anatol Belski a...@php.net Tue, 16 Jul 2013 00:15:29 +0200
Parents:   ceecfaff5ac793d50426ae051fd4bec932d23bb1 
bcb39d9c6a0b0a16c9bda5a661a0897e96de09a5
Branches:  PHP-5.5 master

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

Log:
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed typo ensuring header str is \0 terminated

Changed paths:
  MM  ext/session/session.c


Diff:



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

Re: [PHP-CVS] com php-src: fixed #65045: mb_convert_encoding breaks well-formed character.: ext/mbstring/libmbfl/filters/mbfilter_utf8.c ext/mbstring/libmbfl/filters/mbfilter_utf8.h ext/mbstring/libmb

2013-07-15 Thread Yasuo Ohgaki 
Hi Laruence,

I guess we cannot attach diff.
I'll check test to see what is going on.

BTW, when everything is sorted out, I would like to see this patch back
ported to 5.5 and 5.4.

Regards,


--
Yasuo Ohgaki
yohg...@ohgaki.net


2013/7/15 Laruence larue...@php.net

 Hey:

I got one test script failed now:
 ext/mbstring/tests/illformed_utf_sequences.phpt

diff is attached..

 thanks

 On Sun, Jun 30, 2013 at 2:30 PM, Rui Hirokawa hirok...@php.net wrote:
  Commit:c6a7549efcca62346687b0fda5b408b963f5ab2d
  Author:Rui Hirokawa hirok...@php.net Sun, 30 Jun 2013
 15:30:45 +0900
  Parents:   4d606cf01e5b376cac1ac336f3e54ef480033028
  Branches:  master
 
  Link:
 http://git.php.net/?p=php-src.git;a=commitdiff;h=c6a7549efcca62346687b0fda5b408b963f5ab2d
 
  Log:
  fixed #65045: mb_convert_encoding breaks well-formed character.
 
  Bugs:
  https://bugs.php.net/65045
 
  Changed paths:
M  ext/mbstring/libmbfl/filters/mbfilter_utf8.c
M  ext/mbstring/libmbfl/filters/mbfilter_utf8.h
M  ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.c
 
 
  --
  PHP CVS Mailing List (http://www.php.net/)
  To unsubscribe, visit: http://www.php.net/unsub.php



 --
 Laruence  Xinchen Hui
 http://www.laruence.com/


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