Re: [PHP-CVS] svn: /php/php-src/trunk/main/streams/ php_stream_context.h streams.c
On 02/21/2012 01:55 PM, Gustavo André dos Santos Lopes wrote: cataphract Tue, 21 Feb 2012 21:55:00 + Revision: http://svn.php.net/viewvc?view=revision&revision=323416 Log: - Revert r134029. The streams pooling API was never used in more than 8 years and therefore unnecessarily adds complexity. Perhaps someone's private code used it? In any case, since this is a breakage, it should be in UPGRADING and NEWS. Chris -- Email: christopher.jo...@oracle.com Tel: +1 650 506 8630 Blog: http://blogs.oracle.com/opal/ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ NEWS
sixd Thu, 23 Feb 2012 19:43:38 + Revision: http://svn.php.net/viewvc?view=revision&revision=323453 Log: Relocate orphan line Changed paths: U php/php-src/branches/PHP_5_3/NEWS Modified: php/php-src/branches/PHP_5_3/NEWS === --- php/php-src/branches/PHP_5_3/NEWS 2012-02-23 18:43:05 UTC (rev 323452) +++ php/php-src/branches/PHP_5_3/NEWS 2012-02-23 19:43:38 UTC (rev 323453) @@ -242,9 +242,9 @@ - Phar: . Fixed bug #60261 (NULL pointer dereference in phar). (Felipe) . Fixed bug #60164 (Stubs of a specific length break phar_open_from_fp +scanning for __HALT_COMPILER). (Ralph Schindler) . Fixed bug #53872 (internal corruption of phar). (Hannes) . Fixed bug #52013 (Unable to decompress files in a compressed phar). (Hannes) -scanning for __HALT_COMPILER). (Ralph Schindler) - PHP-FPM SAPI: . Fixed bug #60659 (FPM does not clear auth_user on request accept). -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/phar/phar_object.c trunk/ext/phar/phar_object.c
On 02/18/2012 05:39 AM, Nikita Popov wrote: nikicSat, 18 Feb 2012 13:39:13 + Revision: http://svn.php.net/viewvc?view=revision&revision=323330 Log: Fix headers generated by phar sapi_header_line.line_len is the length without null terminator, so one has to take sizeof - 1. This fixes some test failures as the NUL bytes were causing warnings. Needs to be merged to 5.4. Hi Nikita, This fix deserves a bug report - which will also help as a reminder for the 5.4 merge. And it will also add value to NEWS, since people will be able to find more information (via the bug report) than you could put in a one line NEWS entry. Chris -- Email: christopher.jo...@oracle.com Tel: +1 650 506 8630 Blog: http://blogs.oracle.com/opal/ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ NEWS
Stas, Some of those bug fixes listed under 5.4.0 are already fixed in 5.3.10. Random examples include the OCI8 fixes, OpenSSL fix 60279, Tidy fix 54682, and CURL fix 60439. Do you need a hand sorting out the dups? Chris On 02/28/2012 04:50 PM, Stanislav Malyshev wrote: stas Wed, 29 Feb 2012 00:50:00 + Revision: http://svn.php.net/viewvc?view=revision&revision=323645 Log: prepare NEWS for 5.4.0 Changed paths: U php/php-src/branches/PHP_5_4/NEWS -- Email: christopher.jo...@oracle.com Tel: +1 650 506 8630 Blog: http://blogs.oracle.com/opal/ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ NEWS
sixd Wed, 29 Feb 2012 18:46:17 + Revision: http://svn.php.net/viewvc?view=revision&revision=323676 Log: Remove "backported" from 5.4 comments since 5.3 is the base version these bugs are fixed. Reorder. Changed paths: U php/php-src/branches/PHP_5_3/NEWS Modified: php/php-src/branches/PHP_5_3/NEWS === --- php/php-src/branches/PHP_5_3/NEWS 2012-02-29 18:26:17 UTC (rev 323675) +++ php/php-src/branches/PHP_5_3/NEWS 2012-02-29 18:46:17 UTC (rev 323676) @@ -253,32 +253,30 @@ . Fixed bug #52013 (Unable to decompress files in a compressed phar). (Hannes) - PHP-FPM SAPI: + . Dropped restriction of not setting the same value multiple times, the last +one holds. (giovanni at giacobbi dot net, fat) + . Added .phar to default authorized extensions. (fat) . Fixed bug #60659 (FPM does not clear auth_user on request accept). (bonbons at linux-vserver dot org) . Fixed bug #60629 (memory corruption when web server closed the fcgi fd). (fat) + . Enhance error log when the primary script can't be open. FR #60199. (fat) . Fixed bug #60179 (php_flag and php_value does not work properly). (fat) - . Fixed bug #55526 (Heartbeat causes a lot of unnecessary events). (fat) + . Fixed bug #55577 (status.html does not install). (fat) . Fixed bug #55533 (The -d parameter doesn't work). (fat) - . Implemented FR #52569 (Add the "ondemand" process-manager -to allow zero children). (fat) + . Fixed bug #55526 (Heartbeat causes a lot of unnecessary events). (fat) . Fixed bug #55486 (status show BIG processes number). (fat) - . Fixed bug #55577 (status.html does not install). (fat) - . Backported from 5.4 branch (Dropped restriction of not setting the same -value multiple times, the last one holds). -(giovanni at giacobbi dot net, fat) - . Backported FR #55166 from 5.4 branch (Added process.max to control -the number of process FPM can fork). (fat) - . Backported FR #55181 from 5.4 branch (Enhance security by limiting access -to user defined extensions). (fat) - . Backported FR #54098 from 5.4 branch (Lowered process manager -default value). (fat) - . Backported FR #52052 from 5.4 branch (Added partial syslog support). (fat) + . Enhanced security by limiting access to user defined extensions. +FR #55181. (fat) + . Added process.max to control the number of process FPM can fork. FR #55166. +(fat) . Implemented FR #54577 (Enhanced status page with full status and details about each processes. Also provide a web page (status.html) for real-time FPM status. (fat) - . Enhance error log when the primary script can't be open. FR #60199. (fat) - . Added .phar to default authorized extensions. (fat) + . Lowered default value for Process Manager. FR #54098. (fat) + . Implemented FR #52569 (Add the "ondemand" process-manager +to allow zero children). (fat) + . Added partial syslog support (on error_log only). FR #52052. (fat) - Postgres: . Fixed bug #60244 (pg_fetch_* functions do not validate that row param @@ -820,7 +818,7 @@ - Tokenizer Extension . Fixed bug #54089 (token_get_all() does not stop after __halt_compiler). -(Ilia) +(Nikita Popov, Ilia) - XSL extension: . Fixed memory leaked introduced by the NULL poisoning patch. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ NEWS
sixd Wed, 29 Feb 2012 20:48:17 + Revision: http://svn.php.net/viewvc?view=revision&revision=323677 Log: Add the CVE numbers that were mentioned in the related php.net announcements Changed paths: U php/php-src/branches/PHP_5_3/NEWS Modified: php/php-src/branches/PHP_5_3/NEWS === --- php/php-src/branches/PHP_5_3/NEWS 2012-02-29 18:46:17 UTC (rev 323676) +++ php/php-src/branches/PHP_5_3/NEWS 2012-02-29 20:48:17 UTC (rev 323677) @@ -79,7 +79,7 @@ - Core: . Added max_input_vars directive to prevent attacks based on hash collisions -(Dmitry). +(CVE-2011-4885) (Dmitry). . Fixed bug #60205 (possible integer overflow in content_length). (Laruence) . Fixed bug #60139 (Anonymous functions create cycles not detected by the GC). (Dmitry) @@ -158,7 +158,7 @@ - EXIF: . Fixed bug #60150 (Integer overflow during the parsing of invalid exif -header). (Stas, flolechaud at gmail dot com) +header). (CVE-2011-4566) (Stas, flolechaud at gmail dot com) - Fileinfo: . Fixed bug #60094 (C++ comment fails in c89). (Laruence) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ NEWS
sixd Thu, 01 Mar 2012 17:59:59 +
Revision: http://svn.php.net/viewvc?view=revision&revision=323721
Log:
Tidy up PHP 5.4.0 section, incuding removing most (?) bugs in new
features found/fixed during RC phase, and removing 5.4 section entries
for bugs already publicly released in PHP <= 5.3.10.
There are still many things in UPGRADING not mentioned here.
Changed paths:
U php/php-src/branches/PHP_5_4/NEWS
Modified: php/php-src/branches/PHP_5_4/NEWS
===
--- php/php-src/branches/PHP_5_4/NEWS 2012-03-01 17:51:54 UTC (rev 323720)
+++ php/php-src/branches/PHP_5_4/NEWS 2012-03-01 17:59:59 UTC (rev 323721)
@@ -7,25 +7,30 @@
01 Mar 2012, PHP 5.4.0
-- autoconf 2.59+ is now supported (and required) for generating the
- configure script with ./buildconf. Autoconf 2.60+ is desirable
- otherwise the configure help order may be incorrect. (Rasmus, Chris Jones)
+- Installation:
+ . autoconf 2.59+ is now supported (and required) for generating the
+configure script with ./buildconf. Autoconf 2.60+ is desirable
+otherwise the configure help order may be incorrect. (Rasmus, Chris Jones)
- Removed legacy features:
. break/continue $var syntax. (Dmitry)
- . Safe mode and all related ini options. (Kalle)
- . register_globals and register_long_arrays ini options. (Kalle)
+ . Safe mode and all related php.ini options. (Kalle)
+ . register_globals and register_long_arrays php.ini options. (Kalle)
. import_request_variables(). (Kalle)
. allow_call_time_pass_reference. (Pierrick)
- . define_syslog_variables ini option and its associated function. (Kalle)
- . highlight.bg ini option. (Kalle)
+ . define_syslog_variables php.ini option and its associated function. (Kalle)
+ . highlight.bg php.ini option. (Kalle)
+ . safe_mode, safe_mode_gid, safe_mode_include_dir,
+safe_mode_exec_dir, safe_mode_allowed_env_vars and
+safe_mode_protected_env_vars php.ini options.
+ . zend.ze1_compatibility_mode php.ini option.
. Session bug compatibility mode (session.bug_compat_42 and
-session.bug_compat_warn ini options). (Kalle)
+session.bug_compat_warn php.ini options). (Kalle)
. session_is_registered(), session_register() and session_unregister()
functions. (Kalle)
- . y2k_compliance ini option. (Kalle)
+ . y2k_compliance php.ini option. (Kalle)
. magic_quotes_gpc, magic_quotes_runtime and magic_quotes_sybase
-ini options. get_magic_quotes_gpc, get_magic_quotes_runtime are kept
+php.ini options. get_magic_quotes_gpc, get_magic_quotes_runtime are kept
but always return false, set_magic_quotes_runtime raises an
E_CORE_ERROR. (Pierrick, Pierre)
. Removed support for putenv("TZ=..") for setting the timezone. (Derick)
@@ -33,21 +38,21 @@
date.timezone or date_default_timezone_set(). Instead of a guessed
timezone, "UTC" is now used instead. (Derick)
-- Moved extensions to PECL: (Johannes)
+- Moved extensions to PECL:
. ext/sqlite. (Note: the ext/sqlite3 and ext/pdo_sqlite extensions are
-not affected)
+not affected) (Johannes)
- General improvements:
. Added short array syntax support ([1,2,3]), see UPGRADING guide for full
details. (rsky0711 at gmail . com, sebastian.deutsch at 9elements . com,
Pierre)
- . Added binary numbers format (0b001010). (Jonah dot Harris at gmail dot com)
+ . Added binary number format (0b001010). (Jonah dot Harris at gmail dot com)
. Added support for Class::{expr}() syntax (Pierrick)
- . Added multibyte support by default. Previously php had to be compiled
-with --enable-zend-multibyte. Now it can be enabled or disabled through
-zend.multibyte directive in php.ini. (Dmitry)
+ . Added multibyte support by default. Previously PHP had to be compiled
+with --enable-zend-multibyte. Now it can be enabled or disabled through
+the zend.multibyte directive in php.ini. (Dmitry)
. Removed compile time dependency from ext/mbstring (Dmitry)
- . Added support for Traits. (Stefan)
+ . Added support for Traits. (Stefan, with fixes by Dmitry and Laruence)
. Added closure $this support back. (Stas)
. Added array dereferencing support. (Felipe)
. Added callable typehint. (Hannes)
@@ -59,21 +64,21 @@
. Implemented Zend Signal Handling (configurable option --enable-zend-signals,
off by default). (Lucas Nealan, Arnaud Le Blanc, Brian Shire, Ilia)
. Improved output layer, see README.NEW-OUTPUT-API for internals. (Mike)
- . Improved unix build system to allow building multiple PHP binary SAPIs and
+ . Improved UNIX build system to allow building multiple PHP binary SAPIs and
one SAPI module the same time. FR #53271, FR #52419. (Jani)
. Implemented closure rebinding as parameter to bindTo. (Gustavo Lopes)
. Improved the warning message of incompatible arguments. (Laruence)
. Improved ternary operator performance when returning arrays. (Arnaud, Dmitry)
[PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ UPGRADING
sixd Thu, 01 Mar 2012 18:27:47 +
Revision: http://svn.php.net/viewvc?view=revision&revision=323723
Log:
Some basic tidy up and whitespace fixes.
The file still needs section disambiguation to remove duplicate
entries.
Changed paths:
U php/php-src/branches/PHP_5_4/UPGRADING
Modified: php/php-src/branches/PHP_5_4/UPGRADING
===
--- php/php-src/branches/PHP_5_4/UPGRADING 2012-03-01 18:24:52 UTC (rev 323722)
+++ php/php-src/branches/PHP_5_4/UPGRADING 2012-03-01 18:27:47 UTC (rev 323723)
@@ -29,39 +29,35 @@
1. Changes made to default configuration
-- The default_charset setting now defaults to UTF-8.
- It was ISO-88590-1 before, so if you were relying
- on the default, you will need to add:
+- The php.ini default_charset directive now defaults to UTF-8. If you
+ were relying on the previous default of ISO-88590-1, you will need
+ to add:
default_charset = iso-8859-1
to your php.ini to preserve pre-5.4 behavior.
-- We now check at compile time if /dev/urandom or /dev/arandom
- are present to provide non-blocking entropy to session id
- generation. If either is present, session.entropy_file
- now defaults to that file and session.entropy_length defaults
- to 32. If you do not want extra entropy for your session ids
- for some reason, add:
+- PHP 5.4 now checks at compile time if /dev/urandom or /dev/arandom
+ are present. If either is available, session.entropy_file now
+ defaults to that file and session.entropy_length defaults to 32.
+ This provides non-blocking entropy to session id generation. If you
+ do not want extra entropy for your session ids, add:
session.entropy_file=
session.entropy_length=0
to your php.ini to preserve pre-PHP5.4 behavior.
-- Deprecated ini directives will now throw an E_CORE_WARNING's
+- Deprecated php.ini directives will now throw an E_CORE_WARNING's
instead of the previous E_WARNING's.
- The following directives are marked as deprecated:
+- The following php.ini directives are marked as deprecated:
- magic_quotes_gpc
- magic_quotes_runtime
- magic_quotes_sybase
-- The following directives, which indicates a removed feature
- in PHP will now throw an E_CORE_ERROR upon startup like the
- deprecation warnings.
-
- The following directives are no longer available:
+- The following php.ini directives are no longer available in PHP 5.4
+ and will now throw an E_CORE_ERROR upon startup:
- allow_call_time_pass_reference
- define_syslog_variables
- highlight.bg
@@ -75,23 +71,22 @@
- safe_mode_protected_env_vars
- zend.ze1_compatibility_mode
-- the following new directives were added
+- the following new php.ini directives were added:
+ - max_input_vars - specifies how many GET/POST/COOKIE input
+variables may be accepted. The default value is 1000.
- - max_input_vars - specifies how many GET/POST/COOKIE input variables may be
-accepted. default value 1000.
-
=
2. Reserved words and classes
=
-- "callable", "insteadof" and "trait" are reserved words now.
+- "callable", "insteadof" and "trait" are now reserved words.
===
3. Changes made to engine behaviour
===
-- It's now possible to enforce the class' __construct arguments in an abstract
- constructor in the base class.
+- The __construct arguments of an extended abstract constructor must
+ now match:
abstract class Base
{
@@ -102,44 +97,53 @@
public function __construct($bar) {}
}
- Now emits a Fatal error due the incompatible declaration.
+ This now emits a Fatal error due the incompatible declaration.
-- In previous versions, names of superglobals could be used for parameter
- names, thereby shadowing the corresponding superglobal. This now causes a
- fatal error such as "Cannot re-assign auto-global variable GLOBALS".
+- In previous versions, superglobal names could be used for parameter
+ names, thereby shadowing the corresponding superglobal. In PHP 5.4
+ this now causes a fatal error such as "Cannot re-assign auto-global
+ variable GLOBALS".
-- Turning null, false or empty string into an object by adding a property
- will now emit a warning instead of an E_STRICT error.
+- Turning null, false or an empty string into an object by adding a
+ property will now emit a warning instead of an E_STRICT error.
$test = null;
$test->baz = 1;
To create a generic object you can use StdClass:
+
$test = new StdClass;
$test->baz = 1;
-- Converting array to string now will cause E_NOTICE warning.
+- Converting an array to a string now will cause an E_NOTICE warning.
-- Chained string offsets - e.g. $a[0][0] where $a is a string - now work.
+- Chained string array offsets now work.
-- Non-numeric string offsets - e.g. $a['foo'] wher
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ php.ini-development php.ini-production
sixd Thu, 01 Mar 2012 20:05:18 + Revision: http://svn.php.net/viewvc?view=revision&revision=323729 Log: Change PHP 6 refs to PHP 5.4 and sync some spelling with PHP_5_4 branch files Changed paths: U php/php-src/branches/PHP_5_3/php.ini-development U php/php-src/branches/PHP_5_3/php.ini-production Modified: php/php-src/branches/PHP_5_3/php.ini-development === --- php/php-src/branches/PHP_5_3/php.ini-development2012-03-01 20:02:57 UTC (rev 323728) +++ php/php-src/branches/PHP_5_3/php.ini-development2012-03-01 20:05:18 UTC (rev 323729) @@ -484,7 +484,7 @@ ; development and early testing. ; ; Error Level Constants: -; E_ALL - All errors and warnings (includes E_STRICT as of PHP 6.0.0) +; E_ALL - All errors and warnings (includes E_STRICT as of PHP 5.4.0) ; E_ERROR - fatal run-time errors ; E_RECOVERABLE_ERROR - almost fatal run-time errors ; E_WARNING - run-time warnings (non-fatal errors) @@ -748,7 +748,7 @@ ; enable the feature. We strongly recommend you use the escaping mechanisms ; designed specifically for the database your using instead of relying on this ; feature. Also note, this feature has been deprecated as of PHP 5.3.0 and is -; scheduled for removal in PHP 6. +; removed in PHP 5.4. ; Default Value: On ; Development Value: Off ; Production Value: Off @@ -1497,7 +1497,7 @@ ;session.cookie_secure = ; This option forces PHP to fetch and use a cookie for storing and maintaining -; the session id. We encourage this operation as it's very helpful in combatting +; the session id. We encourage this operation as it's very helpful in combating ; session hijacking when not specifying and managing your own session id. It is ; not the end all be all of session hijacking defense, but it's a good start. ; http://php.net/session.use-only-cookies @@ -1627,7 +1627,7 @@ ; - User may send URL contains active session ID ; to other person via. email/irc/etc. ; - URL that contains active session ID may be stored -; in publically accessible computer. +; in publicly accessible computer. ; - User may access your site with the same session ID ; always using URL stored in browser's history or bookmarks. ; http://php.net/session.use-trans-sid Modified: php/php-src/branches/PHP_5_3/php.ini-production === --- php/php-src/branches/PHP_5_3/php.ini-production 2012-03-01 20:02:57 UTC (rev 323728) +++ php/php-src/branches/PHP_5_3/php.ini-production 2012-03-01 20:05:18 UTC (rev 323729) @@ -484,7 +484,7 @@ ; development and early testing. ; ; Error Level Constants: -; E_ALL - All errors and warnings (includes E_STRICT as of PHP 6.0.0) +; E_ALL - All errors and warnings (includes E_STRICT as of PHP 5.4.0) ; E_ERROR - fatal run-time errors ; E_RECOVERABLE_ERROR - almost fatal run-time errors ; E_WARNING - run-time warnings (non-fatal errors) @@ -748,7 +748,7 @@ ; enable the feature. We strongly recommend you use the escaping mechanisms ; designed specifically for the database your using instead of relying on this ; feature. Also note, this feature has been deprecated as of PHP 5.3.0 and is -; scheduled for removal in PHP 6. +; scheduled removed in PHP 5.4. ; Default Value: On ; Development Value: Off ; Production Value: Off @@ -1497,7 +1497,7 @@ ;session.cookie_secure = ; This option forces PHP to fetch and use a cookie for storing and maintaining -; the session id. We encourage this operation as it's very helpful in combatting +; the session id. We encourage this operation as it's very helpful in combating ; session hijacking when not specifying and managing your own session id. It is ; not the end all be all of session hijacking defense, but it's a good start. ; http://php.net/session.use-only-cookies @@ -1627,7 +1627,7 @@ ; - User may send URL contains active session ID ; to other person via. email/irc/etc. ; - URL that contains active session ID may be stored -; in publically accessible computer. +; in publicly accessible computer. ; - User may access your site with the same session ID ; always using URL stored in browser's history or bookmarks. ; http://php.net/session.use-trans-sid -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ UPGRADING
sixd Thu, 01 Mar 2012 21:08:56 + Revision: http://svn.php.net/viewvc?view=revision&revision=323732 Log: Sync sqlite -> PECL terminology with release announcement's Changed paths: U php/php-src/branches/PHP_5_4/UPGRADING Modified: php/php-src/branches/PHP_5_4/UPGRADING === --- php/php-src/branches/PHP_5_4/UPGRADING 2012-03-01 21:06:20 UTC (rev 323731) +++ php/php-src/branches/PHP_5_4/UPGRADING 2012-03-01 21:08:56 UTC (rev 323732) @@ -425,8 +425,8 @@ a. Extensions no longer maintained - - ext/sqlite is no longer part of the base distribution. - Use sqlite3 or PDO_SQLITE instead. + - ext/sqlite is no longer part of the base distribution and has been moved + to PECL. Use sqlite3 or PDO_SQLITE instead. b. Extensions with changed behavior -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/configure.in branches/PHP_5_3/sapi/apache2filter/config.m4 branches/PHP_5_3/sapi/apache2handler/config.m4 branches/PHP_5_4/NEWS bran
sixd Fri, 02 Mar 2012 00:07:41 + Revision: http://svn.php.net/viewvc?view=revision&revision=323750 Log: Fixed bug #61172 (Add Apache 2.4 support) Bug: https://bugs.php.net/61172 (Open) With Apache 2.4.1, ./configure fails on APXS but stops only on the MySQL check. Changed paths: U php/php-src/branches/PHP_5_3/NEWS U php/php-src/branches/PHP_5_3/configure.in U php/php-src/branches/PHP_5_3/sapi/apache2filter/config.m4 U php/php-src/branches/PHP_5_3/sapi/apache2handler/config.m4 U php/php-src/branches/PHP_5_4/NEWS U php/php-src/branches/PHP_5_4/configure.in U php/php-src/branches/PHP_5_4/sapi/apache2filter/config.m4 U php/php-src/branches/PHP_5_4/sapi/apache2handler/config.m4 U php/php-src/trunk/configure.in U php/php-src/trunk/sapi/apache2filter/config.m4 U php/php-src/trunk/sapi/apache2handler/config.m4 Modified: php/php-src/branches/PHP_5_3/NEWS === --- php/php-src/branches/PHP_5_3/NEWS 2012-03-01 23:58:16 UTC (rev 323749) +++ php/php-src/branches/PHP_5_3/NEWS 2012-03-02 00:07:41 UTC (rev 323750) @@ -22,6 +22,9 @@ (rui, Gustavo) . Fixed bug #51860 (Include fails with toplevel symlink to /). (Dmitry) +- Installation + . Fixed bug #61172 (Add Apache 2.4 support). (Chris Jones) + - Fileinfo . Fixed bug #61173 (Unable to detect error from finfo constructor). (Gustavo) Modified: php/php-src/branches/PHP_5_3/configure.in === --- php/php-src/branches/PHP_5_3/configure.in 2012-03-01 23:58:16 UTC (rev 323749) +++ php/php-src/branches/PHP_5_3/configure.in 2012-03-02 00:07:41 UTC (rev 323750) @@ -1550,6 +1550,21 @@ X fi + if test "$PHP_SAPI" = "apache2handler" || test "$PHP_SAPI" = "apache2filter"; then +if test "$APACHE_VERSION" -ge 2004001; then + if test -z "$APACHE_THREADED_MPM"; then +cat <-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ UPGRADING
sixd Fri, 02 Mar 2012 01:41:05 + Revision: http://svn.php.net/viewvc?view=revision&revision=323760 Log: Mention file upload progress support: http://php.net/manual/en/session.upload-progress.php Changed paths: U php/php-src/branches/PHP_5_4/UPGRADING Modified: php/php-src/branches/PHP_5_4/UPGRADING === --- php/php-src/branches/PHP_5_4/UPGRADING 2012-03-02 01:40:18 UTC (rev 323759) +++ php/php-src/branches/PHP_5_4/UPGRADING 2012-03-02 01:41:05 UTC (rev 323760) @@ -507,6 +507,8 @@ - A built-in CLI web server for testing purposes is now available: $ php -S 127.0.0.1: + - File Upload Progress support is implemented in the Session extension. + b. Syntax additions - Traits: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ NEWS
sixd Fri, 02 Mar 2012 15:46:51 + Revision: http://svn.php.net/viewvc?view=revision&revision=323823 Log: Reorder Changed paths: U php/php-src/branches/PHP_5_4/NEWS Modified: php/php-src/branches/PHP_5_4/NEWS === --- php/php-src/branches/PHP_5_4/NEWS 2012-03-02 15:43:37 UTC (rev 323822) +++ php/php-src/branches/PHP_5_4/NEWS 2012-03-02 15:46:51 UTC (rev 323823) @@ -2,43 +2,47 @@ ||| ?? ??? 2012, PHP 5.4.1 RC1 +- Array: + . Fixed bug #61058 (array_fill leaks if start index is PHP_INT_MAX). +(Laruence) + - CLI Server: . "Connection: close" instead of "Connection: closed" (Gustavo) - Core: - . Fixed bug #61225 (Incorect lexing of 0b00*+). (Pierrick) - . Fixed bug #61165 (Segfault - strip_tags()). (Laruence) + . Fixed bug #60573 (type hinting with "self" keyword causes weird errors). +(Laruence) + . Fixed bug #60801 (strpbrk() mishandles NUL byte). (Adam) + . Fixed bug #60978 (exit code incorrect). (Laruence) + . Fixed bug #61000 (Exceeding max nesting level doesn't delete numerical +vars). (Laruence) + . Fixed bug #61011 (Crash when an exception is thrown by __autoload +accessing a static property). (Laruence) + . Fixed bug #61072 (Memory leak when restoring an exception handler). +(Nikic, Laruence) . Fixed bug #61087 (Memory leak in parse_ini_file when specifying invalid scanner mode). (Nikic, Laruence) - . Fixed bug #61072 (Memory leak when restoring an exception handler). -(Nikic, Laruence) - . Fixed bug #61011 (Crash when an exception is thrown by __autoload -accessing a static property). (Laruence) - . Fixed bug #61000 (Exceeding max nesting level doesn't delete numerical -vars). (Laruence) - . Fixed bug #60978 (exit code incorrect). (Laruence) - . Fixed bug #60801 (strpbrk() mishandles NUL byte). (Adam) - . Fixed bug #60573 (type hinting with "self" keyword causes weird errors). -(Laruence) . Fixed bug #61106 (Segfault when using header_register_callback). (Nikita Popov) + . Fixed bug #61165 (Segfault - strip_tags()). (Laruence) + . Fixed bug #61225 (Incorect lexing of 0b00*+). (Pierrick) -- Standard: - . Fixed memory leak in substr_replace. (Pierrick) - . make max_file_uploads ini directive settable outside of php.ini (Rasmus) - - Installation . Fixed bug #61172 (Add Apache 2.4 support). (Chris Jones) +- mbstring: + . MFH mb_ereg_replace_callback() for security enhancements. (Rui) + - Phar - . Fixed bug #61184 (Phar::webPhar() generates headers with trailing NUL bytes). (Nikita Popov) + . Fixed bug #61184 (Phar::webPhar() generates headers with trailing NUL +bytes). (Nikita Popov) - Reflection: . Fixed bug #60968 (Late static binding doesn't work with ReflectionMethod::invokeArgs()). (Laruence) -- Array: - . Fixed bug #61058 (array_fill leaks if start index is PHP_INT_MAX). -(Laruence) +- Standard: + . Fixed memory leak in substr_replace. (Pierrick) + . Make max_file_uploads ini directive settable outside of php.ini (Rasmus) - XMLRPC: . Fixed bug #61097 (Memory leak in xmlrpc functions copying zvals). (Nikita Popov) @@ -46,9 +50,6 @@ - Zlib: . Fixed bug #61139 (gzopen leaks when specifying invalid mode). (Nikita Popov) -- mbstring: - . MFH mb_ereg_replace_callback() for security enhancements. (Rui) - 01 Mar 2012, PHP 5.4.0 - Installation: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/trunk/ ext/pcre/php_pcre.c ext/pcre/tests/002.phpt ext/pcre/tests/004.phpt tests/lang/bug24403.phpt
On Mar 4, 2012, at 5:39 AM, Nikita Popov wrote:
> nikicSun, 04 Mar 2012 13:39:12 +
>
> Revision: http://svn.php.net/viewvc?view=revision&revision=323862
>
> Log:
> Deprecate /e modifier
>
This needs to be in UPGRADING and NEWS.
Chris
> See https://wiki.php.net/rfc/remove_preg_replace_eval_modifier.
>
> Changed paths:
>U php/php-src/trunk/ext/pcre/php_pcre.c
>U php/php-src/trunk/ext/pcre/tests/002.phpt
>U php/php-src/trunk/ext/pcre/tests/004.phpt
>U php/php-src/trunk/tests/lang/bug24403.phpt
>
> Modified: php/php-src/trunk/ext/pcre/php_pcre.c
> ===
> --- php/php-src/trunk/ext/pcre/php_pcre.c2012-03-04 13:31:04 UTC (rev
> 323861)
> +++ php/php-src/trunk/ext/pcre/php_pcre.c2012-03-04 13:39:12 UTC (rev
> 323862)
> @@ -1019,6 +1019,10 @@
>replace_end = replace + replace_len;
>}
>
> +if (eval) {
> +php_error_docref(NULL TSRMLS_CC, E_DEPRECATED, "The /e modifier is
> deprecated, use preg_replace_callback instead");
> +}
> +
>/* Calculate the size of the offsets array, and allocate memory for it. */
>rc = pcre_fullinfo(pce->re, extra, PCRE_INFO_CAPTURECOUNT, &num_subpats);
>if (rc < 0) {
>
> Modified: php/php-src/trunk/ext/pcre/tests/002.phpt
> ===
> --- php/php-src/trunk/ext/pcre/tests/002.phpt2012-03-04 13:31:04 UTC (rev
> 323861)
> +++ php/php-src/trunk/ext/pcre/tests/002.phpt2012-03-04 13:39:12 UTC (rev
> 323862)
> @@ -34,6 +34,8 @@
> Warning: preg_replace(): Compilation failed: missing terminating ] for
> character class at offset 8 in %s002.php on line 11
> NULL
>
> +Deprecated: preg_replace(): The /e modifier is deprecated, use
> preg_replace_callback instead in %s on line 12
> +
> Parse error: %s in %s002.php(12) : regexp code on line 1
>
> Fatal error: preg_replace(): Failed evaluating code:
>
> Modified: php/php-src/trunk/ext/pcre/tests/004.phpt
> ===
> --- php/php-src/trunk/ext/pcre/tests/004.phpt2012-03-04 13:31:04 UTC (rev
> 323861)
> +++ php/php-src/trunk/ext/pcre/tests/004.phpt2012-03-04 13:39:12 UTC (rev
> 323862)
> @@ -16,7 +16,7 @@
>
> var_dump(preg_split('/PHP_(?:NAMED_)?(?:FUNCTION|METHOD)\s*\((\w+(?:,\s*\w+)?)\)/S',
> "PHP_FUNCTION(s, preg_match)\n{\nlalala", -1, PREG_SPLIT_DELIM_CAPTURE |
> PREG_SPLIT_OFFSET_CAPTURE));
> ?>
> ---EXPECT--
> +--EXPECTF--
> int(2)
> array(2) {
> [0]=>
> @@ -117,6 +117,8 @@
> }
> }
> }
> +
> +Deprecated: preg_replace(): The /e modifier is deprecated, use
> preg_replace_callback instead in %s on line %d
> string(9) "hello
>
>
>
> Modified: php/php-src/trunk/tests/lang/bug24403.phpt
> ===
> --- php/php-src/trunk/tests/lang/bug24403.phpt2012-03-04 13:31:04 UTC
> (rev 323861)
> +++ php/php-src/trunk/tests/lang/bug24403.phpt2012-03-04 13:39:12 UTC
> (rev 323862)
> @@ -17,4 +17,5 @@
> }
> new a();
> ?>
> ---EXPECT--
> +--EXPECTF--
> +Deprecated: preg_replace(): The /e modifier is deprecated, use
> preg_replace_callback instead in %s on line %d
>
> --
> PHP CVS Mailing List (http://www.php.net/)
> To unsubscribe, visit: http://www.php.net/unsub.php
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/trunk/ main/network.c win32/build/config.w32.h.in win32/inet.c win32/inet.h win32/sendmail.c
On Mar 4, 2012, at 7:08 AM, Pierre Joye wrote:
> pajoye Sun, 04 Mar 2012 15:08:12 +
>
> Revision: http://svn.php.net/viewvc?view=revision&revision=323865
>
> Log:
> - bump minimum version, no more XP/2003
Can you add this to UPGRADING and NEWS?
Chris
>
> Changed paths:
>U php/php-src/trunk/main/network.c
>U php/php-src/trunk/win32/build/config.w32.h.in
>U php/php-src/trunk/win32/inet.c
>U php/php-src/trunk/win32/inet.h
>U php/php-src/trunk/win32/sendmail.c
>
> Modified: php/php-src/trunk/main/network.c
> ===
> --- php/php-src/trunk/main/network.c2012-03-04 14:57:07 UTC (rev 323864)
> +++ php/php-src/trunk/main/network.c2012-03-04 15:08:12 UTC (rev 323865)
> @@ -25,7 +25,10 @@
>
> #include
>
> +
> +
> #ifdef PHP_WIN32
> +# include
> # include "win32/inet.h"
> # define O_RDONLY _O_RDONLY
> # include "win32/param.h"
>
> Modified: php/php-src/trunk/win32/build/config.w32.h.in
> ===
> --- php/php-src/trunk/win32/build/config.w32.h.in2012-03-04 14:57:07 UTC
> (rev 323864)
> +++ php/php-src/trunk/win32/build/config.w32.h.in2012-03-04 15:08:12 UTC
> (rev 323865)
> @@ -6,8 +6,8 @@
> /* Define the minimum supported version */
> #undef _WIN32_WINNT
> #undef NTDDI_VERSION
> -#define _WIN32_WINNT 0x502
> -#define NTDDI_VERSION _WIN32_WIN2K
> +#define _WIN32_WINNT 0x0600
> +#define NTDDI_VERSION 0x06000100
>
> /* Default PHP / PEAR directories */
> #define PHP_CONFIG_FILE_PATH (getenv("SystemRoot"))?getenv("SystemRoot"):""
>
> Modified: php/php-src/trunk/win32/inet.c
> ===
> --- php/php-src/trunk/win32/inet.c2012-03-04 14:57:07 UTC (rev 323864)
> +++ php/php-src/trunk/win32/inet.c2012-03-04 15:08:12 UTC (rev 323865)
> @@ -1,12 +1,13 @@
> #include "config.w32.h"
> -#if (_WIN32_WINNT < 0x0600) /* Vista/2k8 have these functions */
> #include "php.h"
> #include
> #include
> #include
>
> #include "inet.h"
> +#if (_WIN32_WINNT < 0x0600) /* Vista/2k8 have these functions */
>
> +
> PHPAPI int inet_pton(int af, const char* src, void* dst)
> {
>int address_length;
> @@ -76,6 +77,8 @@
>return NULL;
> }
>
> +#endif
> +
> int inet_aton(const char *cp, struct in_addr *inp) {
> inp->s_addr = inet_addr(cp);
>
> @@ -85,4 +88,3 @@
>
> return 1;
> }
> -#endif
>
> Modified: php/php-src/trunk/win32/inet.h
> ===
> --- php/php-src/trunk/win32/inet.h2012-03-04 14:57:07 UTC (rev 323864)
> +++ php/php-src/trunk/win32/inet.h2012-03-04 15:08:12 UTC (rev 323865)
> @@ -6,5 +6,6 @@
> #if (_WIN32_WINNT <= 0x502)
> PHPAPI int inet_pton(int af, const char* src, void* dst);
> PHPAPI const char* inet_ntop(int af, const void* src, char* dst, size_t size);
> +#endif
> +
> PHPAPI int inet_aton(const char *cp, struct in_addr *inp);
> -#endif
>
> Modified: php/php-src/trunk/win32/sendmail.c
> ===
> --- php/php-src/trunk/win32/sendmail.c2012-03-04 14:57:07 UTC (rev 323864)
> +++ php/php-src/trunk/win32/sendmail.c2012-03-04 15:08:12 UTC (rev 323865)
> @@ -25,6 +25,7 @@
> #ifndef NETWARE
> #include
> #include "time.h"
> +# include
> #else/* NETWARE */
> #include
> #endif/* NETWARE */
>
> --
> PHP CVS Mailing List (http://www.php.net/)
> To unsubscribe, visit: http://www.php.net/unsub.php
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/trunk/ UPGRADING
sixd Mon, 05 Mar 2012 20:14:04 + Revision: http://svn.php.net/viewvc?view=revision&revision=323924 Log: Align section headings with the latest (5.4) migration on-line doc. This will aid future reuse of UPGRADING text. Changed paths: U php/php-src/trunk/UPGRADING Modified: php/php-src/trunk/UPGRADING === --- php/php-src/trunk/UPGRADING 2012-03-05 20:08:30 UTC (rev 323923) +++ php/php-src/trunk/UPGRADING 2012-03-05 20:14:04 UTC (rev 323924) @@ -1,192 +1,82 @@ $Id$ -UPGRADE NOTES - PHP X.Y +PHP X.Y UPGRADE NOTES -1. Changes made to default configuration -2. Reserved words and classes -3. Changes made to engine behaviour -4. Changes made to existing functions -5. Changes made to existing methods -6. Changes made to existing classes -7. Deprecated -8. Removed -9. Extensions: - a. moved out to PECL and actively maintained there - b. no longer maintained - c. with changed behaviour - d. no longer possible to disable -10. Changes in SAPI support -11. Changes in INI directives -12. Syntax additions -13. Windows support -14. New in PHP X.Y: - a. New libraries - b. New extensions - c. New stream wrappers - d. New stream filters - e. New functions - f. New global constants - g. New classes - h. New methods - i. New class constants - j. New hash algorithms - k. New Syntax +1. Backward Incompatible Changes +2. New Features +2. Changes in SAPI modules +3. Deprecated Functionality +4. Changed Functions +5. New Functions +6. New Classes and Interfaces +7. Removed Extensions +8. Other Changes to Extensions +9. New Global Constants +10. Changes to INI File Handling +11. Other Changes + -1. Changes made to default configuration +1. Backward Incompatible Changes -- - -= -2. Reserved words and classes -= - -- - -= -3. Changes made to engine behaviour -= - -- - -= -4. Changes made to existing functions -= - -- - -=== -5. Changes made to existing methods -=== - -- - -=== -6. Changes made to existing classes -=== - -- - -= -7. Deprecated -= - -- The preg_replace /e modifier is now deprecated. - You should use preg_replace_callback instead. - -== -8. Removed -== - -a. removed features - - - - -b. removed ini directives - - - - -c. removed functions - - - - -d. removed syntax - - - - -= -9. Extensions -= - - a. moved out to PECL and actively maintained there - -- - - b. no longer maintained - -- - - c. with changed behaviour - -- - - d. no longer possible to disable - -- - -== -10. Changes in SAPI support -== - -- - -= -11. Changes in INI directives -= - -- - - -12. Syntax additions - - -- - -=== -13. Windows support -=== - - Drop Windows XP and 2003 support. (Pierre) -=== -14. New in PHP X.Y: -=== + +2. New Features + - a. New libraries - - + +2. Changes in SAPI modules + - b. New extensions - - + +3. Deprecated Functionality + - c. New stream wrappers +- The preg_replace /e modifier is now deprecated. Use + preg_replace_callback instead. + (https://wiki.php.net/rfc/remove_preg_replace_eval_modifier) - - + +4. Changed Functions + - d. New stream filters - - + +5. New Functions + - e. New functions - - Extension: - - function() + +6. New Classes and Interfaces + - f. New global constants +- SPL: + - SplFixedArray::__wakeup() - - + +7. Removed Extensions + - g. New classes - - Extension: - - ClassName - - h. New methods + +8. Other Changes to Extensions + -- Spl: -
[PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ UPGRADING
sixd Tue, 06 Mar 2012 19:12:39 + Revision: http://svn.php.net/viewvc?view=revision&revision=323967 Log: Typo: "outout" Changed paths: U php/php-src/branches/PHP_5_4/UPGRADING Modified: php/php-src/branches/PHP_5_4/UPGRADING === --- php/php-src/branches/PHP_5_4/UPGRADING 2012-03-06 19:05:24 UTC (rev 323966) +++ php/php-src/branches/PHP_5_4/UPGRADING 2012-03-06 19:12:39 UTC (rev 323967) @@ -122,7 +122,7 @@ - Added cli.prompt to configure the CLI interactive shell prompt. - Added cli_server.color to enable the CLI web server to use ANSI color coding - in terminal outout. + in terminal output. 2. Changes to reserved words and classes -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ UPGRADING
sixd Tue, 06 Mar 2012 20:20:50 + Revision: http://svn.php.net/viewvc?view=revision&revision=323968 Log: Typo and missing zend ini param Changed paths: U php/php-src/branches/PHP_5_4/UPGRADING Modified: php/php-src/branches/PHP_5_4/UPGRADING === --- php/php-src/branches/PHP_5_4/UPGRADING 2012-03-06 19:12:39 UTC (rev 323967) +++ php/php-src/branches/PHP_5_4/UPGRADING 2012-03-06 20:20:50 UTC (rev 323968) @@ -74,7 +74,7 @@ - safe_mode_exec_dir - safe_mode_allowed_env_vars - safe_mode_protected_env_vars - - session.bug_compat42 + - session.bug_compat_42 - session.bug_compat_warn - y2k_compliance - zend.ze1_compatibility_mode @@ -106,6 +106,8 @@ - Added zend.script_encoding. This value will be used unless a "declare(encoding=...)" directive appears at the top of the script. +- Added zend.signal_check to check for replaced signal handlers on shutdown + - Added enable_post_data_reading, which is enabled by default. When it's disabled, the POST data is not read (or processed); the behavior is similar to that of other request methods with body, like PUT. This allows reading -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/buildconf trunk/buildconf
sixd Tue, 06 Mar 2012 21:30:59 + Revision: http://svn.php.net/viewvc?view=revision&revision=323973 Log: Make "buildconf --force" more robust, per IRC chat. Not backported to 5.3 to avoid destabilization. Changed paths: U php/php-src/branches/PHP_5_4/buildconf U php/php-src/trunk/buildconf Modified: php/php-src/branches/PHP_5_4/buildconf === --- php/php-src/branches/PHP_5_4/buildconf 2012-03-06 20:57:56 UTC (rev 323972) +++ php/php-src/branches/PHP_5_4/buildconf 2012-03-06 21:30:59 UTC (rev 323973) @@ -32,7 +32,12 @@ echo "use buildconf --force to override this check." exit 1 fi - + +if test "$devok" = "1"; then + echo "Removing configure caches" + rm -rf autom4te.cache config.cache +fi + rm -f generated_lists if test "$debug" = "yes"; then Modified: php/php-src/trunk/buildconf === --- php/php-src/trunk/buildconf 2012-03-06 20:57:56 UTC (rev 323972) +++ php/php-src/trunk/buildconf 2012-03-06 21:30:59 UTC (rev 323973) @@ -32,7 +32,12 @@ echo "use buildconf --force to override this check." exit 1 fi - + +if test "$devok" = "1"; then + echo "Removing configure caches" + rm -rf autom4te.cache config.cache +fi + rm -f generated_lists if test "$debug" = "yes"; then -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ UPGRADING
sixd Tue, 06 Mar 2012 23:34:57 + Revision: http://svn.php.net/viewvc?view=revision&revision=323975 Log: Sync char set wording with migration doc Changed paths: U php/php-src/branches/PHP_5_4/UPGRADING Modified: php/php-src/branches/PHP_5_4/UPGRADING === --- php/php-src/branches/PHP_5_4/UPGRADING 2012-03-06 23:08:16 UTC (rev 323974) +++ php/php-src/branches/PHP_5_4/UPGRADING 2012-03-06 23:34:57 UTC (rev 323975) @@ -36,9 +36,10 @@ 1. Changes to INI directives = -- The php.ini default_charset directive now defaults to UTF-8. If you - were relying on the previous default of ISO-88590-1, you will need - to add: +- The default character set is now UTF-8 when the default_charset + php.ini directive is not explicitly set. This applies to functions + such as htmlentities() and htmlspecialchars(). If you were relying + on the previous default of ISO-8859-1 you will need to add: default_charset = iso-8859-1 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ ext/standard/tests/general_functions/bug60227.phpt ext/standard/tests/general_functions/bug60227_1.phpt ext/standard/tests/general_functions/bug60227_
On 3/6/12 11:49 PM, Stanislav Malyshev wrote: stas Wed, 07 Mar 2012 07:49:56 + Revision: http://svn.php.net/viewvc?view=revision&revision=323986 Log: MFH: Headers: forbid \r and \n also after \0, allow CRLF followed by HT or SP and forbid \0. See bug #60227. Bug: https://bugs.php.net/60227 (Closed) header() cannot detect the multi-line header with CR(0x0D). Changed paths: D php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/bug60227.phpt A php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/bug60227_1.phpt A php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/bug60227_2.phpt A php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/bug60227_3.phpt A php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/bug60227_4.phpt U php/php-src/branches/PHP_5_4/main/SAPI.c What about NEWS? -- Email: christopher.jo...@oracle.com Tel: +1 650 506 8630 Blog: http://blogs.oracle.com/opal/ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ext/fileinfo/ fileinfo.c tests/bug61173.phpt
On 3/6/12 11:38 PM, Stanislav Malyshev wrote: stas Wed, 07 Mar 2012 07:38:57 + Revision: http://svn.php.net/viewvc?view=revision&revision=323985 Log: MFH: Fixed bug #61173 (Unable to detect error from finfo constructor). Bug: https://bugs.php.net/61173 (Assigned) Unable to detect error from finfo constructor Changed paths: U php/php-src/branches/PHP_5_4/ext/fileinfo/fileinfo.c A php/php-src/branches/PHP_5_4/ext/fileinfo/tests/bug61173.phpt What about NEWS? Chris -- Email: christopher.jo...@oracle.com Tel: +1 650 506 8630 Blog: http://blogs.oracle.com/opal/ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/zlib/zlib.c trunk/ext/zlib/zlib.c
On 3/7/12 12:51 AM, Gustavo André dos Santos Lopes wrote: cataphract Wed, 07 Mar 2012 08:51:30 + Revision: http://svn.php.net/viewvc?view=revision&revision=323988 Log: - Tentative fix for bug #61306. #cjones: Will update NEWS when confirmed it fixes the problem. Bug: https://bugs.php.net/61306 (Assigned) Segfault at end of request Changed paths: U php/php-src/branches/PHP_5_4/ext/zlib/zlib.c U php/php-src/trunk/ext/zlib/zlib.c LOL! My gut feel says that NEWS should be kept in sync whenever code changes. It doesn't seem technically difficult. Keeping NEWS up to date avoids any bus-factor or memory-loss situations. If a bug fix is reverted, it's trivial to update NEWS again. NEWS comments can say "attempt to fix" or "unfinished" if there is some temporary uncertainty about a fix. -- Email: christopher.jo...@oracle.com Tel: +1 650 506 8630 Blog: http://blogs.oracle.com/opal/ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ ext/standard/tests/general_functions/bug60227.phpt ext/standard/tests/general_functions/bug60227_1.phpt ext/standard/tests/general_functions/bug60227_
On 03/07/2012 09:51 AM, Stas Malyshev wrote: Hi! What about NEWS? It's already fixed in 5.3... Urrgh, so it (#60227) is. We need a better branching mechanism so users can tell what is fixed and what isn't in any particular release. -- Email: christopher.jo...@oracle.com Tel: +1 650 506 8630 Blog: http://blogs.oracle.com/opal/ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ext/fileinfo/ fileinfo.c tests/bug61173.phpt
On 03/07/2012 08:06 AM, Christopher Jones wrote: On 3/6/12 11:38 PM, Stanislav Malyshev wrote: stas Wed, 07 Mar 2012 07:38:57 + Revision: http://svn.php.net/viewvc?view=revision&revision=323985 Log: MFH: Fixed bug #61173 (Unable to detect error from finfo constructor). Bug: https://bugs.php.net/61173 (Assigned) Unable to detect error from finfo constructor Changed paths: U php/php-src/branches/PHP_5_4/ext/fileinfo/fileinfo.c A php/php-src/branches/PHP_5_4/ext/fileinfo/tests/bug61173.phpt What about NEWS? Chris This one (#61173) isn't in 5.4 NEWS, since it was only fixed in 5.3.11. Chris -- Email: christopher.jo...@oracle.com Tel: +1 650 506 8630 Blog: http://blogs.oracle.com/opal/ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ext/fileinfo/ fileinfo.c tests/bug61173.phpt
On 03/07/2012 10:00 AM, Stas Malyshev wrote: Hi! This one (#61173) isn't in 5.4 NEWS, since it was only fixed in 5.3.11. Do we now duplicate 5.3 and 5.4 NEWS? Users should be able to see the fixes in 5.4 by reading only 5.4 NEWS. I think the 5.3 & 5.4 branches have to be considered distinct from now on. Chris -- Email: christopher.jo...@oracle.com Tel: +1 650 506 8630 Blog: http://blogs.oracle.com/opal/ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ext/fileinfo/ fileinfo.c tests/bug61173.phpt
On 03/07/2012 10:22 AM, Stas Malyshev wrote: Hi! I think what Chris is asking is to have NEWS entries in the branch where a commit is done, no mater if the fix was already reported in a previous branch NEWS file. It'd mean instead of easy merge on release we'd have to have hard and time-consuming cleanup of old NEWS - I'd have to go through NEWS and for each entry go to 5.3 NEWS and check if it's there too and if it's there remove it. Or we'd just have it twice in both 5.3 and 5.4 sections? Ideally from the users/readers point of view, each branch that has a fix would have a related NEWS entry. With git this discussion might be moot so we might want to drop this thread. However my general standpoint is: 1. we should commit a comment to each branch's NEWS file when code is committed to that branch. 2. the previous branch's NEWS files would not be merged into the N+1 branch at N+1 release. 3. the RC release fixes would stay under their RC section headers. This would mean trivially more developer effort at commit time but would: 1. show more accurately what is fixed in any code bundle. 2. require almost no manual cleanup at release time (except for grammar etc). We need to figure it out btw as if we carry NEWS with patches in git that would mean patches will never cleanly apply between branches (as NEWS files are always different). We need to have a better mechanism for this. If NEWS was automatically generated at push time or prior to release, then discussion is moot. Yes, some one-off manual tidy up might be needed at release time. BTW, why we don't put the same in the trunk NEWS then? Because of the current manual merge of the previous branch's NEWS at the time a new branch is released. E.g. 5.4.0 NEWS included the 5.3.10 NEWS. Chris -- Email: christopher.jo...@oracle.com Tel: +1 650 506 8630 Blog: http://blogs.oracle.com/opal/ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ext/fileinfo/ fileinfo.c tests/bug61173.phpt
On 03/07/2012 10:15 AM, Stas Malyshev wrote: Hi! Users should be able to see the fixes in 5.4 by reading only 5.4 NEWS. That's why we merge 5.3 news before the release. See my other email. This is error prone since bugs may not be relevant, and release cycles may not coincide. I'd like it to be made redundant. I think the 5.3& 5.4 branches have to be considered distinct from now on. What's different now? Users may never touch a 5.3 bundle. If they install 5.4.0 and then upgrade to 5.4.1, they need to know what has changed in between. Chris -- Email: christopher.jo...@oracle.com Tel: +1 650 506 8630 Blog: http://blogs.oracle.com/opal/ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/oci8/tests/array_bind_bdouble.phpt branches/PHP_5_3/ext/oci8/tests/array_bind_bfloat.phpt branches/PHP_5_3/ext/oci8/tests/bind_raw_2.phpt branches/PHP
sixd Mon, 12 Mar 2012 18:08:34 +
Revision: http://svn.php.net/viewvc?view=revision&revision=324165
Log:
Test portability and coverage changes
Changed paths:
U php/php-src/branches/PHP_5_3/ext/oci8/tests/array_bind_bdouble.phpt
U php/php-src/branches/PHP_5_3/ext/oci8/tests/array_bind_bfloat.phpt
A php/php-src/branches/PHP_5_3/ext/oci8/tests/bind_raw_2.phpt
U php/php-src/branches/PHP_5_3/ext/oci8/tests/bug43497_92.phpt
U php/php-src/branches/PHP_5_3/ext/oci8/tests/drcp_privileged.phpt
U php/php-src/branches/PHP_5_4/ext/oci8/tests/array_bind_bdouble.phpt
U php/php-src/branches/PHP_5_4/ext/oci8/tests/array_bind_bfloat.phpt
A php/php-src/branches/PHP_5_4/ext/oci8/tests/bind_raw_2.phpt
U php/php-src/branches/PHP_5_4/ext/oci8/tests/bug43497_92.phpt
U php/php-src/branches/PHP_5_4/ext/oci8/tests/drcp_privileged.phpt
U php/php-src/trunk/ext/oci8/tests/array_bind_bdouble.phpt
U php/php-src/trunk/ext/oci8/tests/array_bind_bfloat.phpt
A php/php-src/trunk/ext/oci8/tests/bind_raw_2.phpt
U php/php-src/trunk/ext/oci8/tests/bug43497_92.phpt
U php/php-src/trunk/ext/oci8/tests/drcp_privileged.phpt
Modified: php/php-src/branches/PHP_5_3/ext/oci8/tests/array_bind_bdouble.phpt
===
--- php/php-src/branches/PHP_5_3/ext/oci8/tests/array_bind_bdouble.phpt 2012-03-12 17:40:24 UTC (rev 324164)
+++ php/php-src/branches/PHP_5_3/ext/oci8/tests/array_bind_bdouble.phpt 2012-03-12 18:08:34 UTC (rev 324165)
@@ -4,6 +4,7 @@
true, 'timesten' => false); // test runs on these DBs
require(dirname(__FILE__).'/skipif.inc');
+if (!defined('SQLT_BDOUBLE')) die('skip SQLT_BDOUBLE type not available on older Oracle clients');
?>
--FILE--
true, 'timesten' => false); // test runs on these DBs
require(dirname(__FILE__).'/skipif.inc');
+if (!defined('SQLT_BFLOAT')) die('skip SQLT_BFLOAT type not available on older Oracle clients');
?>
--FILE--
true, 'timesten' => false); // test runs on these DBs
+require(dirname(__FILE__).'/skipif.inc');
+?>
+--FILE--
+
+--EXPECT--
+string(32) "88b274d7a257ac6f70435b83abd4e26e"
+int(300)
+Done
Property changes on: php/php-src/branches/PHP_5_3/ext/oci8/tests/bind_raw_2.phpt
___
Added: svn:keywords
+ Id Rev Revision
Added: svn:eol-style
+ native
Modified: php/php-src/branches/PHP_5_3/ext/oci8/tests/bug43497_92.phpt
===
--- php/php-src/branches/PHP_5_3/ext/oci8/tests/bug43497_92.phpt 2012-03-12 17:40:24 UTC (rev 324164)
+++ php/php-src/branches/PHP_5_3/ext/oci8/tests/bug43497_92.phpt 2012-03-12 18:08:34 UTC (rev 324165)
@@ -5,8 +5,12 @@
$target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs
require(dirname(__FILE__).'/skipif.inc');
if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request');
-if (preg_match('/Unknown/', oci_client_version()) != 1) {
-die("skip expected output only valid with Oracle 9gR2 clients");
+ob_start();
+phpinfo(INFO_MODULES);
+$phpinfo = ob_get_clean();
+$iv = preg_match('/Oracle .*Version => (9\.2)/', $phpinfo);
+if ($iv != 1) {
+die ("skip tests a feature that works only with Oracle 9iR2 client");
}
?>
--FILE--
Modified: php/php-src/branches/PHP_5_3/ext/oci8/tests/drcp_privileged.phpt
===
--- php/php-src/branches/PHP_5_3/ext/oci8/tests/drcp_privileged.phpt 2012-03-12 17:40:24 UTC (rev 324164)
+++ php/php-src/branches/PHP_5_3/ext/oci8/tests/drcp_privileged.phpt 2012-03-12 18:08:34 UTC (rev 324165)
@@ -3,11 +3,14 @@
--SKIPIF--
--INI--
Modified: php/php-src/branches/PHP_5_4/ext/oci8/tests/array_bind_bdouble.phpt
===
--- php/php-src/branches/PHP_5_4/ext/oci8/tests/array_bind_bdouble.phpt 2012-03-12 17:40:24 UTC (rev 324164)
+++ php/php-src/branches/PHP_5_4/ext/oci8/tests/array_bind_bdouble.phpt 2012-03-12 18:08:34 UTC (rev 324165)
@@ -4,6 +4,7 @@
true, 'timesten' => false); // test runs on these DBs
require(dirname(__FILE__).'/skipif.inc');
+if (!defined('SQLT_BDOUBLE')) die('skip SQLT_BDOUBLE type not available on older Oracle clients');
?>
--FILE--
true, 'timesten' => false); // test runs on these DBs
require(dirname(__FILE__).'/skipif.inc');
+if (!defined('SQLT_BFLOAT')) die('skip SQLT_BFLOAT type not available on older Oracle clients');
?>
--FILE--
true, 'timesten' => false); // test runs on these DBs
+require(dirname(__FILE__).'/skipif.inc');
+?>
+--FILE--
+
+--EXPECT--
+string(32) "88b274d7a257ac6f70435b83abd4e26e"
+int(300)
+Done
Property changes on: php/php-src/branches/PHP_5_4/ext/oci8/tests/bind_raw_2.phpt
___
Added: svn:keywords
+ Id Rev Revision
Added: svn:eol-style
+ n
Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/run-tests.php branches/PHP_5_4/run-tests.php trunk/run-tests.php
On 03/17/2012 02:35 AM, Michael Wallner wrote:
mike Sat, 17 Mar 2012 09:35:25 +
Revision: http://svn.php.net/viewvc?view=revision&revision=324319
Log:
add --PUT-- section support based on POST_RAW
Changed paths:
U php/php-src/branches/PHP_5_3/run-tests.php
U php/php-src/branches/PHP_5_4/run-tests.php
U php/php-src/trunk/run-tests.php
Hi Mike,
Can you update (or get updated) http://qa.php.net/phpt_details.php
with this feature?
Thanks,
Chris
Modified: php/php-src/branches/PHP_5_3/run-tests.php
===
--- php/php-src/branches/PHP_5_3/run-tests.php 2012-03-17 09:19:10 UTC (rev
324318)
+++ php/php-src/branches/PHP_5_3/run-tests.php 2012-03-17 09:35:25 UTC (rev
324319)
@@ -1342,8 +1342,8 @@
$tested = trim($section_text['TEST']);
- /* For GET/POST tests, check if cgi sapi is available and if it is, use
it. */
- if (!empty($section_text['GET']) || !empty($section_text['POST']) ||
!empty($section_text['POST_RAW']) || !empty($section_text['COOKIE']) ||
!empty($section_text['EXPECTHEADERS'])) {
+ /* For GET/POST/PUT tests, check if cgi sapi is available and if it is,
use it. */
+ if (!empty($section_text['GET']) || !empty($section_text['POST']) ||
!empty($section_text['POST_RAW']) || !empty($section_text['PUT']) ||
!empty($section_text['COOKIE']) || !empty($section_text['EXPECTHEADERS'])) {
if (isset($php_cgi)) {
$old_php = $php;
$php = $php_cgi . ' -C ';
@@ -1718,6 +1718,46 @@
save_text($tmp_post, $request);
$cmd = "$php $pass_options $ini_settings -f \"$test_file\" 2>&1<
\"$tmp_post\"";
+ } elseif (array_key_exists('PUT', $section_text)&&
!empty($section_text['PUT'])) {
+
+ $post = trim($section_text['PUT']);
+ $raw_lines = explode("\n", $post);
+
+ $request = '';
+ $started = false;
+
+ foreach ($raw_lines as $line) {
+
+ if (empty($env['CONTENT_TYPE'])&&
preg_match('/^Content-Type:(.*)/i', $line, $res)) {
+ $env['CONTENT_TYPE'] = trim(str_replace("\r",
'', $res[1]));
+ continue;
+ }
+
+ if ($started) {
+ $request .= "\n";
+ }
+
+ $started = true;
+ $request .= $line;
+ }
+
+ $env['CONTENT_LENGTH'] = strlen($request);
+ $env['REQUEST_METHOD'] = 'PUT';
+
+ if (empty($request)) {
+ if ($JUNIT) {
+ $JUNIT['test_total']++;
+ $JUNIT['test_error']++;
+ $JUNIT['result_xml'] .= ''."\n";
+ $JUNIT['result_xml'] .= ''."\n";
+ $JUNIT['result_xml'] .= ''."\n";
+ }
+ return 'BORKED';
+ }
+
+ save_text($tmp_post, $request);
+ $cmd = "$php $pass_options $ini_settings -f \"$test_file\" 2>&1<
\"$tmp_post\"";
+
} else if (array_key_exists('POST', $section_text)&&
!empty($section_text['POST'])) {
$post = trim($section_text['POST']);
Modified: php/php-src/branches/PHP_5_4/run-tests.php
===
--- php/php-src/branches/PHP_5_4/run-tests.php 2012-03-17 09:19:10 UTC (rev
324318)
+++ php/php-src/branches/PHP_5_4/run-tests.php 2012-03-17 09:35:25 UTC (rev
324319)
@@ -1342,8 +1342,8 @@
$tested = trim($section_text['TEST']);
- /* For GET/POST tests, check if cgi sapi is available and if it is, use
it. */
- if (!empty($section_text['GET']) || !empty($section_text['POST']) ||
!empty($section_text['POST_RAW']) || !empty($section_text['COOKIE']) ||
!empty($section_text['EXPECTHEADERS'])) {
+ /* For GET/POST/PUT tests, check if cgi sapi is available and if it is,
use it. */
+ if (!empty($section_text['GET']) || !empty($section_text['POST']) ||
!empty($section_text['POST_RAW']) || !empty($section_text['PUT']) ||
!empty($section_text['COOKIE']) || !empty($section_text['EXPECTHEADERS'])) {
if (isset($php_cgi)) {
$old_php = $php;
$php = $php_cgi . ' -C ';
@@ -1718,6 +1718,46 @@
save_text($tmp_post, $request);
$cmd = "$php $pass_options $ini_settings -f \"$test_file\" 2>&1<
\"$tmp_post\"";
+ } elseif (array_key_exists('PUT', $section_text)&&
!empty($section_text['PUT'])) {
+
+ $post = trim($section_text['PUT']);
+ $raw_lines = explode("\n", $post);
+
+ $request = '';
+ $started =
Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/run-tests.php branches/PHP_5_4/run-tests.php trunk/run-tests.php
On 03/19/2012 12:08 PM, Michael Wallner wrote: Hi Chris, On 19 March 2012 17:30, Christopher Jones wrote: Hi Mike, Can you update (or get updated) http://qa.php.net/phpt_details.php with this feature? Thanks again for the heads up! Could you please also reveal how to get there from the homepage? I'm just curious... ;) It's way too buried for my liking, but the path is: http://qa.php.net/ http://qa.php.net/howtohelp.php http://qa.php.net/write-test.php Then down in the "PHPT structure details" section is a link title "here" to http://qa.php.net/phpt_details.php Chris -- Email: christopher.jo...@oracle.com Tel: +1 650 506 8630 Blog: http://blogs.oracle.com/opal/ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] [git] branch php-src.git: update branch PHP-5.3
Branch PHP-5.3 in php-src.git was updated Date: Mon, 19 Mar 2012 22:33:16 + Link: http://git.php.net/?p=php-src.git;a=log;h=4a6d9b348febe7895a2748977898c09b6e40a7ce;hp=edb57810a707e92b3fdb03fcf36fee53e1f69fd3 Log: Commit: 4a6d9b348febe7895a2748977898c09b6e40a7ce Author: Christopher Jones(s...@php.net) Mon, 19 Mar 2012 15:16:33 -0700 Committer: Christopher Jones(s...@php.net) Mon, 19 Mar 2012 15:16:33 -0700 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4a6d9b348febe7895a2748977898c09b6e40a7ce Shortlog: Minor text changes (to try new git repo) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] [git] branch php-src.git: update branch PHP-5.4
Branch PHP-5.4 in php-src.git was updated Date: Mon, 19 Mar 2012 22:33:16 + Link: http://git.php.net/?p=php-src.git;a=log;h=08f586984f7f067c005d7a252e76f8ddeabb6aec;hp=74eb9d47300274d81e7907c58eab92242baf7919 Log: Commit: 08f586984f7f067c005d7a252e76f8ddeabb6aec Author: Christopher Jones(s...@php.net) Mon, 19 Mar 2012 15:18:06 -0700 Committer: Christopher Jones(s...@php.net) Mon, 19 Mar 2012 15:18:06 -0700 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=08f586984f7f067c005d7a252e76f8ddeabb6aec Shortlog: Merge branch 'PHP-5.3' into PHP-5.4 Commit: 4a6d9b348febe7895a2748977898c09b6e40a7ce Author: Christopher Jones(s...@php.net) Mon, 19 Mar 2012 15:16:33 -0700 Committer: Christopher Jones(s...@php.net) Mon, 19 Mar 2012 15:16:33 -0700 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4a6d9b348febe7895a2748977898c09b6e40a7ce Shortlog: Minor text changes (to try new git repo) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] [git] commit php-src.git:
Commit: 08f586984f7f067c005d7a252e76f8ddeabb6aec Author: Christopher Jones(s...@php.net) Mon, 19 Mar 2012 15:18:06 -0700 Committer: Christopher Jones(s...@php.net) Mon, 19 Mar 2012 15:18:06 -0700 Parents: 74eb9d47300274d81e7907c58eab92242baf7919 4a6d9b348febe7895a2748977898c09b6e40a7ce Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=08f586984f7f067c005d7a252e76f8ddeabb6aec Log: Merge branch 'PHP-5.3' into PHP-5.4 * PHP-5.3: Minor text changes (to try new git repo) Changed paths: Diff: 08f586984f7f067c005d7a252e76f8ddeabb6aec -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] [git] commit php-src.git: ext/oci8/README
Commit: 4a6d9b348febe7895a2748977898c09b6e40a7ce Author: Christopher Jones(s...@php.net) Mon, 19 Mar 2012 15:16:33 -0700 Committer: Christopher Jones(s...@php.net) Mon, 19 Mar 2012 15:16:33 -0700 Parents: edb57810a707e92b3fdb03fcf36fee53e1f69fd3 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4a6d9b348febe7895a2748977898c09b6e40a7ce Log: Minor text changes (to try new git repo) Changed paths: M ext/oci8/README Diff: 4a6d9b348febe7895a2748977898c09b6e40a7ce diff --git a/ext/oci8/README b/ext/oci8/README index 037d549..db7db57 100644 --- a/ext/oci8/README +++ b/ext/oci8/README @@ -1,10 +1,10 @@ The OCI8 Extension -- -The OCI8 extension allows PHP to access Oracle databases. It can be -built using Oracle 9.2, 10, or 11 client libraries. It allows Oracle's -standard cross-version connectivity, for example PHP using Oracle 10.2 -libraries can connect to Oracle Database 9.2 onwards. +The OCI8 extension allows PHP to access Oracle Database. It can be +built using Oracle 9.2, 10, or 11 client libraries. It allows +Oracle's standard cross-version connectivity. For example PHP linked +with Oracle 10.2 libraries can connect to Oracle Database 9.2 onwards. This release of OCI8 can be used with PHP versions 4.3.9 to 5.x. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] [git] branch php-src.git: update branch master
Branch master in php-src.git was updated Date: Mon, 19 Mar 2012 22:36:35 + Link: http://git.php.net/?p=php-src.git;a=log;h=eda790de0fbd5e7454c2efd5dc33a575bec9631f;hp=4335053636d135a7cc5df16c7f81c369c8f41ac1 Log: Commit: eda790de0fbd5e7454c2efd5dc33a575bec9631f Author: Christopher Jones(s...@php.net) Mon, 19 Mar 2012 15:25:27 -0700 Committer: Christopher Jones(s...@php.net) Mon, 19 Mar 2012 15:25:27 -0700 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=eda790de0fbd5e7454c2efd5dc33a575bec9631f Shortlog: Merge branch 'master' of https://git.php.net/repository/php-src Commit: faa731f1477d64c946d718e5b7d53406e111b790 Author: Christopher Jones(s...@php.net) Mon, 19 Mar 2012 15:19:00 -0700 Committer: Christopher Jones(s...@php.net) Mon, 19 Mar 2012 15:19:00 -0700 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=faa731f1477d64c946d718e5b7d53406e111b790 Shortlog: Merge branch 'PHP-5.4' Commit: 08f586984f7f067c005d7a252e76f8ddeabb6aec Author: Christopher Jones(s...@php.net) Mon, 19 Mar 2012 15:18:06 -0700 Committer: Christopher Jones(s...@php.net) Mon, 19 Mar 2012 15:18:06 -0700 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=08f586984f7f067c005d7a252e76f8ddeabb6aec Shortlog: Merge branch 'PHP-5.3' into PHP-5.4 Commit: 4a6d9b348febe7895a2748977898c09b6e40a7ce Author: Christopher Jones(s...@php.net) Mon, 19 Mar 2012 15:16:33 -0700 Committer: Christopher Jones(s...@php.net) Mon, 19 Mar 2012 15:16:33 -0700 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4a6d9b348febe7895a2748977898c09b6e40a7ce Shortlog: Minor text changes (to try new git repo) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] [git] commit php-src.git:
Commit: eda790de0fbd5e7454c2efd5dc33a575bec9631f Author: Christopher Jones(s...@php.net) Mon, 19 Mar 2012 15:25:27 -0700 Committer: Christopher Jones(s...@php.net) Mon, 19 Mar 2012 15:25:27 -0700 Parents: faa731f1477d64c946d718e5b7d53406e111b790 4335053636d135a7cc5df16c7f81c369c8f41ac1 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=eda790de0fbd5e7454c2efd5dc33a575bec9631f Log: Merge branch 'master' of https://git.php.net/repository/php-src * 'master' of https://git.php.net/repository/php-src: Changed paths: Diff: eda790de0fbd5e7454c2efd5dc33a575bec9631f -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] [git] commit php-src.git:
Commit: faa731f1477d64c946d718e5b7d53406e111b790 Author: Christopher Jones(s...@php.net) Mon, 19 Mar 2012 15:19:00 -0700 Committer: Christopher Jones(s...@php.net) Mon, 19 Mar 2012 15:19:00 -0700 Parents: 3930e1e992247c0e0cb61f3207344889ea069da4 08f586984f7f067c005d7a252e76f8ddeabb6aec Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=faa731f1477d64c946d718e5b7d53406e111b790 Log: Merge branch 'PHP-5.4' * PHP-5.4: Minor text changes (to try new git repo) Issue-60742: Added FilesystemIterator::OTHER_MODE_MASK Changed paths: Diff: faa731f1477d64c946d718e5b7d53406e111b790 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] com karma: Use author/email format that can be copied and pasted for use in e-mail clients.: lib/Git/PostReceiveHook.php
On 03/20/2012 02:34 AM, Derick Rethans wrote: On Tue, 20 Mar 2012, Stefan Marr wrote: And, in the push emails, could the line with the short log go first in every block? That seems to be the most important information in there to me. Can do, but it's the emails subject now. Is that not good enough? I'm with Stefan on this. Chris -- Email: christopher.jo...@oracle.com Tel: +1 650 506 8630 Blog: http://blogs.oracle.com/opal/ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Add initialization tests for SQLT_INT binds: ext/oci8/tests/bind_sqltint.phpt
Commit:856f10c9ccc41b4c66bd12e6c7ff5135fd87cb13
Author:Christopher Jones Wed, 21 Mar 2012 16:12:28
-0700
Parents: 0592e25a7487883b8c42a15c3a9a342b35192b65
Branches: master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=856f10c9ccc41b4c66bd12e6c7ff5135fd87cb13
Log:
Add initialization tests for SQLT_INT binds
Added tests for SQLT_INT binds particularly to check for uninitialized
variables.
Changed paths:
M ext/oci8/tests/bind_sqltint.phpt
Diff:
856f10c9ccc41b4c66bd12e6c7ff5135fd87cb13
diff --git a/ext/oci8/tests/bind_sqltint.phpt b/ext/oci8/tests/bind_sqltint.phpt
index f01791d..ac8518e 100644
--- a/ext/oci8/tests/bind_sqltint.phpt
+++ b/ext/oci8/tests/bind_sqltint.phpt
@@ -123,6 +123,88 @@ oci_execute($s);
check_col($c, 'number_t92', 150);
+echo "\nTEST151 - 159 Initialization tests\n";
+
+$s = oci_parse($c, "begin :p2 := :p1; end;");
+unset($p1);
+unset($p2);
+oci_bind_by_name($s, ":p1", $p1, 10);
+oci_bind_by_name($s, ":p2", $p2, -1, SQLT_INT);
+oci_execute($s);
+var_dump($p2);
+
+echo "\nTEST152\n";
+
+unset($p1);
+$p2 = null;
+oci_bind_by_name($s, ":p1", $p1, 10);
+oci_bind_by_name($s, ":p2", $p2, -1, SQLT_INT);
+oci_execute($s);
+var_dump($p2);
+
+echo "\nTEST153\n";
+
+unset($p1);
+$p2 = ;
+oci_bind_by_name($s, ":p1", $p1, 10);
+oci_bind_by_name($s, ":p2", $p2, -1, SQLT_INT);
+oci_execute($s);
+var_dump($p2);
+
+echo "\nTEST154\n";
+
+$p1 = null;
+unset($p2);
+oci_bind_by_name($s, ":p1", $p1, 10);
+oci_bind_by_name($s, ":p2", $p2, -1, SQLT_INT);
+oci_execute($s);
+var_dump($p2);
+
+echo "\nTEST155\n";
+
+$p1 = null;
+$p2 = null;
+oci_bind_by_name($s, ":p1", $p1, 10);
+oci_bind_by_name($s, ":p2", $p2, -1, SQLT_INT);
+oci_execute($s);
+var_dump($p2);
+
+echo "\nTEST156\n";
+
+$p1 = null;
+$p2 = ;
+oci_bind_by_name($s, ":p1", $p1, 10);
+oci_bind_by_name($s, ":p2", $p2, -1, SQLT_INT);
+oci_execute($s);
+var_dump($p2);
+
+echo "\nTEST157\n";
+
+$p1 = ;
+unset($p2);
+oci_bind_by_name($s, ":p1", $p1, 10);
+oci_bind_by_name($s, ":p2", $p2, -1, SQLT_INT);
+oci_execute($s);
+var_dump($p2);
+
+echo "\nTEST158\n";
+
+$p1 = ;
+$p2 = null;
+oci_bind_by_name($s, ":p1", $p1, 10);
+oci_bind_by_name($s, ":p2", $p2, -1, SQLT_INT);
+oci_execute($s);
+var_dump($p2);
+
+echo "\nTEST159\n";
+
+$p1 = ;
+$p2 = ;
+oci_bind_by_name($s, ":p1", $p1, 10);
+oci_bind_by_name($s, ":p2", $p2, -1, SQLT_INT);
+oci_execute($s);
+var_dump($p2);
+
// Clean up
$stmtarray = array(
@@ -224,4 +306,31 @@ array(1) {
string(1) "0"
}
}
+
+TEST151 - 159 Initialization tests
+NULL
+
+TEST152
+NULL
+
+TEST153
+NULL
+
+TEST154
+NULL
+
+TEST155
+NULL
+
+TEST156
+NULL
+
+TEST157
+int()
+
+TEST158
+int()
+
+TEST159
+int()
===DONE===
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Add initialization tests for SQLT_INT binds: ext/oci8/tests/bind_sqltint.phpt
Commit:7164175e8576144562d9062c4625bcbaa4d670e2
Author:Christopher Jones Wed, 21 Mar 2012 16:12:28
-0700
Parents: 1a0b0ead145deb150f9efb6004534018b5af3a35
Branches: PHP-5.3
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=7164175e8576144562d9062c4625bcbaa4d670e2
Log:
Add initialization tests for SQLT_INT binds
Added tests for SQLT_INT binds particularly to check for uninitialized
variables.
Changed paths:
M ext/oci8/tests/bind_sqltint.phpt
Diff:
7164175e8576144562d9062c4625bcbaa4d670e2
diff --git a/ext/oci8/tests/bind_sqltint.phpt b/ext/oci8/tests/bind_sqltint.phpt
index f01791d..ac8518e 100644
--- a/ext/oci8/tests/bind_sqltint.phpt
+++ b/ext/oci8/tests/bind_sqltint.phpt
@@ -123,6 +123,88 @@ oci_execute($s);
check_col($c, 'number_t92', 150);
+echo "\nTEST151 - 159 Initialization tests\n";
+
+$s = oci_parse($c, "begin :p2 := :p1; end;");
+unset($p1);
+unset($p2);
+oci_bind_by_name($s, ":p1", $p1, 10);
+oci_bind_by_name($s, ":p2", $p2, -1, SQLT_INT);
+oci_execute($s);
+var_dump($p2);
+
+echo "\nTEST152\n";
+
+unset($p1);
+$p2 = null;
+oci_bind_by_name($s, ":p1", $p1, 10);
+oci_bind_by_name($s, ":p2", $p2, -1, SQLT_INT);
+oci_execute($s);
+var_dump($p2);
+
+echo "\nTEST153\n";
+
+unset($p1);
+$p2 = ;
+oci_bind_by_name($s, ":p1", $p1, 10);
+oci_bind_by_name($s, ":p2", $p2, -1, SQLT_INT);
+oci_execute($s);
+var_dump($p2);
+
+echo "\nTEST154\n";
+
+$p1 = null;
+unset($p2);
+oci_bind_by_name($s, ":p1", $p1, 10);
+oci_bind_by_name($s, ":p2", $p2, -1, SQLT_INT);
+oci_execute($s);
+var_dump($p2);
+
+echo "\nTEST155\n";
+
+$p1 = null;
+$p2 = null;
+oci_bind_by_name($s, ":p1", $p1, 10);
+oci_bind_by_name($s, ":p2", $p2, -1, SQLT_INT);
+oci_execute($s);
+var_dump($p2);
+
+echo "\nTEST156\n";
+
+$p1 = null;
+$p2 = ;
+oci_bind_by_name($s, ":p1", $p1, 10);
+oci_bind_by_name($s, ":p2", $p2, -1, SQLT_INT);
+oci_execute($s);
+var_dump($p2);
+
+echo "\nTEST157\n";
+
+$p1 = ;
+unset($p2);
+oci_bind_by_name($s, ":p1", $p1, 10);
+oci_bind_by_name($s, ":p2", $p2, -1, SQLT_INT);
+oci_execute($s);
+var_dump($p2);
+
+echo "\nTEST158\n";
+
+$p1 = ;
+$p2 = null;
+oci_bind_by_name($s, ":p1", $p1, 10);
+oci_bind_by_name($s, ":p2", $p2, -1, SQLT_INT);
+oci_execute($s);
+var_dump($p2);
+
+echo "\nTEST159\n";
+
+$p1 = ;
+$p2 = ;
+oci_bind_by_name($s, ":p1", $p1, 10);
+oci_bind_by_name($s, ":p2", $p2, -1, SQLT_INT);
+oci_execute($s);
+var_dump($p2);
+
// Clean up
$stmtarray = array(
@@ -224,4 +306,31 @@ array(1) {
string(1) "0"
}
}
+
+TEST151 - 159 Initialization tests
+NULL
+
+TEST152
+NULL
+
+TEST153
+NULL
+
+TEST154
+NULL
+
+TEST155
+NULL
+
+TEST156
+NULL
+
+TEST157
+int()
+
+TEST158
+int()
+
+TEST159
+int()
===DONE===
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Add initialization tests for SQLT_INT binds: ext/oci8/tests/bind_sqltint.phpt
Commit:fe5785d92b8b68843a4076ed7af5bf639ac15bc4
Author:Christopher Jones Wed, 21 Mar 2012 16:12:28
-0700
Parents: cb4e82a1cc16457da224dd045842583c69bfa00e
Branches: PHP-5.4
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=fe5785d92b8b68843a4076ed7af5bf639ac15bc4
Log:
Add initialization tests for SQLT_INT binds
Added tests for SQLT_INT binds particularly to check for uninitialized
variables.
Changed paths:
M ext/oci8/tests/bind_sqltint.phpt
Diff:
fe5785d92b8b68843a4076ed7af5bf639ac15bc4
diff --git a/ext/oci8/tests/bind_sqltint.phpt b/ext/oci8/tests/bind_sqltint.phpt
index f01791d..ac8518e 100644
--- a/ext/oci8/tests/bind_sqltint.phpt
+++ b/ext/oci8/tests/bind_sqltint.phpt
@@ -123,6 +123,88 @@ oci_execute($s);
check_col($c, 'number_t92', 150);
+echo "\nTEST151 - 159 Initialization tests\n";
+
+$s = oci_parse($c, "begin :p2 := :p1; end;");
+unset($p1);
+unset($p2);
+oci_bind_by_name($s, ":p1", $p1, 10);
+oci_bind_by_name($s, ":p2", $p2, -1, SQLT_INT);
+oci_execute($s);
+var_dump($p2);
+
+echo "\nTEST152\n";
+
+unset($p1);
+$p2 = null;
+oci_bind_by_name($s, ":p1", $p1, 10);
+oci_bind_by_name($s, ":p2", $p2, -1, SQLT_INT);
+oci_execute($s);
+var_dump($p2);
+
+echo "\nTEST153\n";
+
+unset($p1);
+$p2 = ;
+oci_bind_by_name($s, ":p1", $p1, 10);
+oci_bind_by_name($s, ":p2", $p2, -1, SQLT_INT);
+oci_execute($s);
+var_dump($p2);
+
+echo "\nTEST154\n";
+
+$p1 = null;
+unset($p2);
+oci_bind_by_name($s, ":p1", $p1, 10);
+oci_bind_by_name($s, ":p2", $p2, -1, SQLT_INT);
+oci_execute($s);
+var_dump($p2);
+
+echo "\nTEST155\n";
+
+$p1 = null;
+$p2 = null;
+oci_bind_by_name($s, ":p1", $p1, 10);
+oci_bind_by_name($s, ":p2", $p2, -1, SQLT_INT);
+oci_execute($s);
+var_dump($p2);
+
+echo "\nTEST156\n";
+
+$p1 = null;
+$p2 = ;
+oci_bind_by_name($s, ":p1", $p1, 10);
+oci_bind_by_name($s, ":p2", $p2, -1, SQLT_INT);
+oci_execute($s);
+var_dump($p2);
+
+echo "\nTEST157\n";
+
+$p1 = ;
+unset($p2);
+oci_bind_by_name($s, ":p1", $p1, 10);
+oci_bind_by_name($s, ":p2", $p2, -1, SQLT_INT);
+oci_execute($s);
+var_dump($p2);
+
+echo "\nTEST158\n";
+
+$p1 = ;
+$p2 = null;
+oci_bind_by_name($s, ":p1", $p1, 10);
+oci_bind_by_name($s, ":p2", $p2, -1, SQLT_INT);
+oci_execute($s);
+var_dump($p2);
+
+echo "\nTEST159\n";
+
+$p1 = ;
+$p2 = ;
+oci_bind_by_name($s, ":p1", $p1, 10);
+oci_bind_by_name($s, ":p2", $p2, -1, SQLT_INT);
+oci_execute($s);
+var_dump($p2);
+
// Clean up
$stmtarray = array(
@@ -224,4 +306,31 @@ array(1) {
string(1) "0"
}
}
+
+TEST151 - 159 Initialization tests
+NULL
+
+TEST152
+NULL
+
+TEST153
+NULL
+
+TEST154
+NULL
+
+TEST155
+NULL
+
+TEST156
+NULL
+
+TEST157
+int()
+
+TEST158
+int()
+
+TEST159
+int()
===DONE===
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: More changes to README: ext/oci8/README
Commit:f402ca23d3d9bebc53a81a787864f0b7e874d43b Author:Christopher Jones Thu, 22 Mar 2012 14:28:33 -0700 Parents: 7164175e8576144562d9062c4625bcbaa4d670e2 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f402ca23d3d9bebc53a81a787864f0b7e874d43b Log: More changes to README Changed paths: M ext/oci8/README Diff: f402ca23d3d9bebc53a81a787864f0b7e874d43b diff --git a/ext/oci8/README b/ext/oci8/README index db7db57..6ec2de7 100644 --- a/ext/oci8/README +++ b/ext/oci8/README @@ -8,5 +8,4 @@ with Oracle 10.2 libraries can connect to Oracle Database 9.2 onwards. This release of OCI8 can be used with PHP versions 4.3.9 to 5.x. -OCI8 installation instructions and documentation is available at -http://www.php.net/oci8 +OCI8 documentation is available at http://www.php.net/oci8 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Update README: ext/oci8/README
Commit:968a3302203197600d9ba342183583182b1d42cf Author:Christopher Jones Tue, 27 Mar 2012 11:19:33 -0700 Parents: da85d5b4a00943a267db910299bdaee04c081c25 Branches: PHP-5.3 PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=968a3302203197600d9ba342183583182b1d42cf Log: Update README More updates to OCI8 README as an excuse to try the PHP multi-dir git workflow instructions. Changed paths: M ext/oci8/README Diff: 968a3302203197600d9ba342183583182b1d42cf diff --git a/ext/oci8/README b/ext/oci8/README index db7db57..420d5da 100644 --- a/ext/oci8/README +++ b/ext/oci8/README @@ -1,12 +1,13 @@ The OCI8 Extension -- -The OCI8 extension allows PHP to access Oracle Database. It can be -built using Oracle 9.2, 10, or 11 client libraries. It allows -Oracle's standard cross-version connectivity. For example PHP linked -with Oracle 10.2 libraries can connect to Oracle Database 9.2 onwards. +Use the OCI8 extension to access Oracle Database. -This release of OCI8 can be used with PHP versions 4.3.9 to 5.x. +Documentation is at http://php.net/oci8 -OCI8 installation instructions and documentation is available at -http://www.php.net/oci8 +The extension can be built with PHP versions 4.3.9 to 5.x using Oracle +9.2, 10, or 11 client libraries. Oracle's standard cross-version +connectivity applies. For example PHP linked with Oracle 11.2 client +libraries can connect to Oracle Database 9.2 onwards. See Oracle's +note "Oracle Client / Server Interoperability Support" (ID 207303.1) +for details. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Add php.ini parameter checks for OCI8: ext/oci8/tests/ini_1.phpt
Commit:c56cfbd2342af647ea2a7dc03e4f378087bc285d Author:Christopher Jones Fri, 30 Mar 2012 16:12:25 -0700 Parents: 6b4112c98aa27e72ee5b9d4d130049f4876e1f45 Branches: PHP-5.3 PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c56cfbd2342af647ea2a7dc03e4f378087bc285d Log: Add php.ini parameter checks for OCI8 Add tests for OCI8 php.ini parameters particularly to check which parameters can be changes with ini_set(). Changed paths: A ext/oci8/tests/ini_1.phpt Diff: c56cfbd2342af647ea2a7dc03e4f378087bc285d diff --git a/ext/oci8/tests/ini_1.phpt b/ext/oci8/tests/ini_1.phpt new file mode 100644 index 000..4c23b72 --- /dev/null +++ b/ext/oci8/tests/ini_1.phpt @@ -0,0 +1,82 @@ +--TEST-- +Test OCI8 php.ini settings +--SKIPIF-- + +--INI-- +oci8.privileged_connect = On +oci8.max_persistent = 111 +oci8.persistent_timeout = 222 +oci8.ping_interval = 333 +oci8.connection_class = MyCC +oci8.events = On +oci8.statement_cache_size = 444 +oci8.default_prefetch = 555 +oci8.old_oci_close_semantics = On +--FILE-- + +===DONE=== + +--EXPECTF-- +Test 1 - check initialization +oci8.privileged_connect = 1 +oci8.max_persistent = 111 +oci8.persistent_timeout = 222 +oci8.ping_interval = 333 +oci8.connection_class = MyCC +oci8.events = 1 +oci8.statement_cache_size = 444 +oci8.default_prefetch = 555 +oci8.old_oci_close_semantics = 1 +Test 2 - check what can be changed at runtime +bool(false) +oci8.privileged_connect = 1 +bool(false) +oci8.max_persistent = 111 +bool(false) +oci8.persistent_timeout = 222 +bool(false) +oci8.ping_interval = 333 +string(4) "MyCC" +oci8.connection_class = OtherCC +bool(false) +oci8.events = 1 +bool(false) +oci8.statement_cache_size = 444 +bool(false) +oci8.default_prefetch = 555 +bool(false) +oci8.old_oci_close_semantics = 1 +===DONE=== -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] com php-src: Fixed bug in new stream_get_line() when using NUL as a delimiter.: ext/standard/tests/streams/stream_get_line_NUL_delimiter.phpt main/streams/streams.c
On 4/7/12 8:32 AM, Gustavo André dos Santos Lopes wrote: Commit:0f180a63ebb2d65bbe49b68d2430639b20443e9a Author:Gustavo André dos Santos Lopes Sat, 7 Apr 2012 16:32:19 +0100 Parents: 9bf8cd4b3437f6335e20843c9e3668b44761feba Branches: PHP-5.3 PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=0f180a63ebb2d65bbe49b68d2430639b20443e9a Log: Fixed bug in new stream_get_line() when using NUL as a delimiter. This is the issue Derick spotted a few days ago.. Changed paths: A ext/standard/tests/streams/stream_get_line_NUL_delimiter.phpt M main/streams/streams.c Can you add a NEWS entry? Thanks, Chris -- Email: christopher.jo...@oracle.com Tel: +1 650 506 8630 Blog: http://blogs.oracle.com/opal/ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] com php-src: Fix bug #61660: bin2hex(hex2bin($data)) != $data: NEWS ext/standard/string.c ext/standard/tests/strings/bug61660.phpt
On 04/08/2012 01:36 PM, Nikita Popov wrote: Fix bug #61660: bin2hex(hex2bin($data)) != $data If the input data has an odd length a warning is thrown and false is returned. +++ b/ext/standard/tests/strings/bug61660.phpt @@ -0,0 +1,11 @@ +--TEST-- +Bug #61660: bin2hex(hex2bin($data)) != $data +--FILE-- + +--EXPECTF-- +Warning: hex2bin(): Hexadecimal input string must have an even length in %s on line %d +bool(false) I didn't follow the IRC discussion on this, but why are we now discriminating against odd length values? There is nothing in the doc to indicate they can't be used, so this might cause some breakage for what gain? From a purely mathematical standpoint 'A' (for example) is a hexadecimal number of odd length. Why can't this be accepted? Chris -- Email: christopher.jo...@oracle.com Tel: +1 650 506 8630 Blog: http://blogs.oracle.com/opal/ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Fix masking in bug61115-1.phpt: ext/standard/tests/streams/bug61115-1.phpt
Commit:c864b1ca2f7bfaee43795085df7ee5b739c9aa5f Author:Christopher Jones Tue, 1 May 2012 14:32:09 -0700 Parents: d26e006d7f01db6fab3942ebbf073beaabf57e2d Branches: PHP-5.3 PHP-5.4 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c864b1ca2f7bfaee43795085df7ee5b739c9aa5f Log: Fix masking in bug61115-1.phpt The test bug61115-1.phpt was diffing for non-debug builds Bugs: https://bugs.php.net/61115 Changed paths: M ext/standard/tests/streams/bug61115-1.phpt Diff: diff --git a/ext/standard/tests/streams/bug61115-1.phpt b/ext/standard/tests/streams/bug61115-1.phpt index 573496e..89374e7 100644 --- a/ext/standard/tests/streams/bug61115-1.phpt +++ b/ext/standard/tests/streams/bug61115-1.phpt @@ -8,4 +8,4 @@ stream_context_get_options($fileResourceTemp); ftruncate($fileResourceTemp, PHP_INT_MAX); ?> --EXPECTF-- -Fatal error: Allowed memory size of %d bytes exhausted %s (tried to allocate %d bytes) in %s on line %d +Fatal error: Allowed memory size of %d bytes exhausted%s(tried to allocate %d bytes) in %s on line %d -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Make output order for dom007.phpt platform independent: ext/dom/tests/dom007.phpt
Commit:d14f23365cda4e830aa09fcf1d64c07c4fde21c9
Author:Christopher Jones Tue, 1 May 2012 15:43:31
-0700
Parents: 02e25df8b5a7c60364c7153c03da59de3a556a87
Branches: PHP-5.3 PHP-5.4 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=d14f23365cda4e830aa09fcf1d64c07c4fde21c9
Log:
Make output order for dom007.phpt platform independent
This test has long been near the top of the reported output diffs.
For example, on http://qa.php.net/reports/?version=5.4.0 it has diffed
1307 times out of 3543 reports, at time of this commit. (The second
highest diff has occurred 710 times.)
Changed paths:
M ext/dom/tests/dom007.phpt
Diff:
diff --git a/ext/dom/tests/dom007.phpt b/ext/dom/tests/dom007.phpt
index 649d630..5d12aa3 100644
--- a/ext/dom/tests/dom007.phpt
+++ b/ext/dom/tests/dom007.phpt
@@ -63,12 +63,24 @@ echo "\n";
$ents = $dtd->entities;
$length = $ents->length;
echo "Length: ".$length."\n";
+
+$xkeys = array();
foreach ($ents AS $key=>$node) {
- echo "Key: $key Name: ".$node->nodeName."\n";
+ $xkeys[] = "Key: $key Name: ".$node->nodeName."\n";
+}
+sort($xkeys); // fix inconsistent output ordering (bug #61810)
+foreach ($xkeys as $key => $node) {
+ echo $node;
}
echo "\n";
+
+$xkeys = array();
for($x=0; $x < $length; $x++) {
- echo "Index $x: ".$ents->item($x)->nodeName."\n";
+ $xkeys[] = "Index: ".$ents->item($x)->nodeName."\n";
+}
+sort($xkeys); // fix inconsistent output ordering (bug #61810)
+foreach ($xkeys as $key => $node) {
+ echo $node;
}
echo "\n";
@@ -87,13 +99,13 @@ Index 0: GIF (image/gif) (-)
NULL
Length: 3
-Key: test Name: test
-Key: rdf Name: rdf
Key: myimage Name: myimage
+Key: rdf Name: rdf
+Key: test Name: test
-Index 0: test
-Index 1: rdf
-Index 2: myimage
+Index: myimage
+Index: rdf
+Index: test
NULL
NULL
--
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.3' into PHP-5.4: configure.in main/php_version.h
Commit:31ab04ee25bc9d4edfa524c2a11a33f8cbc8d1b6
Author:Christopher Jones Thu, 3 May 2012 12:22:39
-0700
Parents: 72f19e9a8bcf5712b24fa333a26616eff19ac1ce
0956c00af999c295c5a13644ec835da8f96ad48d
Branches: PHP-5.4
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=31ab04ee25bc9d4edfa524c2a11a33f8cbc8d1b6
Log:
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Bump to next version
Conflicts:
configure.in
main/php_version.h
Changed paths:
MM configure.in
MM main/php_version.h
Diff:
diff --cc configure.in
index edc2455,b257cbb..3d529c6
--- a/configure.in
+++ b/configure.in
@@@ -17,109 -38,10 +17,109 @@@ PHP_CONFIG_NICE(config.nice
PHP_CANONICAL_HOST_TARGET
AC_CONFIG_HEADER(main/php_config.h)
+AH_TOP([
+#if defined(__GNUC__) && __GNUC__ >= 4
+# define ZEND_API __attribute__ ((visibility("default")))
+# define ZEND_DLEXPORT __attribute__ ((visibility("default")))
+#else
+# define ZEND_API
+# define ZEND_DLEXPORT
+#endif
+
+#define ZEND_DLIMPORT
+
+#undef uint
+#undef ulong
+
+/* Define if you want to enable memory limit support */
+#define MEMORY_LIMIT 0
+])
+AH_BOTTOM([
+#ifndef ZEND_ACCONFIG_H_NO_C_PROTOS
+
+#ifdef HAVE_STDLIB_H
+# include
+#endif
+
+#ifdef HAVE_SYS_TYPES_H
+# include
+#endif
+
+#ifdef HAVE_SYS_SELECT_H
+#include
+#endif
+
+#ifdef HAVE_IEEEFP_H
+# include
+#endif
+
+#ifdef HAVE_STRING_H
+# include
+#else
+# include
+#endif
+
+#if ZEND_BROKEN_SPRINTF
+int zend_sprintf(char *buffer, const char *format, ...);
+#else
+# define zend_sprintf sprintf
+#endif
+
+#include
+
+/* To enable the is_nan, is_infinite and is_finite PHP functions */
+#ifdef NETWARE
+ #define HAVE_ISNAN 1
+ #define HAVE_ISINF 1
+ #define HAVE_ISFINITE 1
+#endif
+
+#ifndef zend_isnan
+#ifdef HAVE_ISNAN
+#define zend_isnan(a) isnan(a)
+#elif defined(HAVE_FPCLASS)
+#define zend_isnan(a) ((fpclass(a) == FP_SNAN) || (fpclass(a) == FP_QNAN))
+#else
+#define zend_isnan(a) 0
+#endif
+#endif
+
+#ifdef HAVE_ISINF
+#define zend_isinf(a) isinf(a)
+#elif defined(INFINITY)
+/* Might not work, but is required by ISO C99 */
+#define zend_isinf(a) (((a)==INFINITY)?1:0)
+#elif defined(HAVE_FPCLASS)
+#define zend_isinf(a) ((fpclass(a) == FP_PINF) || (fpclass(a) == FP_NINF))
+#else
+#define zend_isinf(a) 0
+#endif
+
+#ifdef HAVE_FINITE
+#define zend_finite(a) finite(a)
+#elif defined(HAVE_ISFINITE) || defined(isfinite)
+#define zend_finite(a) isfinite(a)
+#elif defined(fpclassify)
+#define zend_finite(a)
((fpclassify((a))!=FP_INFINITE&&fpclassify((a))!=FP_NAN)?1:0)
+#else
+#define zend_finite(a) (zend_isnan(a) ? 0 : zend_isinf(a) ? 0 : 1)
+#endif
+
+#endif /* ifndef ZEND_ACCONFIG_H_NO_C_PROTOS */
+
+#ifdef NETWARE
+#ifdef USE_WINSOCK
+#/*This detection against winsock is of no use*/ undef HAVE_SOCKLEN_T
+#/*This detection against winsock is of no use*/ undef HAVE_SYS_SOCKET_H
+#endif
+#endif
+
+#undef PTHREADS
+])
PHP_MAJOR_VERSION=5
-PHP_MINOR_VERSION=3
-PHP_RELEASE_VERSION=13
+PHP_MINOR_VERSION=4
- PHP_RELEASE_VERSION=2
++PHP_RELEASE_VERSION=3
PHP_EXTRA_VERSION="-dev"
PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION"
PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 1 + [$]PHP_MINOR_VERSION \*
100 + [$]PHP_RELEASE_VERSION`
diff --cc main/php_version.h
index 13478d1,358c6c0..3e80008
--- a/main/php_version.h
+++ b/main/php_version.h
@@@ -1,8 -1,8 +1,8 @@@
/* automatically generated by configure */
/* edit configure.in to change version number */
#define PHP_MAJOR_VERSION 5
-#define PHP_MINOR_VERSION 3
-#define PHP_RELEASE_VERSION 13
+#define PHP_MINOR_VERSION 4
- #define PHP_RELEASE_VERSION 2
++#define PHP_RELEASE_VERSION 3
#define PHP_EXTRA_VERSION "-dev"
- #define PHP_VERSION "5.4.2-dev"
- #define PHP_VERSION_ID 50402
-#define PHP_VERSION "5.3.13-dev"
-#define PHP_VERSION_ID 50313
++#define PHP_VERSION "5.4.3-dev"
++#define PHP_VERSION_ID 50403
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: configure.in main/php_version.h
Whoops - something went wrong here.
On 05/03/2012 12:22 PM, Christopher Jones wrote:
Commit:31ab04ee25bc9d4edfa524c2a11a33f8cbc8d1b6
Author:Christopher Jones Thu, 3 May 2012 12:22:39
-0700
Parents: 72f19e9a8bcf5712b24fa333a26616eff19ac1ce
0956c00af999c295c5a13644ec835da8f96ad48d
Branches: PHP-5.4
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=31ab04ee25bc9d4edfa524c2a11a33f8cbc8d1b6
Log:
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Bump to next version
Conflicts:
configure.in
main/php_version.h
Changed paths:
MM configure.in
MM main/php_version.h
Diff:
diff --cc configure.in
index edc2455,b257cbb..3d529c6
--- a/configure.in
+++ b/configure.in
@@@ -17,109 -38,10 +17,109 @@@ PHP_CONFIG_NICE(config.nice
PHP_CANONICAL_HOST_TARGET
AC_CONFIG_HEADER(main/php_config.h)
+AH_TOP([
+#if defined(__GNUC__)&& __GNUC__>= 4
+# define ZEND_API __attribute__ ((visibility("default")))
+# define ZEND_DLEXPORT __attribute__ ((visibility("default")))
+#else
+# define ZEND_API
+# define ZEND_DLEXPORT
+#endif
+
+#define ZEND_DLIMPORT
+
+#undef uint
+#undef ulong
+
+/* Define if you want to enable memory limit support */
+#define MEMORY_LIMIT 0
+])
+AH_BOTTOM([
+#ifndef ZEND_ACCONFIG_H_NO_C_PROTOS
+
+#ifdef HAVE_STDLIB_H
+# include
+#endif
+
+#ifdef HAVE_SYS_TYPES_H
+# include
+#endif
+
+#ifdef HAVE_SYS_SELECT_H
+#include
+#endif
+
+#ifdef HAVE_IEEEFP_H
+# include
+#endif
+
+#ifdef HAVE_STRING_H
+# include
+#else
+# include
+#endif
+
+#if ZEND_BROKEN_SPRINTF
+int zend_sprintf(char *buffer, const char *format, ...);
+#else
+# define zend_sprintf sprintf
+#endif
+
+#include
+
+/* To enable the is_nan, is_infinite and is_finite PHP functions */
+#ifdef NETWARE
+ #define HAVE_ISNAN 1
+ #define HAVE_ISINF 1
+ #define HAVE_ISFINITE 1
+#endif
+
+#ifndef zend_isnan
+#ifdef HAVE_ISNAN
+#define zend_isnan(a) isnan(a)
+#elif defined(HAVE_FPCLASS)
+#define zend_isnan(a) ((fpclass(a) == FP_SNAN) || (fpclass(a) == FP_QNAN))
+#else
+#define zend_isnan(a) 0
+#endif
+#endif
+
+#ifdef HAVE_ISINF
+#define zend_isinf(a) isinf(a)
+#elif defined(INFINITY)
+/* Might not work, but is required by ISO C99 */
+#define zend_isinf(a) (((a)==INFINITY)?1:0)
+#elif defined(HAVE_FPCLASS)
+#define zend_isinf(a) ((fpclass(a) == FP_PINF) || (fpclass(a) == FP_NINF))
+#else
+#define zend_isinf(a) 0
+#endif
+
+#ifdef HAVE_FINITE
+#define zend_finite(a) finite(a)
+#elif defined(HAVE_ISFINITE) || defined(isfinite)
+#define zend_finite(a) isfinite(a)
+#elif defined(fpclassify)
+#define zend_finite(a)
((fpclassify((a))!=FP_INFINITE&&fpclassify((a))!=FP_NAN)?1:0)
+#else
+#define zend_finite(a) (zend_isnan(a) ? 0 : zend_isinf(a) ? 0 : 1)
+#endif
+
+#endif /* ifndef ZEND_ACCONFIG_H_NO_C_PROTOS */
+
+#ifdef NETWARE
+#ifdef USE_WINSOCK
+#/*This detection against winsock is of no use*/ undef HAVE_SOCKLEN_T
+#/*This detection against winsock is of no use*/ undef HAVE_SYS_SOCKET_H
+#endif
+#endif
+
+#undef PTHREADS
+])
PHP_MAJOR_VERSION=5
-PHP_MINOR_VERSION=3
-PHP_RELEASE_VERSION=13
+PHP_MINOR_VERSION=4
- PHP_RELEASE_VERSION=2
++PHP_RELEASE_VERSION=3
PHP_EXTRA_VERSION="-dev"
PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION"
PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 1 + [$]PHP_MINOR_VERSION \*
100 + [$]PHP_RELEASE_VERSION`
diff --cc main/php_version.h
index 13478d1,358c6c0..3e80008
--- a/main/php_version.h
+++ b/main/php_version.h
@@@ -1,8 -1,8 +1,8 @@@
/* automatically generated by configure */
/* edit configure.in to change version number */
#define PHP_MAJOR_VERSION 5
-#define PHP_MINOR_VERSION 3
-#define PHP_RELEASE_VERSION 13
+#define PHP_MINOR_VERSION 4
- #define PHP_RELEASE_VERSION 2
++#define PHP_RELEASE_VERSION 3
#define PHP_EXTRA_VERSION "-dev"
- #define PHP_VERSION "5.4.2-dev"
- #define PHP_VERSION_ID 50402
-#define PHP_VERSION "5.3.13-dev"
-#define PHP_VERSION_ID 50313
++#define PHP_VERSION "5.4.3-dev"
++#define PHP_VERSION_ID 50403
--
christopher.jo...@oracle.com
http://twitter.com/#!/ghrd
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] com php-src: Bug 61504 updated libmagic.patch: ext/fileinfo/libmagic.patch
On 03/28/2012 03:06 AM, Anatoliy Belsky wrote: Commit:11f04c3524cc86a5c4cdf748a107801116604184 Author:Anatoliy Belsky Wed, 28 Mar 2012 12:06:09 +0200 Parents: e7fa402c7ccbff8a6ff8af776192416747db0d77 Branches: PHP-5.3 PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=11f04c3524cc86a5c4cdf748a107801116604184 Log: Bug 61504 updated libmagic.patch Bugs: https://bugs.php.net/61504 Changed paths: M ext/fileinfo/libmagic.patch Anatoliy, Pierre, Can you review https://bugs.php.net/bug.php?id=61940 which claims the fix for 61504 broke it. Thanks, Chris -- christopher.jo...@oracle.com http://twitter.com/#!/ghrd -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] com php-src: Bug 61504 updated libmagic.patch: ext/fileinfo/libmagic.patch
On 05/04/2012 11:16 AM, Anatoliy Belsky wrote: Hi Chris, please see my comment in the #61940. Regards Anatoliy Hi Anatoliy, Is this documented on php.net? I agree with Sean that the error messages are useless. Is there anyway PHP can improve on them? Thanks for looking at it, Chris Am Fr, 4.05.2012, 19:16 schrieb Christopher Jones: On 03/28/2012 03:06 AM, Anatoliy Belsky wrote: Commit:11f04c3524cc86a5c4cdf748a107801116604184 Author:Anatoliy Belsky Wed, 28 Mar 2012 12:06:09 +0200 Parents: e7fa402c7ccbff8a6ff8af776192416747db0d77 Branches: PHP-5.3 PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=11f04c3524cc86a5c4cdf748a107801116604184 Log: Bug 61504 updated libmagic.patch Bugs: https://bugs.php.net/61504 Changed paths: M ext/fileinfo/libmagic.patch Anatoliy, Pierre, Can you review https://bugs.php.net/bug.php?id=61940 which claims the fix for 61504 broke it. Thanks, Chris -- christopher.jo...@oracle.com http://twitter.com/#!/ghrd -- christopher.jo...@oracle.com http://twitter.com/#!/ghrd -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] com php-src: Bug 61504 updated libmagic.patch: ext/fileinfo/libmagic.patch
On 05/04/2012 02:22 PM, Anatoliy Belsky wrote: Hi Chris, that's not documented on the php.net yet. I think shortening that notice is a good idea. Probably it should just stop on the first fail and warn about the incompatibility. Cheers Anatoliy Hi Anatoliy, What are the options for reverting this fix (while keeping security)? Do you have an action item to document it the change? (https://edit.php.net/ is a convenient way to update doc) Chris -- christopher.jo...@oracle.com http://twitter.com/#!/ghrd -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] com php-src: Bug 61504 updated libmagic.patch: ext/fileinfo/libmagic.patch
On 05/04/2012 03:10 PM, Sean Coates wrote: What are the options for reverting this fix (while keeping security)? Thanks for the help on this, Anatoliy and Chris. In my opinion, it is too late to revert the new behaviour. This really should never have gone into .11 in the first place. The damage is done; let's not make it worse. Anatoliy, Do you recall why bug 61504 isn't in NEWS? Can you make sure some kind of entry in NEWS mentions the change? Thanks, Chris -- christopher.jo...@oracle.com http://twitter.com/#!/ghrd -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] com php-src: Bug 61504 updated libmagic.patch: ext/fileinfo/libmagic.patch
Hi Anatoliy, I can't see the NEWS entry in the PHP-5.4 or PHP-5.3 heads: http://git.php.net/?p=php-src.git;a=blob_plain;f=NEWS;hb=refs/heads/PHP-5.4 http://git.php.net/?p=php-src.git;a=blob_plain;f=NEWS;hb=refs/heads/PHP-5.3 I can see it in NEWS from the 5.3.12.tar.bz2 bundle. This all reinforces that the PHP NEWS updating process is one of my pet peeves. In any case, the backward compatibility break isn't mentioned - this is the critical thing that should be mentioned to help end users. Chris On 05/04/2012 03:57 PM, Anatoliy Belsky wrote: Chris, it's already in the news http://git.php.net/?p=php-src.git;a=blob;f=NEWS;h=d26ffea8ab357a44e37044193c8b316dfaa61662;hb=704bbb3263d0ec9a6b4a767bbc516e55388f4b0e Regards Anatoliy On Fri, 04 May 2012 15:19:31 -0700 Christopher Jones wrote: On 05/04/2012 03:10 PM, Sean Coates wrote: What are the options for reverting this fix (while keeping security)? Thanks for the help on this, Anatoliy and Chris. In my opinion, it is too late to revert the new behaviour. This really should never have gone into .11 in the first place. The damage is done; let's not make it worse. Anatoliy, Do you recall why bug 61504 isn't in NEWS? Can you make sure some kind of entry in NEWS mentions the change? Thanks, Chris -- christopher.jo...@oracle.com http://twitter.com/#!/ghrd -- christopher.jo...@oracle.com http://twitter.com/#!/ghrd -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] com php-src: Bug 61504 updated libmagic.patch: ext/fileinfo/libmagic.patch
On 05/04/2012 03:53 PM, Anatoliy Belsky wrote: Sean, thanks for reporting that :) Chris, theoretically there were a possibility to apply the patch for 5.04 which was made first (it's attached in #61504) ... but I wouldn't call that quite rational. As Sean mentioned, it's already done. For the current patch 5.11 tests was fixed, some fixes was done over it, and it's released. Besides this, patching for 7 versions forwards wasn't that easy, so the longer it's waiting, the worst it gets. Therefore I'd really suggest here to document this and to make the warnings more meaningful. Hannes, I agree here even more than you :) . But, that was a security conditioned upgrade. The patch for 5.04 has existed shortly before the patch 5.11, but finally the 5.11 one was considered as better. The notices come directly from libmagic, so no wonder some of them are not handled properly (and they were not before). The development was concentrated more on the usage with the compiled in data (as use of the externals is rare), so I think at the end of he day a security fix is worth it. Thanks for the help guys and regards Anatoliy We appreciate your help too. There are some lessons I've learned from this: - BC breaks are bad and should be discussed (maybe this one was, but that would have been on the security list that I'm not on) - clear documentation on any BC breakage is needed - The PHP NEWS updating process is broken. Chris -- christopher.jo...@oracle.com http://twitter.com/#!/ghrd -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Bump to 5.4.4-dev: configure.in main/php_version.h
Commit:d9788dd73f93bc492d8fd6e93051e2a5bc8bec9f Author:Christopher Jones Mon, 14 May 2012 12:43:36 -0700 Parents: a72b21438d053a04c94c6da866692d8db6252616 Branches: PHP-5.4 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d9788dd73f93bc492d8fd6e93051e2a5bc8bec9f Log: Bump to 5.4.4-dev Changed paths: M configure.in M main/php_version.h Diff: diff --git a/configure.in b/configure.in index 3d529c6..ba8b465 100644 --- a/configure.in +++ b/configure.in @@ -119,7 +119,7 @@ int zend_sprintf(char *buffer, const char *format, ...); PHP_MAJOR_VERSION=5 PHP_MINOR_VERSION=4 -PHP_RELEASE_VERSION=3 +PHP_RELEASE_VERSION=4 PHP_EXTRA_VERSION="-dev" PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION" PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 1 + [$]PHP_MINOR_VERSION \* 100 + [$]PHP_RELEASE_VERSION` diff --git a/main/php_version.h b/main/php_version.h index 3e80008..fce469d 100644 --- a/main/php_version.h +++ b/main/php_version.h @@ -2,7 +2,7 @@ /* edit configure.in to change version number */ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 4 -#define PHP_RELEASE_VERSION 3 +#define PHP_RELEASE_VERSION 4 #define PHP_EXTRA_VERSION "-dev" -#define PHP_VERSION "5.4.3-dev" -#define PHP_VERSION_ID 50403 +#define PHP_VERSION "5.4.4-dev" +#define PHP_VERSION_ID 50404 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Dummy (whitespace) change so Dan Brown can verify snap generation from git: UPGRADING
Commit:29a85d49ae02d192f03243636b14845209c0ca0d Author:Christopher Jones Wed, 16 May 2012 10:13:34 -0700 Parents: 89e7a195bc44b60db08646b724da24fe7b90a610 Branches: PHP-5.4 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=29a85d49ae02d192f03243636b14845209c0ca0d Log: Dummy (whitespace) change so Dan Brown can verify snap generation from git PHP snapshots were still pulling from SVN and were out of date. This is a dummy PHP 5.4-only commit so Dan can verify what he's updated for git in the backend. Changed paths: M UPGRADING Diff: diff --git a/UPGRADING b/UPGRADING index 7177a6d..03222ae 100755 --- a/UPGRADING +++ b/UPGRADING @@ -37,9 +37,9 @@ PHP 5.4 UPGRADE NOTES = - PHP 5.4 now checks at compile time if /dev/urandom or /dev/arandom - are present. If either is available, session.entropy_file now + are present. If either is available, session.entropy_file now defaults to that file and session.entropy_length defaults to 32. - This provides non-blocking entropy to session id generation. If you + This provides non-blocking entropy to session id generation. If you do not want extra entropy for your session ids, add: session.entropy_file= @@ -89,9 +89,9 @@ PHP 5.4 UPGRADE NOTES session.upload_progress.min_freq - Added a zend.multibyte directive as a replacement of the PHP compile time - configuration option --enable-zend-multibyte. Now the Zend Engine always + configuration option --enable-zend-multibyte. Now the Zend Engine always contains code for multibyte support, which can be enabled or disabled at - runtime. Note: It doesn't make a lot of sense to enable this option if + runtime. Note: It doesn't make a lot of sense to enable this option if ext/mbstring is not enabled, because most functionality is implemented by mbstrings callbacks. @@ -107,7 +107,7 @@ PHP 5.4 UPGRADE NOTES in a stream fashion (through php://input) without having it copied in memory multiple times. -- Added windows_show_crt_warning. This directive shows the CRT warnings when +- Added windows_show_crt_warning. This directive shows the CRT warnings when enabled. These warnings were displayed by default until now. It is disabled by default. @@ -162,7 +162,7 @@ PHP 5.4 UPGRADE NOTES - Non-numeric string offsets, e.g. $a['foo'] where $a is a string, now return false on isset() and true on empty(), and produce warning if - trying to use them. Offsets of types double, bool and null produce + trying to use them. Offsets of types double, bool and null produce notice. Numeric strings ($a['2']) still work as before. Note that offsets like '12.3' and '5 and a half' are considered @@ -207,7 +207,7 @@ PHP 5.4 UPGRADE NOTES - htmlentities() and htmlspecialchars() are stricter in the code units they accept for the asian encodings. For Big5-HKSCS, the octets 0x80 and 0xFF are - rejected. For GB2312/EUC-CN, the octets 0x8E, 0x8F, 0xA0 and 0xFF are + rejected. For GB2312/EUC-CN, the octets 0x8E, 0x8F, 0xA0 and 0xFF are rejected. For SJIS, the octets 0x80, 0xA0, 0xFD, 0xFE and 0xFF are rejected, except maybe after a valid starting byte. For EUC-JP, the octets 0xA0 and 0xFF are rejected. @@ -233,7 +233,7 @@ PHP 5.4 UPGRADE NOTES checks on the validity of the entities. Numerical entities are checked for a valid range (0 to 0x10); if the flag ENT_DISALLOWED is given, the validity of such numerical entity in the target document type is also - checked. Named entities are checked for necessary existence in the target + checked. Named entities are checked for necessary existence in the target document type instead of only checking whether they were constituted by alphanumeric characters. @@ -431,7 +431,7 @@ d. Removed hash algorithms a. Extensions no longer maintained - ext/sqlite is no longer part of the base distribution and has been moved - to PECL. Use sqlite3 or PDO_SQLITE instead. + to PECL. Use sqlite3 or PDO_SQLITE instead. b. Extensions with changed behavior @@ -485,7 +485,7 @@ b. Extensions with changed behavior === - A REQUEST_TIME_FLOAT value returns a floating point number indicating the - time with microsecond precision. All SAPIs providing this value should be + time with microsecond precision. All SAPIs providing this value should be returning float and not time_t. - apache_child_terminate(), getallheaders(), apache_request_headers() -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] com php-src: Revert change 3f3ad30c50: There shouldn't be new features in 5.3, especially not if they aren't in 5.4, too.: ext/json/json.c ext/json/php_json.h ext/json/tests/bug43941.php
On 07/04/2012 03:55 PM, Johannes Schlüter wrote: Commit:bcc87ba68ede7b90cd544ec0911bdbe5d844aa2a Author:johannes Thu, 5 Jul 2012 00:55:47 +0200 Parents: d80ff391899f7aead3b9b9c6c084adba8a8203ba Branches: PHP-5.3 PHP-5.4 master PHP-5.3.15 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=bcc87ba68ede7b90cd544ec0911bdbe5d844aa2a Log: Revert change 3f3ad30c50: There shouldn't be new features in 5.3, especially not if they aren't in 5.4, too. Changed paths: M ext/json/json.c M ext/json/php_json.h A ext/json/tests/bug43941.phpt M ext/json/tests/bug54058.phpt D ext/json/tests/bug61537.phpt Shouldn't this reversion be mentioned in NEWS? Chris -- christopher.jo...@oracle.com http://twitter.com/#!/ghrd -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Small test tidy up: ext/oci8/tests/details.inc ext/oci8/tests/xmltype_01.phpt
Commit:8c3bf96022ff6fb6be1e7bc87b794cab9e9bf90c
Author:Christopher Jones Tue, 14 Aug 2012 11:41:36
-0700
Parents: 8848778a59ddde777258261a3888baeb3a70dea1
Branches: PHP-5.3 PHP-5.4 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=8c3bf96022ff6fb6be1e7bc87b794cab9e9bf90c
Log:
Small test tidy up
Make some test changes so the tests can be run with the CLI webserver
Changed paths:
M ext/oci8/tests/details.inc
M ext/oci8/tests/xmltype_01.phpt
Diff:
diff --git a/ext/oci8/tests/details.inc b/ext/oci8/tests/details.inc
index 0f03c3a..9a86c46 100644
--- a/ext/oci8/tests/details.inc
+++ b/ext/oci8/tests/details.inc
@@ -45,31 +45,34 @@ if (file_exists(dirname(__FILE__)."/details_local.inc")) {
* Used for creating/dropping schema objects used by a test
*/
-function oci8_test_sql_execute($c, $stmtarray)
-{
- foreach ($stmtarray as $stmt) {
- $s = oci_parse($c, $stmt);
- if (!$s) {
- $m = oci_error($c);
- echo $stmt . PHP_EOL . $m['message'] . PHP_EOL;
- }
- else {
- $r = @oci_execute($s);
- if (!$r) {
- $m = oci_error($s);
- if (!in_array($m['code'], array( // ignore
expected errors
- 942 // table or
view does not exist
- , 1918 // user does
not exist
- , 2024 // database
link not found
- , 2289 // sequence
does not exist
- , 4080 // trigger does
not exist
- , 38802 // edition does
not exist
- ))) {
- echo $stmt . PHP_EOL . $m['message'] .
PHP_EOL;
- }
- }
- }
- }
+if (!function_exists('oci8_test_sql_execute')) {
+function oci8_test_sql_execute($c, $stmtarray)
+{
+foreach ($stmtarray as $stmt) {
+$s = oci_parse($c, $stmt);
+if (!$s) {
+$m = oci_error($c);
+echo $stmt . PHP_EOL . $m['message'] . PHP_EOL;
+}
+else {
+$r = @oci_execute($s);
+if (!$r) {
+$m = oci_error($s);
+if (!in_array($m['code'], array( // ignore expected
errors
+ 942 //
table or view does not exist
+, 1918 // user does not exist
+, 2024 // database link not found
+, 2289 // sequence does not exist
+, 4080 // trigger does not exist
+, 38802 // edition does not exist
+))) {
+echo $stmt . PHP_EOL . $m['message'] . PHP_EOL;
+}
+}
+}
+}
+}
+
}
?>
diff --git a/ext/oci8/tests/xmltype_01.phpt b/ext/oci8/tests/xmltype_01.phpt
index 21aca6c..e31 100644
--- a/ext/oci8/tests/xmltype_01.phpt
+++ b/ext/oci8/tests/xmltype_01.phpt
@@ -5,6 +5,7 @@ Basic XMLType test
if (!extension_loaded("simplexml")) die("skip no simplexml extension");
$target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on
these DBs
require(dirname(__FILE__).'/skipif.inc');
+?>
--FILE--
http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Fix skipifs: ext/oci8/tests/bind_char_2_11gR1.phpt ext/oci8/tests/bind_char_3_11gR1.phpt ext/oci8/tests/bind_char_4_11gR1.phpt
Commit:6524a530dfd3c8766c02f317cc5bf711d561c635
Author:Christopher Jones Tue, 14 Aug 2012 14:10:20
-0700
Parents: 8c3bf96022ff6fb6be1e7bc87b794cab9e9bf90c
Branches: PHP-5.3 PHP-5.4 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=6524a530dfd3c8766c02f317cc5bf711d561c635
Log:
Fix skipifs
Skipifs were referencing an unset variable
Changed paths:
M ext/oci8/tests/bind_char_2_11gR1.phpt
M ext/oci8/tests/bind_char_3_11gR1.phpt
M ext/oci8/tests/bind_char_4_11gR1.phpt
Diff:
diff --git a/ext/oci8/tests/bind_char_2_11gR1.phpt
b/ext/oci8/tests/bind_char_2_11gR1.phpt
index 8bb2873..edb2a12 100644
--- a/ext/oci8/tests/bind_char_2_11gR1.phpt
+++ b/ext/oci8/tests/bind_char_2_11gR1.phpt
@@ -5,7 +5,7 @@ SELECT oci_bind_by_name with SQLT_AFC aka CHAR and dates
if (!extension_loaded('oci8')) die ("skip no oci8 extension");
require(dirname(__FILE__)."/connect.inc");
// The bind buffer size edge cases seem to change each DB version.
-if (preg_match('/Release 11\.1\./', $sv, $matches) !== 1) {
+if (preg_match('/Release 11\.1\./', oci_server_version($c), $matches) !== 1) {
if (preg_match('/Release 11\.2\.0\.3/', oci_server_version($c), $matches)
!== 1) {
die("skip expected output only valid when using Oracle 11gR1 or
11.2.0.3 databases");
}
diff --git a/ext/oci8/tests/bind_char_3_11gR1.phpt
b/ext/oci8/tests/bind_char_3_11gR1.phpt
index 4c6241c..fea7775 100644
--- a/ext/oci8/tests/bind_char_3_11gR1.phpt
+++ b/ext/oci8/tests/bind_char_3_11gR1.phpt
@@ -5,7 +5,7 @@ PL/SQL oci_bind_by_name with SQLT_AFC aka CHAR to CHAR parameter
if (!extension_loaded('oci8')) die ("skip no oci8 extension");
require(dirname(__FILE__)."/connect.inc");
// The bind buffer size edge cases seem to change each DB version.
-if (preg_match('/Release 11\.1\./', $sv, $matches) !== 1) {
+if (preg_match('/Release 11\.1\./', oci_server_version($c), $matches) !== 1) {
if (preg_match('/Release 11\.2\.0\.3/', oci_server_version($c), $matches)
!== 1) {
die("skip expected output only valid when using Oracle 11gR1 or
11.2.0.3 databases");
}
diff --git a/ext/oci8/tests/bind_char_4_11gR1.phpt
b/ext/oci8/tests/bind_char_4_11gR1.phpt
index 14d5878..2bc2f14 100644
--- a/ext/oci8/tests/bind_char_4_11gR1.phpt
+++ b/ext/oci8/tests/bind_char_4_11gR1.phpt
@@ -5,7 +5,7 @@ PL/SQL oci_bind_by_name with SQLT_AFC aka CHAR to VARCHAR2
parameter
if (!extension_loaded('oci8')) die ("skip no oci8 extension");
require(dirname(__FILE__)."/connect.inc");
// The bind buffer size edge cases seem to change each DB version.
-if (preg_match('/Release 11\.1\./', $sv, $matches) !== 1) {
+if (preg_match('/Release 11\.1\./', oci_server_version($c), $matches) !== 1) {
if (preg_match('/Release 11\.2\.0\.3/', oci_server_version($c), $matches)
!== 1) {
die("skip expected output only valid when using Oracle 11gR1 or
11.2.0.3 databases");
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] com php-src: Added test for bug #51353. It'll be skipped by default and must be activated manually.: ext/zip/tests/bug51353.phpt
On 8/21/12 4:22 AM, Anatoliy Belsky wrote: Commit:92153dcfe3f7643526572439622408d94fd4aa14 Author:Anatoliy Belsky Tue, 21 Aug 2012 13:22:00 +0200 Parents: 0cdc1f5626bd400278aa193867e1fd4fe3f771d4 Branches: PHP-5.3 PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=92153dcfe3f7643526572439622408d94fd4aa14 Log: Added test for bug #51353. It'll be skipped by default and must be activated manually. +/* This test might get very long depending on the mashine it's running on. Therefore +adding an explicit skip, remove it to run this test. */ What about enabling it unless SKIP_SLOW_TESTS is set? Chris -- christopher.jo...@oracle.com http://twitter.com/#!/ghrd -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] com php-src: Merge branch 'generators': Zend/zend_compile.c Zend/zend_compile.h
On 09/01/2012 10:07 AM, Gustavo André dos Santos Lopes wrote: Commit:53351d087dfa94569a7a65b9f4167e8f0765e05a Author:Gustavo Lopes Sat, 1 Sep 2012 19:07:20 +0200 Parents: 7b5960b08577700275468b396e6f962e0b70 dbc7809b1746ef5dd895e6cd369134cb5270ae0b Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=53351d087dfa94569a7a65b9f4167e8f0765e05a Log: Merge branch 'generators' Can UPGRADING/NEWS be updated? Chris -- christopher.jo...@oracle.com http://twitter.com/#!/ghrd -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] com php-src: Fixed unintendent clearance of PHP_OUTPUT_ACTIVATED flag: main/output.c
Is there a test for this?
Chris
Dmitry Stogov wrote:
Commit: 62d86209cf83b6b1288b0c7567ace45b5be6025b
Author: Dmitry Stogov Mon, 10 Sep 2012 14:54:18
+0400
Parents: 58d6a425287dbc2c5ebad3eafeba828abbdf1d0d
Branches: PHP-5.4 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=62d86209cf83b6b1288b0c7567ace45b5be6025b
Log:
Fixed unintendent clearance of PHP_OUTPUT_ACTIVATED flag
Changed paths:
M main/output.c
Diff:
diff --git a/main/output.c b/main/output.c
index d4eaa67..e100057 100644
--- a/main/output.c
+++ b/main/output.c
@@ -214,7 +214,7 @@ PHPAPI void php_output_register_constants(TSRMLS_D)
* Used by SAPIs to disable output */
PHPAPI void php_output_set_status(int status TSRMLS_DC)
{
- OG(flags) = status & 0xf;
+ OG(flags) = (OG(flags) & ~0xf) | (status & 0xf);
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Change package.xml fix description: ext/oci8/package.xml
Commit:9f44844d7ce9485e543dada5f5314dd0487a7512 Author:Christopher Jones Thu, 13 Sep 2012 22:43:10 -0700 Parents: bbf5978e2641d924c2d4d1c47210756943a28f7b Branches: PHP-5.3 PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9f44844d7ce9485e543dada5f5314dd0487a7512 Log: Change package.xml fix description Changed paths: M ext/oci8/package.xml Diff: diff --git a/ext/oci8/package.xml b/ext/oci8/package.xml index 59aeb5e..eac3f06 100644 --- a/ext/oci8/package.xml +++ b/ext/oci8/package.xml @@ -46,7 +46,7 @@ http://pear.php.net/dtd/package-2.0.xsd";> http://www.php.net/license";>PHP - Fixed bug 60901 (Improve installation "tail" syntax for AIX) + Fixed bug #60901 (Improve "tail" syntax for AIX installation) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Fixed bug #60901 (Improve "tail" syntax for AIX installation): ext/oci8/config.m4 ext/oci8/package.xml
Commit:bbf5978e2641d924c2d4d1c47210756943a28f7b
Author:Christopher Jones Thu, 13 Sep 2012 22:40:55
-0700
Parents: 9e91d621e3202a95a8c2d2ba261495ac30ec4008
Branches: PHP-5.3 PHP-5.4 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=bbf5978e2641d924c2d4d1c47210756943a28f7b
Log:
Fixed bug #60901 (Improve "tail" syntax for AIX installation)
Bugs:
https://bugs.php.net/60901
Changed paths:
M ext/oci8/config.m4
M ext/oci8/package.xml
Diff:
diff --git a/ext/oci8/config.m4 b/ext/oci8/config.m4
index 0634e96..976eb9e 100644
--- a/ext/oci8/config.m4
+++ b/ext/oci8/config.m4
@@ -49,8 +49,8 @@ AC_DEFUN([AC_OCI8_CHECK_LIB_DIR],[
AC_DEFUN([AC_OCI8IC_VERSION],[
AC_MSG_CHECKING([Oracle Instant Client library version compatibility])
OCI8_LCS_BASE=$PHP_OCI8_INSTANT_CLIENT/libclntsh.$SHLIB_SUFFIX_NAME
- OCI8_LCS=`ls $OCI8_LCS_BASE.*.1 2> /dev/null | tail -1` # Oracle 10g, 11g
etc
- OCI8_NNZ=`ls $PHP_OCI8_INSTANT_CLIENT/libnnz*.$SHLIB_SUFFIX_NAME 2>
/dev/null | tail -1`
+ OCI8_LCS=`ls $OCI8_LCS_BASE.*.1 2> /dev/null | tail -n1` # Oracle 10g, 11g
etc
+ OCI8_NNZ=`ls $PHP_OCI8_INSTANT_CLIENT/libnnz*.$SHLIB_SUFFIX_NAME 2>
/dev/null | tail -n1`
if test -f "$OCI8_NNZ" && test -f "$OCI8_LCS"; then
if test ! -f "$OCI8_LCS_BASE"; then
AC_MSG_ERROR([Link from $OCI8_LCS_BASE to $OCI8_LCS_BASE.*.1 not found])
@@ -65,7 +65,7 @@ AC_DEFUN([AC_OCI8IC_VERSION],[
AC_DEFUN([AC_OCI8_ORACLE_VERSION],[
AC_MSG_CHECKING([Oracle library version compatibility])
OCI8_LCS_BASE=$OCI8_DIR/$OCI8_LIB_DIR/libclntsh.$SHLIB_SUFFIX_NAME
- OCI8_LCS=`ls $OCI8_LCS_BASE.*.1 2> /dev/null | tail -1` # Oracle 10g, 11g
etc
+ OCI8_LCS=`ls $OCI8_LCS_BASE.*.1 2> /dev/null | tail -n1` # Oracle 10g, 11g
etc
if test -s "$OCI8_DIR/orainst/unix.rgs"; then
OCI8_ORACLE_VERSION=`grep '"ocommon"' $OCI8_DIR/orainst/unix.rgs |
$PHP_OCI8_SED 's/[ ][ ]*/:/g' | cut -d: -f 6 | cut -c 2-4`
test -z "$OCI8_ORACLE_VERSION" && OCI8_ORACLE_VERSION=7.3
@@ -278,7 +278,7 @@ if test "$PHP_OCI8" != "no"; then
dnl user must pass in the library directory. But on Linux we default
dnl to the most recent version in /usr/lib which is where the Oracle
dnl Instant Client RPM gets installed.
- PHP_OCI8_INSTANT_CLIENT=`ls -d
/usr/lib/oracle/*/client${PHP_OCI8_IC_LIBDIR_SUFFIX}/lib/libclntsh.* 2>
/dev/null | tail -1 | $PHP_OCI8_SED -e 's#/libclntsh[^/]*##'`
+ PHP_OCI8_INSTANT_CLIENT=`ls -d
/usr/lib/oracle/*/client${PHP_OCI8_IC_LIBDIR_SUFFIX}/lib/libclntsh.* 2>
/dev/null | tail -n1 | $PHP_OCI8_SED -e 's#/libclntsh[^/]*##'`
if test -z "$PHP_OCI8_INSTANT_CLIENT"; then
AC_MSG_ERROR([Oracle Instant Client directory
/usr/lib/oracle/.../client${PHP_OCI8_IC_LIBDIR_SUFFIX}/lib libraries not found.
Try --with-oci8=instantclient,DIR])
fi
diff --git a/ext/oci8/package.xml b/ext/oci8/package.xml
index d3a9128..59aeb5e 100644
--- a/ext/oci8/package.xml
+++ b/ext/oci8/package.xml
@@ -37,8 +37,8 @@ http://pear.php.net/dtd/package-2.0.xsd";>
12:00:00
- 1.4.7
- 1.4.7
+ 1.4.8
+ 1.4.8
stable
@@ -46,11 +46,7 @@ http://pear.php.net/dtd/package-2.0.xsd";>
http://www.php.net/license";>PHP
- Fixed bug #59985 (show normal warning text for OCI_NO_DATA)
- Fixed OCI8 part of bug #55748 (CVE-2011-4153: multiple NULL pointer
dereferences with zend_strndup)
- Fixed OCI8 part of bug #55301 (multiple null pointer dereferences with
calloc)
- Increased maximum Oracle error message buffer length for new Oracle 11.2.0.3
size
- Improve internal initalization failure error messages
+ Fixed bug 60901 (Improve installation "tail" syntax for AIX)
@@ -416,6 +412,25 @@ http://pear.php.net/dtd/package-2.0.xsd";>
+ 1.4.7
+ 1.4.7
+
+
+ stable
+ stable
+
+ http://www.php.net/license";>PHP
+
+ Fixed bug #59985 (show normal warning text for OCI_NO_DATA)
+ Fixed OCI8 part of bug #55748 (CVE-2011-4153: multiple NULL pointer
dereferences with zend_strndup)
+ Fixed OCI8 part of bug #55301 (multiple null pointer dereferences with
calloc)
+ Increased maximum Oracle error message buffer length for new Oracle 11.2.0.3
size
+ Improve internal initalization failure error messages
+
+
+
+
+
1.4.6
1.4.6
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] com php-src: - Fixed bug #62887 (Only /status?plain&full gives "last request cpu"): sapi/fpm/fpm/fpm_status.c
On 09/27/2012 11:25 PM, Jérôme Loyet wrote: laurence: I know, sorry, but merging never works gently. Each time, I'm in a situation from which I can never exit cleanly. I spend more time dealing with git than working on the patch ... you can easly understand I'm not continuing this way :( for me, it's a pain in the ass since php sources have been migrated to git. if you have a clean and simple solution: I'm all ears :) Look at the "Multiple working copies workflow" on https://wiki.php.net/vcs/gitfaq Chris -- christopher.jo...@oracle.com http://twitter.com/#!/ghrd -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Fixed bug #63307 (Unused variable in oci8.c): ext/oci8/oci8.c ext/oci8/package.xml
Commit:af14da5714cbcd9c12f140bbb622f10aa0b227a8
Author:Christopher Jones Thu, 18 Oct 2012 17:53:00
-0700
Parents: 79a048f76f767b071f49b79e4b2c224986e849a2
Branches: PHP-5.3 PHP-5.4 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=af14da5714cbcd9c12f140bbb622f10aa0b227a8
Log:
Fixed bug #63307 (Unused variable in oci8.c)
An output section for oci_internal_debug() was setting but not using a variable
Bugs:
https://bugs.php.net/63307
Changed paths:
M ext/oci8/oci8.c
M ext/oci8/package.xml
Diff:
diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c
index bf2eaf5..e2241cf 100644
--- a/ext/oci8/oci8.c
+++ b/ext/oci8/oci8.c
@@ -3197,7 +3197,7 @@ static int php_oci_create_session(php_oci_connection
*connection, php_oci_spool
PHP_OCI_CALL_RETURN(OCI_G(errcode), OCIAttrGet, ((dvoid
*)actual_spool->poolh, OCI_HTYPE_SPOOL, (dvoid *)&numopen, (ub4 *)0,
OCI_ATTR_SPOOL_OPEN_COUNT, OCI_G(err)));
PHP_OCI_CALL_RETURN(OCI_G(errcode), OCIAttrGet, ((dvoid
*)actual_spool->poolh, OCI_HTYPE_SPOOL, (dvoid *)&numbusy, (ub4 *)0,
OCI_ATTR_SPOOL_BUSY_COUNT, OCI_G(err)));
numfree = numopen - numbusy;/* number of free connections
in the pool */
- php_printf ("OCI8 DEBUG L1: (numopen=%d)(numbusy=%d) at (%s:%d)
\n", numopen, numbusy, __FILE__, __LINE__);
+ php_printf ("OCI8 DEBUG L1:
(numopen=%d)(numbusy=%d)(numfree=%d) at (%s:%d) \n", numopen, numbusy, numfree,
__FILE__, __LINE__);
} /* }}} */
/* Ping loop: Ping and loop till we get a good connection. When
a database instance goes
diff --git a/ext/oci8/package.xml b/ext/oci8/package.xml
index 9235f14..63ece6f 100644
--- a/ext/oci8/package.xml
+++ b/ext/oci8/package.xml
@@ -46,8 +46,9 @@ http://pear.php.net/dtd/package-2.0.xsd";>
http://www.php.net/license";>PHP
- Fixed bug #60901 (Improve "tail" syntax for AIX installation)
+ Fixed bug #63307 (Unused variable in oci8.c)
Fixed bug #63265 (Add ORA-00028 to the PHP_OCI_HANDLE_ERROR macro)
+ Fixed bug #60901 (Improve "tail" syntax for AIX installation)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Fixed bug #63265 (Add ORA-00028 to the PHP_OCI_HANDLE_ERROR macro): ext/oci8/package.xml ext/oci8/php_oci8.h ext/oci8/php_oci8_int.h
Commit:131dd88505d5a9588ede36b22206bf13965d9137
Author:Christopher Jones Thu, 18 Oct 2012 17:33:51
-0700
Parents: 0da5517cb95e99e35b340be771af74cbe9811a5b
Branches: PHP-5.3 PHP-5.4 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=131dd88505d5a9588ede36b22206bf13965d9137
Log:
Fixed bug #63265 (Add ORA-00028 to the PHP_OCI_HANDLE_ERROR macro)
Improve high availability for explicitly terminated connections.
Bugs:
https://bugs.php.net/63265
Changed paths:
M ext/oci8/package.xml
M ext/oci8/php_oci8.h
M ext/oci8/php_oci8_int.h
Diff:
diff --git a/ext/oci8/package.xml b/ext/oci8/package.xml
index eac3f06..9235f14 100644
--- a/ext/oci8/package.xml
+++ b/ext/oci8/package.xml
@@ -33,7 +33,7 @@ http://pear.php.net/dtd/package-2.0.xsd";>
no
- 2011-11-18
+ 2012-10-21
12:00:00
@@ -47,6 +47,7 @@ http://pear.php.net/dtd/package-2.0.xsd";>
http://www.php.net/license";>PHP
Fixed bug #60901 (Improve "tail" syntax for AIX installation)
+ Fixed bug #63265 (Add ORA-00028 to the PHP_OCI_HANDLE_ERROR macro)
diff --git a/ext/oci8/php_oci8.h b/ext/oci8/php_oci8.h
index 6363aea..efe8665 100644
--- a/ext/oci8/php_oci8.h
+++ b/ext/oci8/php_oci8.h
@@ -46,7 +46,7 @@
*/
#undef PHP_OCI8_VERSION
#endif
-#define PHP_OCI8_VERSION "1.4.7"
+#define PHP_OCI8_VERSION "1.4.8"
extern zend_module_entry oci8_module_entry;
#define phpext_oci8_ptr &oci8_module_entry
diff --git a/ext/oci8/php_oci8_int.h b/ext/oci8/php_oci8_int.h
index 724e8ba..b0d6516 100644
--- a/ext/oci8/php_oci8_int.h
+++ b/ext/oci8/php_oci8_int.h
@@ -289,6 +289,7 @@ typedef struct { /* php_oci_out_column {{{ */
zend_bailout();
\
break;
\
case22:
\
+ case28:
\
case 378:
\
case 602:
\
case 603:
\
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Add fix & missing fix: NEWS
Commit:106c70e76e759737579945e6a036c7176c1758b6 Author:Christopher Jones Thu, 18 Oct 2012 18:50:18 -0700 Parents: af14da5714cbcd9c12f140bbb622f10aa0b227a8 Branches: PHP-5.3 PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=106c70e76e759737579945e6a036c7176c1758b6 Log: Add fix & missing fix Changed paths: M NEWS Diff: diff --git a/NEWS b/NEWS index 009f082..11f4c92 100644 --- a/NEWS +++ b/NEWS @@ -5,6 +5,10 @@ PHP NEWS - MySQL: . Fixed compilation failure on mixed 32/64 bit systems. (Andrey) +- OCI8: + . Fixed bug #63265 (Add ORA-00028 to the PHP_OCI_HANDLE_ERROR macro) +(Chris Jones) + - PCRE: . Fixed bug #63055 (Segfault in zend_gc with SF2 testsuite). (Dmitry, Laruence) @@ -47,6 +51,9 @@ PHP NEWS - Intl: . Fix bug #62915 (defective cloning in several intl classes). (Gustavo) +- OCI8: + . Fixed bug #60901 (Improve "tail" syntax for AIX installation) (Chris Jones) + - SOAP . Fixed bug #50997 (SOAP Error when trying to submit 2nd Element of a choice). (Dmitry) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Add fix & missing fix: NEWS
Commit:05a843c25623e0eb6bdcc03a57156f6aceec1445 Author:Christopher Jones Thu, 18 Oct 2012 18:55:15 -0700 Parents: c6d6ede4a80deec1b519b42dd7230571cc399a82 Branches: PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=05a843c25623e0eb6bdcc03a57156f6aceec1445 Log: Add fix & missing fix Changed paths: M NEWS Diff: diff --git a/NEWS b/NEWS index 49980d1..0f5ed8f 100644 --- a/NEWS +++ b/NEWS @@ -6,11 +6,15 @@ PHP NEWS . Fixed bug #63248 (Load multiple magic files from a directory under Windows). (Anatoliy) +- OCI8: + . Fixed bug #63265 (Add ORA-00028 to the PHP_OCI_HANDLE_ERROR macro) +(Chris Jones) + - PCRE: . Fixed bug #63055 (Segfault in zend_gc with SF2 testsuite). (Dmitry, Laruence) -?? ??? 2012, PHP 5.4.8 +18 Oct 2012, PHP 5.4.8 - CLI server: . Implemented FR #63242 (Default error page in PHP built-in web server uses @@ -63,6 +67,9 @@ PHP NEWS . Fixed bug #62887 (Only /status?plain&full gives "last request cpu"). (fat) . Fixed bug #62216 (Add PID to php-fpm init.d script). (fat) +- OCI8: + . Fixed bug #60901 (Improve "tail" syntax for AIX installation) (Chris Jones) + - OpenSSL: . Implemented FR #61421 (OpenSSL signature verification missing RMD160, SHA224, SHA256, SHA384, SHA512). (Mark Jones) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Re-fixed bug #60901 (Improve "tail" syntax for AIX installation): ext/oci8/config.m4 ext/oci8/package.xml ext/oci8/php_oci8.h
Commit:dbb72de6c75796803ed6ed103763a12eebc9e78e
Author:Christopher Jones Sun, 21 Oct 2012 22:17:47
-0700
Parents: 7293cb72509350a4ede860c6383ebb2c11d93d39
Branches: PHP-5.3 PHP-5.4 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=dbb72de6c75796803ed6ed103763a12eebc9e78e
Log:
Re-fixed bug #60901 (Improve "tail" syntax for AIX installation)
The original fix broke Solaris installs of OCI8
Bugs:
https://bugs.php.net/60901
Changed paths:
M ext/oci8/config.m4
M ext/oci8/package.xml
M ext/oci8/php_oci8.h
Diff:
diff --git a/ext/oci8/config.m4 b/ext/oci8/config.m4
index 976eb9e..34ae76c 100644
--- a/ext/oci8/config.m4
+++ b/ext/oci8/config.m4
@@ -8,6 +8,13 @@ else
PHP_OCI8_SED="$SED";
fi
+PHP_OCI8_TAIL1=`echo a | tail -n1 2>/dev/null`
+if test "$PHP_OCI8_TAIL1" = "a"; then
+PHP_OCI8_TAIL1="tail -n1"
+else
+PHP_OCI8_TAIL1="tail -1"
+fi
+
AC_DEFUN([PHP_OCI_IF_DEFINED],[
old_CPPFLAGS=$CPPFLAGS
CPPFLAGS=$3
@@ -49,8 +56,8 @@ AC_DEFUN([AC_OCI8_CHECK_LIB_DIR],[
AC_DEFUN([AC_OCI8IC_VERSION],[
AC_MSG_CHECKING([Oracle Instant Client library version compatibility])
OCI8_LCS_BASE=$PHP_OCI8_INSTANT_CLIENT/libclntsh.$SHLIB_SUFFIX_NAME
- OCI8_LCS=`ls $OCI8_LCS_BASE.*.1 2> /dev/null | tail -n1` # Oracle 10g, 11g
etc
- OCI8_NNZ=`ls $PHP_OCI8_INSTANT_CLIENT/libnnz*.$SHLIB_SUFFIX_NAME 2>
/dev/null | tail -n1`
+ OCI8_LCS=`ls $OCI8_LCS_BASE.*.1 2> /dev/null | $PHP_OCI8_TAIL1` # Oracle
10g, 11g etc
+ OCI8_NNZ=`ls $PHP_OCI8_INSTANT_CLIENT/libnnz*.$SHLIB_SUFFIX_NAME 2>
/dev/null | $PHP_OCI8_TAIL1`
if test -f "$OCI8_NNZ" && test -f "$OCI8_LCS"; then
if test ! -f "$OCI8_LCS_BASE"; then
AC_MSG_ERROR([Link from $OCI8_LCS_BASE to $OCI8_LCS_BASE.*.1 not found])
@@ -65,7 +72,7 @@ AC_DEFUN([AC_OCI8IC_VERSION],[
AC_DEFUN([AC_OCI8_ORACLE_VERSION],[
AC_MSG_CHECKING([Oracle library version compatibility])
OCI8_LCS_BASE=$OCI8_DIR/$OCI8_LIB_DIR/libclntsh.$SHLIB_SUFFIX_NAME
- OCI8_LCS=`ls $OCI8_LCS_BASE.*.1 2> /dev/null | tail -n1` # Oracle 10g, 11g
etc
+ OCI8_LCS=`ls $OCI8_LCS_BASE.*.1 2> /dev/null | $PHP_OCI8_TAIL1` # Oracle
10g, 11g etc
if test -s "$OCI8_DIR/orainst/unix.rgs"; then
OCI8_ORACLE_VERSION=`grep '"ocommon"' $OCI8_DIR/orainst/unix.rgs |
$PHP_OCI8_SED 's/[ ][ ]*/:/g' | cut -d: -f 6 | cut -c 2-4`
test -z "$OCI8_ORACLE_VERSION" && OCI8_ORACLE_VERSION=7.3
@@ -278,7 +285,7 @@ if test "$PHP_OCI8" != "no"; then
dnl user must pass in the library directory. But on Linux we default
dnl to the most recent version in /usr/lib which is where the Oracle
dnl Instant Client RPM gets installed.
- PHP_OCI8_INSTANT_CLIENT=`ls -d
/usr/lib/oracle/*/client${PHP_OCI8_IC_LIBDIR_SUFFIX}/lib/libclntsh.* 2>
/dev/null | tail -n1 | $PHP_OCI8_SED -e 's#/libclntsh[^/]*##'`
+ PHP_OCI8_INSTANT_CLIENT=`ls -d
/usr/lib/oracle/*/client${PHP_OCI8_IC_LIBDIR_SUFFIX}/lib/libclntsh.* 2>
/dev/null | $PHP_OCI8_TAIL1 | $PHP_OCI8_SED -e 's#/libclntsh[^/]*##'`
if test -z "$PHP_OCI8_INSTANT_CLIENT"; then
AC_MSG_ERROR([Oracle Instant Client directory
/usr/lib/oracle/.../client${PHP_OCI8_IC_LIBDIR_SUFFIX}/lib libraries not found.
Try --with-oci8=instantclient,DIR])
fi
diff --git a/ext/oci8/package.xml b/ext/oci8/package.xml
index 63ece6f..00566b1 100644
--- a/ext/oci8/package.xml
+++ b/ext/oci8/package.xml
@@ -37,8 +37,8 @@ http://pear.php.net/dtd/package-2.0.xsd";>
12:00:00
- 1.4.8
- 1.4.8
+ 1.4.9
+ 1.4.9
stable
@@ -46,9 +46,7 @@ http://pear.php.net/dtd/package-2.0.xsd";>
http://www.php.net/license";>PHP
- Fixed bug #63307 (Unused variable in oci8.c)
- Fixed bug #63265 (Add ORA-00028 to the PHP_OCI_HANDLE_ERROR macro)
- Fixed bug #60901 (Improve "tail" syntax for AIX installation)
+ Re-fixed bug #60901 (Improve "tail" syntax for AIX installation)
@@ -414,6 +412,23 @@ http://pear.php.net/dtd/package-2.0.xsd";>
+ 1.4.8
+ 1.4.8
+
+
+ stable
+ stable
+
+ http://www.php.net/license";>PHP
+
+ Fixed bug #63307 (Unused variable in oci8.c)
+ Fixed bug #63265 (Add ORA-00028 to the PHP_OCI_HANDLE_ERROR macro)
+ Fixed bug #60901 (Improve "tail" syntax for AIX installation)
+
+
+
+
+
1.4.7
1.4.7
diff --git a/ext/oci8/php_oci8.h b/ext/oci8/php_oci8.h
index efe8665..4ee8e8e 100644
--- a/ext/oci8/php_oci8.h
+++ b/ext/oci8/php_oci8.h
@@ -46,7 +46,7 @@
*/
#undef PHP_OCI8_VERSION
#endif
-#define PHP_OCI8_VERSION "1.4.8"
+#define PHP_OCI8_VERSION "1.4.9"
extern zend_module_entry oci8_module_entry;
#define phpext_oci8_ptr &oci8_module_entry
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Remove PHP 5.5 changes from master UPGRADING: UPGRADING
Commit:ca418b233ca41ee12c80770925cc55e6c96dda4c Author:Christopher Jones Sun, 18 Nov 2012 14:28:26 -0800 Parents: faa7b32ba43f6f15177d8308f5cf5bdee8a05260 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ca418b233ca41ee12c80770925cc55e6c96dda4c Log: Remove PHP 5.5 changes from master UPGRADING Changed paths: M UPGRADING diff --git a/UPGRADING b/UPGRADING index 0e497f7..79b855a 100755 --- a/UPGRADING +++ b/UPGRADING @@ -20,28 +20,11 @@ PHP X.Y UPGRADE NOTES 1. Backward Incompatible Changes -- Drop Windows XP and 2003 support. (Pierre) -- All internal case insensitivity handling for class, function and constant - names is done according to ASCII rules, current locale settings are ignored. -- php_logo_guid(), php_egg_logo_guid(), php_real_logo_guid() and - zend_logo_guid() have been removed -- Removal of Logo GUIDs 2. New Features -- Support list in foreach. (Laruence) - (wiki.php.net/rfc/foreachlist) -- Support finally keyword. (Laruence) - (wiki.php.net/rfc/finally) -- Support constant array/string dereferencing. (Laruence) - (https://wiki.php.net/rfc/constdereference) -- Add support for using empty() on the result of function calls and - other expressions. Thus it is now possible to write empty(getArray()), - for example. (https://wiki.php.net/rfc/empty_isset_exprs) -- Added generators. - (https://wiki.php.net/rfc/generators) 2. Changes in SAPI modules @@ -52,172 +35,21 @@ PHP X.Y UPGRADE NOTES 3. Deprecated Functionality -- The preg_replace /e modifier is now deprecated. Use - preg_replace_callback instead. - (https://wiki.php.net/rfc/remove_preg_replace_eval_modifier) 4. Changed Functions -- pack()/unpack() had the following changes, which bring it more in line - with Perl's behavior: - - Implemented format character "Z": NUL-padded string - - "a" now does not remove trailing NUL characters on unpack() anymore - - "A" will now strip all trailing ASCII whitespace on unpack() (it used to -remove only trailing spaces). -- MessageFormatter::format() and related functions now accepted named arguments - and mixed numeric/named arguments in ICU 4.8+. -- MessageFormatter::format() and related functions now don't error out when - an insufficient argument count is provided. Instead, the placeholders will - remain unsubstituted. -- MessageFormatter::parse() and MessageFormat::format() (and their static - equivalents) now don't throw away better than second precision in the - arguments. -- IntlDateFormatter::__construct and datefmt_create() now accept for the - $timezone argument time zone identifiers, IntlTimeZone objects, DateTimeZone - objects and NULL. It used to accept only time zone identifiers and NULL. - Invalid time zone identifiers are no longer accepted. Emptry strings are - no longer accepted. -- The default time zone used in IntlDateFormatter::__construct and - datefmt_create() (when the corresponding argument is not passed or NULL is - passed) is now the one given by date_default_timezone_get(), not the - default ICU time zone. -- The time zone passed to the IntlDateFormatter is ignored if it is NULL and if - the calendar passed is an IntlCalendar object -- in this case, the - IntlCalendar's time zone will be used instead. Otherwise, the time zone - specified in the $timezone argument is used instead. This does not affect - old code, as IntlCalendar was introduced in this version. -- IntlDateFormatter::__construct and datefmt_create() now accept for the - $calendar argument also IntlCalendar objects. -- IntlDateFormatter::getCalendar() and datefmt_get_calendar() return false - if the IntlDateFormatter was set up with an IntlCalendar instead of the - constants IntlDateFormatter::GREGORIAN/TRADITIONAL. IntlCalendar did not - exist before this version. -- IntlDateFormatter::setCalendar() and datefmt_set_calendar() now also accept - an IntlCalendar object, in which case its time zone is taken. Passing a - constant is still allowed, and still keeps the time zone. -- IntlDateFormatter::setTimeZoneID() and datefmt_set_timezone_id() are - deprecated. Use IntlDateFormatter::setTimeZone() or datefmt_set_timezone() - instead. -- IntlDateFormatter::format() and datefmt_format() now also accept an - IntlCalendar object for formatting. -- mcrypt_ecb(), mcrypt_cbc(), mcrypt_cfb() and mcrypt_ofb() now throw - E_DEPRECATED. Their use was already previously discouraged in the docs, - but that predated the existence of E_DEPRECATED. -- php_logo_guid(), php_egg_logo_guid(), php_real_logo_guid() and - zend_logo_guid() have been removed -- set_error_handle
[PHP-CVS] com php-src: Add actual branch version number to UPGRADING: UPGRADING
Commit:885a4562ab335a5592b4a4afe0413ca7d892ce44 Author:Christopher Jones Sun, 18 Nov 2012 14:43:26 -0800 Parents: 6da7301b347bde2331e99b27dcf3aac155b00df9 Branches: PHP-5.5 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=885a4562ab335a5592b4a4afe0413ca7d892ce44 Log: Add actual branch version number to UPGRADING Changed paths: M UPGRADING Diff: diff --git a/UPGRADING b/UPGRADING index 41ec330..f7f88ac 100755 --- a/UPGRADING +++ b/UPGRADING @@ -1,6 +1,6 @@ $Id$ -PHP X.Y UPGRADE NOTES +PHP 5.5 UPGRADE NOTES 1. Backward Incompatible Changes 2. New Features -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] com php-src: Enable dtrace probes on linux as they are compatible with systemtap: acinclude.m4
On 12/04/2012 10:36 AM, David Soria Parra wrote: Commit:3de00bc6152cec1c017877aca75bc92e4a034585 Author:David Soria Parra Mon, 3 Dec 2012 12:21:32 +0100 Parents: 9e39a636da13dbe6e42a01df1c9be1a55534e720 Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=3de00bc6152cec1c017877aca75bc92e4a034585 Log: Enable dtrace probes on linux as they are compatible with systemtap You can build php with dtrace probes enabled on linux if you have systemtap with uprobes. David, This should be in NEWS and/or UPGRADING. (Also see the Linux Dtrace work-in-progress https://oss.oracle.com/projects/DTrace/ which my team is working on) Chris -- christopher.jo...@oracle.com http://twitter.com/ghrd -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] com php-src: Enable dtrace probes on linux as they are compatible with systemtap: acinclude.m4
On 12/04/2012 04:23 PM, David Soria Parra wrote: -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 done Thanks. [FWIW, A better DTrace on Linux ref is https://blogs.oracle.com/linux/entry/dtrace_for_oracle_linux_news] Chris On 04.12.2012 23:26, Christopher Jones wrote: On 12/04/2012 10:36 AM, David Soria Parra wrote: Commit:3de00bc6152cec1c017877aca75bc92e4a034585 Author: David Soria Parra Mon, 3 Dec 2012 12:21:32 +0100 Parents: 9e39a636da13dbe6e42a01df1c9be1a55534e720 Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=3de00bc6152cec1c017877aca75bc92e4a034585 Log: Enable dtrace probes on linux as they are compatible with systemtap You can build php with dtrace probes enabled on linux if you have systemtap with uprobes. David, This should be in NEWS and/or UPGRADING. (Also see the Linux Dtrace work-in-progress https://oss.oracle.com/projects/DTrace/ which my team is working on) Chris -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.12 (GNU/Linux) Comment: Using GnuPG with undefined - http://www.enigmail.net/ iQIcBAEBAgAGBQJQvpQaAAoJEKSanlo0ToXKx6kP/2Btdu4ONJcK2CyG7UAmU+mv dQ8udQRur15sCDMx0XIj1aDebntICij9VNrLNXQEAj3jDulOhO19WGtRD82MhMR4 ofKB/ArWvmHCYVr82Sv+c2Xup/vmur+EjelG5bYQ9s0hINWZqpY+JRgrHPYtObYB 41J9X4ZgnG7FQU5JVWDogr63M9Lai6wr2Y9m65fG/0+yMsGbL8CFK6EqRFRiecl4 ZL6dGtUYOKcnwzmidjL6NoCRgEWUuHDRuTtzFrjM421ai2gwtUrN3oECMZEEey31 nzsZAfMr6DlSIw6LlAfh1zxJ2BehddxbFcn1kPfJBd7PIhZOK7JS++WKWUrWvIrU UBMf99uWW8tMge7baRpTJDsMBAwlII76AVllspuk2KbshVlnwl7J0oL24BzlYCWm XDnun0IrLFnXKzxBr5daM9yiGlSZMYx+Ljd8NMGXaOAn7xN6EAy68efzGXU68wR8 h09RHyezEojsPr2/zEhTJTx9uRmSLVi3js3P2ByWnW1Bo9VstU64Wl0H0zuu3GSP nW8WTTyUb0woW7I9uPb76DypxqEFrvMTOI/QX3y58ZXdGKI2H74EVkEL4QVnTOM+ 7Y/9SRW4KYycHkZKNwLY626RwzWrd1YjYMzimbxEpffULODyG9uxGOgxtcWI83m7 e5D8Ha6ChpgDp3g8coYZ =BGNd -END PGP SIGNATURE- -- christopher.jo...@oracle.com http://twitter.com/ghrd -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] com php-src: Two tests deactivated until #63688 was fixed: tests/lang/034.phpt tests/lang/bug30638.phpt
On 12/05/2012 01:40 AM, Anatoliy Belsky wrote: That's a windows specific fail, the tests still pass on linux. XFAIL would mark that wrong on linux, that's why. Regards Anatoliy Please leave them enabled in the meantime. Otherwise we have 0 coverage. Chris -- christopher.jo...@oracle.com http://twitter.com/ghrd -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] com php-src: News entry for updated mime types: NEWS
On 12/14/2012 05:54 AM, Lars Strojny wrote: > +- CLI server > + . Update list of common mime types (Lars, pascalc at gmail dot com) Could you list the new types in the NEWS entry? This would help users (and doc writers) so they don't have to dig thru the code & commits to find out what was added. Thanks, Chris -- christopher.jo...@oracle.com http://twitter.com/ghrd -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] com php-src: Remove a useless memory write in zend_llist_del_element: Zend/zend_llist.c
On 12/25/2012 05:45 PM, Pierrick Charron wrote: Commit:fad960a4045da86cdbd8308a165ffc47892f05b9 Author:Pierrick Charron Tue, 25 Dec 2012 20:45:24 -0500 Parents: a2b6d9c1047a4e5f3419ebc3489a66d62aa12d07 Branches: PHP-5.3 PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=fad960a4045da86cdbd8308a165ffc47892f05b9 Log: Remove a useless memory write in zend_llist_del_element The zend_llist_element *next pointer is not necessary and removing it will also remove a write on memory Was this really worth potentially destabilizing 5.3 to change? Or even 5.4? Chris -- christopher.jo...@oracle.com http://twitter.com/ghrd -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] com php-src: Remove a useless memory write in zend_llist_del_element: Zend/zend_llist.c
On 12/26/2012 07:09 AM, Pierrick Charron wrote: Sorry about that. I thought it was a small change safe enough to be committed without asking to the list but apparently I was wrong. I'm going to revert it right now on 5.3 and 5.4, but just for my personnel knowledge, could you tell me what kind of problem this change can introduce ? Thanks Pierrick "Stable" branches need to be kept stable, so only high priority issues should be fixed. The problem with any change is that modifying any code can have unintended and unforeseeable consequences. More extreme examples from other projects have involved white space differences throwing off build tools; optimizer bugs/features changing expected program behavior; the sudden exposure of latent memory issues due to structure changes. Chris -- christopher.jo...@oracle.com http://twitter.com/ghrd -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] com php-src: Add mysqli support - constants and checking in mysqli_options() for the new constant for password expriration: ext/mysqli/mysqli.c ext/mysqli/mysqli_api.c
On 01/09/2013 10:14 AM, Andrey Hristov wrote: Commit:d430b5a4eb26679a6dfa7055dff43cae8dabd20e Author:Andrey Hristov Wed, 9 Jan 2013 19:14:48 +0100 Parents: 258c76eb41a7eaf8e1e7b4994fa5f268c2060039 Branches: PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d430b5a4eb26679a6dfa7055dff43cae8dabd20e Log: Add mysqli support - constants and checking in mysqli_options() for the new constant for password expriration Hi Andrey, Is NEWS up to date? Chris -- christopher.jo...@oracle.com http://twitter.com/ghrd Newly updated, free PHP & Oracle book: http://www.oracle.com/technetwork/topics/php/underground-php-oracle-manual-098250.html -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Fix News: NEWS
Commit:94a4e0f8235b165b0b72f91656db1f4059e8c176 Author:Christopher Jones Tue, 15 Jan 2013 20:38:24 -0800 Parents: 142c40f32c075a8eb706f2e630b934f39e711b70 Branches: PHP-5.4 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=94a4e0f8235b165b0b72f91656db1f4059e8c176 Log: Fix News Changed paths: M NEWS Diff: diff --git a/NEWS b/NEWS index 8fc3d6c..a10ef4e 100644 --- a/NEWS +++ b/NEWS @@ -29,13 +29,15 @@ PHP NEWS . Fixed bug #63921 (sqlite3::bindvalue and relative PHP functions aren't using sqlite3_*_int64 API). (srgoogleguy, Lars) -- PDO_sqlite: - . Fixed bug #63916 (PDO::PARAM_INT casts to 32bit int internally even -on 64bit builds in pdo_sqlite). (srgoogleguy, Lars) +- PDO_OCI . Fixed bug #57702 (Multi-row BLOB fetches). (hswong3i, Laruence) . Fixed bug #52958 (Segfault in PDO_OCI on cleanup after running a long testsuite). (hswong3i, Lars) +- PDO_sqlite: + . Fixed bug #63916 (PDO::PARAM_INT casts to 32bit int internally even +on 64bit builds in pdo_sqlite). (srgoogleguy, Lars) + ?? ??? 2012, PHP 5.4.11 - Core: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] com php-src: - fix name for imageflip constants, consistent witht the other: ext/gd/gd.c
On 02/27/2013 11:23 AM, Pierre Joye wrote:
+ REGISTER_LONG_CONSTANT("IMG_FLIP_HORINZONTAL", GD_FLIP_HORINZONTAL,
CONST_CS | CONST_PERSISTENT);
Hi Pierre,
Should HORIZONTAL be spelled correctly, or it is being consistent with someone
else's mistake?
Chris
--
christopher.jo...@oracle.com http://twitter.com/ghrd
Newly updated, free PHP & Oracle book:
http://www.oracle.com/technetwork/topics/php/underground-php-oracle-manual-098250.html
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] com php-src: Fixed timestamp update on Phar contents modification.: NEWS
On 03/01/2013 12:13 PM, Stas Malyshev wrote: Hi! +- Phar: + . Fixed timestamp update on Phar contents modification. (Dmitry) Is that an old fix already included in 5.3/5.4? What is the commit/bug number for it? Stas, It's this one that I asked Dmitry about adding to NEWS: http://git.php.net/?p=php-src.git;a=commitdiff;h=7b113d789df26b2ad560e747cac0b1ed2043adec Chris -- christopher.jo...@oracle.com http://twitter.com/ghrd Newly updated, free PHP & Oracle book: http://www.oracle.com/technetwork/topics/php/underground-php-oracle-manual-098250.html -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] com php-src: Typo fix: recieved to received: ext/oci8/php_oci8_int.h ext/standard/tests/array/uasort_variation9.phpt main/network.c
Ideally the OCI8 bit needs to be merged to 5.3 & 5.4 to keep them in sync.
Chris
On 03/07/2013 02:05 PM, David Soria Parra wrote:
Commit:0c11cab919d84bbd9af0472e99263ce7fbef8c32
Author:Carson McDonald Thu, 7 Mar 2013
08:43:54 -0500
Committer: David Soria Parra Thu, 7 Mar 2013 23:05:05 +0100
Parents: e98271f588e60e8dbe29c964357a7022e78db696
Branches: PHP-5.5 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=0c11cab919d84bbd9af0472e99263ce7fbef8c32
Log:
Typo fix: recieved to received
Changed paths:
M ext/oci8/php_oci8_int.h
M ext/standard/tests/array/uasort_variation9.phpt
M main/network.c
Diff:
diff --git a/ext/oci8/php_oci8_int.h b/ext/oci8/php_oci8_int.h
index d8d7d0f..155e57d 100644
--- a/ext/oci8/php_oci8_int.h
+++ b/ext/oci8/php_oci8_int.h
@@ -191,7 +191,7 @@ typedef struct { /* php_oci_statement {{{ */
sworderrcode;
/* last errcode*/
OCIError*err;
/* private error handle */
OCIStmt *stmt;
/* statement handle */
- char*last_query;/* last
query issued. also used to determine if this is a statement or a refcursor
recieved from Oracle */
+ char*last_query;/* last
query issued. also used to determine if this is a statement or a refcursor
received from Oracle */
long last_query_len;/* last
query length */
HashTable *columns;
/* hash containing all the result columns */
HashTable *binds;
/* binds hash */
diff --git a/ext/standard/tests/array/uasort_variation9.phpt
b/ext/standard/tests/array/uasort_variation9.phpt
index 486042e..85578b0 100644
--- a/ext/standard/tests/array/uasort_variation9.phpt
+++ b/ext/standard/tests/array/uasort_variation9.phpt
@@ -14,7 +14,7 @@ echo "*** Testing uasort() : 'cmp_function' with reference
arguments ***\n";
// comparison function
/* Prototype : int cmp(mixed &$value1, mixed &$value2)
- * Parameters : $value1 and $value2 - values recieved by reference
+ * Parameters : $value1 and $value2 - values received by reference
* Return value : 0 - if both values are same
*1 - if value1 is greater than value2
* -1 - if value1 is less than value2
diff --git a/main/network.c b/main/network.c
index 88e1663..5c0404b 100644
--- a/main/network.c
+++ b/main/network.c
@@ -872,7 +872,7 @@ skip_bind:
efree(local_address);
}
}
- /* free error string recieved during previous iteration
(if any) */
+ /* free error string received during previous iteration
(if any) */
if (error_string && *error_string) {
efree(*error_string);
*error_string = NULL;
--
christopher.jo...@oracle.com http://twitter.com/ghrd
Newly updated, free PHP & Oracle book:
http://www.oracle.com/technetwork/topics/php/underground-php-oracle-manual-098250.html
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] com php-src: Support for CLI process title (https://wiki.php.net/rfc/cli_process_title): sapi/cli/config.m4 sapi/cli/config.w32 sapi/cli/php_cli.c sapi/cli/php_cli_process_title.c sapi/c
On 03/07/2013 10:54 AM, Keyur Govande wrote: Commit:a0a995cff356a6e7526188ad1979fac6c24b9e7e Author:Keyur Govande Thu, 7 Mar 2013 18:54:34 + Parents: d77eb411ea5d80379ee92a908f543b91fa293383 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a0a995cff356a6e7526188ad1979fac6c24b9e7e Log: Support for CLI process title (https://wiki.php.net/rfc/cli_process_title) A new commit into branch 5.5 Changed paths: M sapi/cli/config.m4 M sapi/cli/config.w32 M sapi/cli/php_cli.c A sapi/cli/php_cli_process_title.c A sapi/cli/php_cli_process_title.h M sapi/cli/php_cli_server.c M sapi/cli/php_cli_server.h A sapi/cli/ps_title.c A sapi/cli/ps_title.h A sapi/cli/tests/cli_process_title_unix.phpt A sapi/cli/tests/cli_process_title_windows.phpt Hi Keyur, Congrats! PS can you update NEWS, and possibly UPGRADING? Chris -- christopher.jo...@oracle.com http://twitter.com/ghrd Newly updated, free PHP & Oracle book: http://www.oracle.com/technetwork/topics/php/underground-php-oracle-manual-098250.html -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] com php-src: Allow array_column() to take -1 as a valid value in third param: ext/standard/array.c ext/standard/tests/array/array_column_basic.phpt
[Resend due to lists.php.net rejection] On 04/22/2013 03:54 PM, Sara Golemon wrote: Commit:1a03bd5dee97a0f8b9e74b7f8db5231abd8cc7e4 Author:Sara Golemon Mon, 22 Apr 2013 14:57:05 -0700 Parents: f63db963c48775e89e7d5f63235733098c2f653d Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1a03bd5dee97a0f8b9e74b7f8db5231abd8cc7e4 Log: Allow array_column() to take -1 as a valid value in third param Also do some cleanup and simplification to make this code more readable in the long term. Changed paths: M ext/standard/array.c M ext/standard/tests/array/array_column_basic.phpt Hi Sara, Did this make the NEWS file? Chris -- christopher.jo...@oracle.com http://twitter.com/ghrd Newly updated, free PHP & Oracle book http://www.oracle.com/technetwork/topics/php/underground-php-oracle-manual-098250.html -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] com php-src: We need both gdImageCreateFromJpeg* and gdImageCreateFromJpeg*Ex: ext/gd/gd.c ext/gd/libgd/gd.h ext/gd/libgd/gd_jpeg.c
[Resend due to lists.php.net rejection] On 04/24/2013 07:07 AM, Remi Collet wrote: Commit:dd0399f5c6d2acfe53621f9e5daf61c57e8e66c6 Author:Remi Collet Wed, 24 Apr 2013 16:07:50 +0200 Parents: 7189cc5be85016d41cd4fb65e968d0856bd0aea1 Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=dd0399f5c6d2acfe53621f9e5daf61c57e8e66c6 Log: We need both gdImageCreateFromJpeg* and gdImageCreateFromJpeg*Ex Hi Remi, Can you review the change? 5.5 & master no longer compile for me. See https://bugs.php.net/bug.php?id=64707 Thanks, Chris -- christopher.jo...@oracle.com http://twitter.com/ghrd Newly updated, free PHP & Oracle book http://www.oracle.com/technetwork/topics/php/underground-php-oracle-manual-098250.html -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] com php-src: gd: fix typo and cleanups: ext/gd/config.m4
On 5/4/13 11:36 AM, Remi Collet wrote: Commit:2ab270011dfcbfea8e39374f546d6ced653059b5 Author:Remi Collet Sat, 4 May 2013 20:36:32 +0200 Parents: d981c191d452fe1f95ac31fcea366bc0c770b4b7 Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2ab270011dfcbfea8e39374f546d6ced653059b5 Log: gd: fix typo and cleanups Changed paths: M ext/gd/config.m4 I'm still seeing buildconf fail. rebuilding main/php_config.h.in autoheader: warning: missing template: HAVE_GD_CACHE_CREATE 1 autoheader: Use AC_DEFINE([HAVE_GD_CACHE_CREATE 1], [], [Description]) Chris -- christopher.jo...@oracle.com http://twitter.com/ghrd Newly updated, free PHP & Oracle book: http://www.oracle.com/technetwork/topics/php/underground-php-oracle-manual-098250.html -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] com php-src: gd: missing comma: ext/gd/config.m4
On 5/4/13 9:52 PM, Remi Collet wrote: Commit:54d6f8b34e20f58a9b2d5e0986480f8b6e1280fa Author:Remi Collet Sun, 5 May 2013 06:52:28 +0200 Parents: 2ab270011dfcbfea8e39374f546d6ced653059b5 Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=54d6f8b34e20f58a9b2d5e0986480f8b6e1280fa Log: gd: missing comma Changed paths: M ext/gd/config.m4 Thanks - that fixes the buildconf problem. Now the build is failing with: In file included from /usr/include/png.h:371, from /home/cjones/php-5.5/ext/gd/gd.c:57: /usr/include/pngconf.h:336: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘.’ token /usr/include/pngconf.h:337: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘include’ make: *** [ext/gd/gd.lo] Error 1 This is on Oracle Linux 5.9 x64. PHP 5.4 builds OK with the same configuration. I notice PHP 5.4's gd.c has a comment about not including png.h. Chris -- christopher.jo...@oracle.com http://twitter.com/ghrd Newly updated, free PHP & Oracle book: http://www.oracle.com/technetwork/topics/php/underground-php-oracle-manual-098250.html -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] com php-src: Improve x86 inline assembler: Zend/zend_alloc.c Zend/zend_operators.h
On 02/11/2013 04:53 AM, Ard Biesheuvel wrote:
Commit:aa12cdc361b29b4050676763858b3cfa637be6cb
Author:Ard Biesheuvel Mon, 11 Feb 2013
13:53:27 +0100
Parents: 5bfdf4f069975514a358473f7e7fee3710e50597
Branches: master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=aa12cdc361b29b4050676763858b3cfa637be6cb
Log:
Improve x86 inline assembler
- added cc annotation to inline asm that clobbers the condition
flags
- remove hardcoded constants (IS_LONG,IS_DOUBLE)
- remove hardcoded offsets (zval->value, zval->type)
Changed paths:
M Zend/zend_alloc.c
M Zend/zend_operators.h
Hi Ard,
The changes to zend_operators.h break compilation with GCC 3. Can you
review https://bugs.php.net/bug.php?id=64780 ?
Even if GCC 3 is pretty much gone there might still be someone who
wants to build PHP 5.5 with it e.g. as a step during a platform
migration. Since retaining the old assembler code in an #ifdef is
painless to do, it won't hurt PHP to keep it a bit longer.
Chris
Diff:
diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c
index 1cc2c67..98ab6be 100644
--- a/Zend/zend_alloc.c
+++ b/Zend/zend_alloc.c
@@ -667,12 +667,12 @@ static inline unsigned int zend_mm_high_bit(size_t _size)
#if defined(__GNUC__) && (defined(__native_client__) || defined(i386))
unsigned int n;
- __asm__("bsrl %1,%0\n\t" : "=r" (n) : "rm" (_size));
+ __asm__("bsrl %1,%0\n\t" : "=r" (n) : "rm" (_size) : "cc");
return n;
#elif defined(__GNUC__) && defined(__x86_64__)
unsigned long n;
-__asm__("bsrq %1,%0\n\t" : "=r" (n) : "rm" (_size));
+__asm__("bsrq %1,%0\n\t" : "=r" (n) : "rm" (_size) : "cc");
return (unsigned int)n;
#elif defined(_MSC_VER) && defined(_M_IX86)
__asm {
@@ -693,17 +693,17 @@ static inline unsigned int zend_mm_low_bit(size_t _size)
#if defined(__GNUC__) && (defined(__native_client__) || defined(i386))
unsigned int n;
- __asm__("bsfl %1,%0\n\t" : "=r" (n) : "rm" (_size));
+ __asm__("bsfl %1,%0\n\t" : "=r" (n) : "rm" (_size) : "cc");
return n;
#elif defined(__GNUC__) && defined(__x86_64__)
unsigned long n;
-__asm__("bsfq %1,%0\n\t" : "=r" (n) : "rm" (_size));
+__asm__("bsfq %1,%0\n\t" : "=r" (n) : "rm" (_size) : "cc");
return (unsigned int)n;
#elif defined(_MSC_VER) && defined(_M_IX86)
__asm {
bsf eax, _size
- }
+ }
#else
static const int offset[16] = {4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0};
unsigned int n;
diff --git a/Zend/zend_operators.h b/Zend/zend_operators.h
index e395fd3..93c60e4 100644
--- a/Zend/zend_operators.h
+++ b/Zend/zend_operators.h
@@ -477,6 +477,10 @@ ZEND_API void zend_update_current_locale(void);
#define zend_update_current_locale()
#endif
+/* The offset in bytes between the value and type fields of a zval */
+#define ZVAL_OFFSETOF_TYPE \
+ (__builtin_offsetof(zval,type) - __builtin_offsetof(zval,value))
+
static zend_always_inline int fast_increment_function(zval *op1)
{
if (EXPECTED(Z_TYPE_P(op1) == IS_LONG)) {
@@ -486,20 +490,26 @@ static zend_always_inline int
fast_increment_function(zval *op1)
"jno 0f\n\t"
"movl $0x0, (%0)\n\t"
"movl $0x41e0, 0x4(%0)\n\t"
- "movb $0x2,0xc(%0)\n"
+ "movb %1, %c2(%0)\n"
"0:"
:
- : "r"(op1));
+ : "r"(&op1->value),
+ "n"(IS_DOUBLE),
+ "n"(ZVAL_OFFSETOF_TYPE)
+ : "cc");
#elif defined(__GNUC__) && defined(__x86_64__)
__asm__(
"incq (%0)\n\t"
"jno 0f\n\t"
"movl $0x0, (%0)\n\t"
"movl $0x43e0, 0x4(%0)\n\t"
- "movb $0x2,0x14(%0)\n"
+ "movb %1, %c2(%0)\n"
"0:"
:
- : "r"(op1));
+ : "r"(&op1->value),
+ "n"(IS_DOUBLE),
+ "n"(ZVAL_OFFSETOF_TYPE)
+ : "cc");
#else
if (UNEXPECTED(Z_LVAL_P(op1) == LONG_MAX)) {
/* switch to double */
@@ -523,20 +533,26 @@ static zend_always_inline int
fast_decrement_function(zval *op1)
"jno 0f\n\t"
"movl $0x0020, (%0)\n\t"
"movl $0xc1e0, 0x4(%0)\n\t"
- "movb $0x2,0xc(%0)\n"
+ "movb %1,%c2(%0)\n"
"0:"
:
- : "r"(op1));
+ : "r"(&op1->value),
+ "n"(IS_DOUBLE),
+ "n"(ZVAL_OFFSETOF_TYPE)
+
Re: [PHP-CVS] com php-src: Fix non-specialized executor build: Zend/zend_vm_def.h
On 06/20/2013 08:26 AM, Ard Biesheuvel wrote: Commit:4cd2b7212fd15af5631b95685fa966dc101a84ff Author:Ard Biesheuvel Thu, 20 Jun 2013 17:26:05 +0200 Parents: 3e6b312b55ef8044ba1cea44f8986e2375dc6195 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4cd2b7212fd15af5631b95685fa966dc101a84ff Log: Fix non-specialized executor build Removed a couple of calls to FREE_OP2() that were left behind in the handlers for break and continue opcodes after commit 7628da98 Changed paths: M Zend/zend_vm_def.h Doesn't this need to be merged back to PHP 5.5 (and added to NEWS)? Chris Diff: diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index 369f945..a15e4c6 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -3299,7 +3299,6 @@ ZEND_VM_HANDLER(50, ZEND_BRK, ANY, CONST) SAVE_OPLINE(); el = zend_brk_cont(Z_LVAL_P(opline->op2.zv), opline->op1.opline_num, EX(op_array), execute_data TSRMLS_CC); - FREE_OP2(); ZEND_VM_JMP(EX(op_array)->opcodes + el->brk); } @@ -3311,7 +3310,6 @@ ZEND_VM_HANDLER(51, ZEND_CONT, ANY, CONST) SAVE_OPLINE(); el = zend_brk_cont(Z_LVAL_P(opline->op2.zv), opline->op1.opline_num, EX(op_array), execute_data TSRMLS_CC); - FREE_OP2(); ZEND_VM_JMP(EX(op_array)->opcodes + el->cont); } -- christopher.jo...@oracle.com http://twitter.com/ghrd Free PHP & Oracle book: http://www.oracle.com/technetwork/topics/php/underground-php-oracle-manual-098250.html -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] com php-src: Fix non-specialized executor build: Zend/zend_vm_def.h
On 06/20/2013 02:14 PM, Ard Biesheuvel wrote: On 20 June 2013 23:00, Christopher Jones wrote: On 06/20/2013 08:26 AM, Ard Biesheuvel wrote: Commit:4cd2b7212fd15af5631b95685fa966dc101a84ff Author:Ard Biesheuvel Thu, 20 Jun 2013 17:26:05 +0200 Parents: 3e6b312b55ef8044ba1cea44f8986e2375dc6195 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4cd2b7212fd15af5631b95685fa966dc101a84ff Log: Fix non-specialized executor build Removed a couple of calls to FREE_OP2() that were left behind in the handlers for break and continue opcodes after commit 7628da98 Changed paths: M Zend/zend_vm_def.h Doesn't this need to be merged back to PHP 5.5 (and added to NEWS)? Hey Chris, Considering that zend_vm_def.h is only a template used to generate zend_vm_execute.h and zend_vm_opcodes.h, which I will not be regenerating and submitting for 5.4 and 5.5 (given their stable and RC status respectively), I am not sure there is any merit to merging these changes to those trees as well. Your @internals mail said "building the executor without specialization is broken" so the patch seems like a standard bug fix that should be merged to 5.4 & 5.5. Chris -- christopher.jo...@oracle.com http://twitter.com/ghrd Free PHP & Oracle book: http://www.oracle.com/technetwork/topics/php/underground-php-oracle-manual-098250.html -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Some tidy-ups: Don't mention Logo GUIDs in three places; mention password_hash functionality; add some doc URLs for new features; grammar & typos; formatting changes.: UPGRADING
Commit:0093980fe045ef19fc19d69480d58c5a0e135657 Author:Christopher Jones Mon, 24 Jun 2013 17:12:35 -0700 Parents: ff292d619cf387902fe39d40c0e34113f1d6a647 Branches: PHP-5.5 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=0093980fe045ef19fc19d69480d58c5a0e135657 Log: Some tidy-ups: Don't mention Logo GUIDs in three places; mention password_hash functionality; add some doc URLs for new features; grammar & typos; formatting changes. Changed paths: M UPGRADING diff --git a/UPGRADING b/UPGRADING index 7bd0b0c..db94e85 100755 --- a/UPGRADING +++ b/UPGRADING @@ -2,16 +2,16 @@ $Id$ PHP 5.5 UPGRADE NOTES -1. Backward Incompatible Changes -2. New Features -2. Changes in SAPI modules -3. Deprecated Functionality -4. Changed Functions -5. New Functions -6. New Classes and Interfaces -7. Removed Extensions -8. Other Changes to Extensions -9. New Global Constants +1. Backward Incompatible Changes +2. New Features +2. Changes in SAPI modules +3. Deprecated Functionality +4. Changed Functions +5. New Functions +6. New Classes and Interfaces +7. Removed Extensions +8. Other Changes to Extensions +9. New Global Constants 10. Changes to INI File Handling 11. Windows Support 12. Other Changes @@ -21,122 +21,158 @@ PHP 5.5 UPGRADE NOTES 1. Backward Incompatible Changes -- Drop Windows XP and 2003 support. (Pierre) -- All internal case insensitivity handling for class, function and constant - names is done according to ASCII rules, current locale settings are ignored. +- Dropped Windows XP and 2003 support. (Pierre) + +- All internal case insensitivity handling for class, function and constant + names is done according to ASCII rules. Current locale settings are ignored. + - self, parent & static keywords now are always case-insensitive (see bug #60833). -- php_logo_guid(), php_egg_logo_guid(), php_real_logo_guid() and - zend_logo_guid() have been removed -- Removal of Logo GUIDs + +- Removed Logo GUIDs: php_logo_guid(), php_egg_logo_guid(), + php_real_logo_guid() and zend_logo_guid() 2. New Features - Support list in foreach. (Laruence) - (wiki.php.net/rfc/foreachlist) + (http://php.net/foreach#control-structures.foreach.list, + http://wiki.php.net/rfc/foreachlist) + - Support finally keyword. (Laruence) - (wiki.php.net/rfc/finally) + (http://php.net/exceptions, http://wiki.php.net/rfc/finally) + - Support constant array/string dereferencing. (Laruence) (https://wiki.php.net/rfc/constdereference) + - Add support for using empty() on the result of function calls and other expressions. Thus it is now possible to write empty(getArray()), for example. (https://wiki.php.net/rfc/empty_isset_exprs) + - Added generators. - (https://wiki.php.net/rfc/generators) -- ClassName::class syntax returning full class name for a class as - a string constant. (https://wiki.php.net/rfc/class_name_scalars) + (http://php.net/generators, https://wiki.php.net/rfc/generators) + +- ClassName::class syntax returning full class name for a class as a + string constant. + (http://php.net/oop5.basic#language.oop5.basic.class.class, + https://wiki.php.net/rfc/class_name_scalars) + - Added support for non-scalar Iterator keys in foreach. (https://wiki.php.net/rfc/foreach-non-scalar-keys). -- Bundled Zend OPcache extension - (https://wiki.php.net/rfc/optimizerplus) + +- Bundled Zend OPcache extension to improve performance + (http://php.net/manual/en/book.opcache.php, + https://wiki.php.net/rfc/optimizerplus) + +- Added a simplified password hashing API + (http://php.net/password) 2. Changes in SAPI modules -- Support for changing the process's title in CLI/CLI-Server SAPIs. (Keyur) - (https://wiki.php.net/rfc/cli_process_title) -- Support for systemd in php-fpm: - Add --with-fpm-systemd option to report health to systemd, and - systemd_interval option to configure this. The service can now use - Type=notify in the systemd unit file. (Remi) +- Support for changing the process's title in CLI/CLI-Server + SAPIs. (Keyur) (https://wiki.php.net/rfc/cli_process_title) + +- Support for systemd in php-fpm: Add --with-fpm-systemd option to + report health to systemd, and add systemd_interval option to + configure this. The service can now use Type=notify in the systemd + unit file. (Remi) 3. Deprecated Functionality -- The original MySQL extension is now deprecated, and will generate deprecation - warnings when connecting to a database through mysql_connect(), - mysql_pconnect() or by establishing an implicit connection. Use MySQLi or PDO - instead. +- The original MySQL extension is now deprecated and will generate + de
[PHP-CVS] com php-src: Minium changes to allow PDO_OCI to build with Oracle Database 12c libraries. (note OCI8 already builds with Oracle Database 12c): ext/pdo_oci/config.m4 ext/pdo_oci/tests/pdo_oci
Commit:423b132a7a076ff641bd3ab4dc2aa03cd8e4fd1b
Author:Christopher Jones Tue, 25 Jun 2013 11:55:41
-0700
Parents: 38eb909d064ecbbf51d5869a629dae91a6ed9dcf
Branches: PHP-5.4 PHP-5.5 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=423b132a7a076ff641bd3ab4dc2aa03cd8e4fd1b
Log:
Minium changes to allow PDO_OCI to build with Oracle Database 12c libraries.
(note OCI8 already builds with Oracle Database 12c)
Changed paths:
M ext/pdo_oci/config.m4
M ext/pdo_oci/tests/pdo_oci_attr_client.phpt
Diff:
diff --git a/ext/pdo_oci/config.m4 b/ext/pdo_oci/config.m4
index 309bde8..0e42d1f 100755
--- a/ext/pdo_oci/config.m4
+++ b/ext/pdo_oci/config.m4
@@ -2,7 +2,7 @@ dnl $Id$
dnl config.m4 for extension pdo_oci
dnl vim:et:sw=2:ts=2:
-SUPPORTED_LIB_VERS="9.0 10.1 11.1" # This caters for all Oracle 9.x, 10.x and
11.1 installs
+SUPPORTED_LIB_VERS="9.0 10.1 11.1 12.1" # The lib vers are not bumped when
the DB version is bumped
AC_DEFUN([AC_PDO_OCI_VERSION],[
AC_MSG_CHECKING([Oracle version])
for OCI_VER in $SUPPORTED_LIB_VERS; do
@@ -147,7 +147,7 @@ You need to tell me where to find your Oracle Instant
Client SDK, or set ORACLE_
fi
case $PDO_OCI_VERSION in
-9.0|10.1|10.2|11.1|11.2)
+9.0|10.1|10.2|11.1|11.2|12.1)
PHP_ADD_LIBRARY(clntsh, 1, PDO_OCI_SHARED_LIBADD)
;;
diff --git a/ext/pdo_oci/tests/pdo_oci_attr_client.phpt
b/ext/pdo_oci/tests/pdo_oci_attr_client.phpt
index 372ccec..eadb028 100644
--- a/ext/pdo_oci/tests/pdo_oci_attr_client.phpt
+++ b/ext/pdo_oci/tests/pdo_oci_attr_client.phpt
@@ -18,7 +18,7 @@ $cv = $dbh->getAttribute(PDO::ATTR_CLIENT_VERSION);
var_dump($cv);
$s = explode(".", $cv);
-if ($s[0] >= 10 && count($s) > 1 && $s[1] >= 2) {
+if (count($s) > 1 && (($s[0] == 10 && $s[1] >= 2) || $s[0] >= 11)) {
if (count($s) != 5) {
echo "Wrong number of values in array\nVersion was: ";
var_dump($cv);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Update NEWS: NEWS
Commit:12fdf8fb9570f1fef72be71e641441d500a33b60 Author:Christopher Jones Tue, 25 Jun 2013 17:30:21 -0700 Parents: 111b385afe40674a08d5ab76f659a1e236f0da60 Branches: PHP-5.4 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=12fdf8fb9570f1fef72be71e641441d500a33b60 Log: Update NEWS Changed paths: M NEWS Diff: diff --git a/NEWS b/NEWS index 116c79a..b3ff18d 100644 --- a/NEWS +++ b/NEWS @@ -24,6 +24,10 @@ PHP NEWS . Fixed bug #61387 (NULL valued anonymous column causes segfault in odbc_fetch_array). (Brandon Kirsch) +- PDO: + . Allowed PDO_OCI to compile with Oracle Database 12c client libraries. +(Chris Jones) + - Sockets: . Implemented FR #63472 (Setting SO_BINDTODEVICE with socket_set_option). (Damjan Cvetko) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Update NEWS: NEWS
Commit:91bd2de85c368cc8d6b9d662279333a43a519778 Author:Christopher Jones Tue, 25 Jun 2013 17:31:13 -0700 Parents: 99ab8a83af7c027d09336a3672ad562917ae2966 Branches: PHP-5.5 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=91bd2de85c368cc8d6b9d662279333a43a519778 Log: Update NEWS Changed paths: M NEWS Diff: diff --git a/NEWS b/NEWS index 18eedd3..7550fb5 100644 --- a/NEWS +++ b/NEWS @@ -27,6 +27,10 @@ PHP NEWS - Intl: . Fixed bug #62759: Buggy grapheme_substr() on edge case. (Stas) +- PDO: + . Allowed PDO_OCI to compile with Oracle Database 12c client libraries. +(Chris Jones) + - Sockets: . Implemented FR #63472 (Setting SO_BINDTODEVICE with socket_set_option). (Damjan Cvetko) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Add a few links: UPGRADING
Commit:bf8ed4708e9a94b79a1810fa9a9366d67b162ed5 Author:Christopher Jones Mon, 1 Jul 2013 16:48:18 -0700 Parents: 49a2cd93d64a78761ecc743cc0d99add9e362e04 Branches: PHP-5.5 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=bf8ed4708e9a94b79a1810fa9a9366d67b162ed5 Log: Add a few links Changed paths: M UPGRADING Diff: diff --git a/UPGRADING b/UPGRADING index db94e85..99ab638 100755 --- a/UPGRADING +++ b/UPGRADING @@ -40,40 +40,45 @@ PHP 5.5 UPGRADE NOTES (http://php.net/foreach#control-structures.foreach.list, http://wiki.php.net/rfc/foreachlist) -- Support finally keyword. (Laruence) +- Support "finally" keyword. (Laruence) (http://php.net/exceptions, http://wiki.php.net/rfc/finally) - Support constant array/string dereferencing. (Laruence) - (https://wiki.php.net/rfc/constdereference) + (http://php.net/manual/en/language.types.array.php, + https://wiki.php.net/rfc/constdereference) - Add support for using empty() on the result of function calls and other expressions. Thus it is now possible to write empty(getArray()), - for example. (https://wiki.php.net/rfc/empty_isset_exprs) + for example. (http://php.net/manual/en/function.empty.php, + https://wiki.php.net/rfc/empty_isset_exprs) - Added generators. (http://php.net/generators, https://wiki.php.net/rfc/generators) - ClassName::class syntax returning full class name for a class as a - string constant. - (http://php.net/oop5.basic#language.oop5.basic.class.class, + string constant. (http://php.net/oop5.basic, https://wiki.php.net/rfc/class_name_scalars) - Added support for non-scalar Iterator keys in foreach. - (https://wiki.php.net/rfc/foreach-non-scalar-keys). + (http://php.net/manual/en/control-structures.foreach.php, + https://wiki.php.net/rfc/foreach-non-scalar-keys). - Bundled Zend OPcache extension to improve performance (http://php.net/manual/en/book.opcache.php, https://wiki.php.net/rfc/optimizerplus) - Added a simplified password hashing API - (http://php.net/password) + (http://php.net/password, https://wiki.php.net/rfc/password_hash) 2. Changes in SAPI modules - Support for changing the process's title in CLI/CLI-Server - SAPIs. (Keyur) (https://wiki.php.net/rfc/cli_process_title) + SAPIs. (Keyur) + (http://php.net/manual/en/function.cli-set-process-title.php, + http://php.net/manual/en/function.cli-get-process-title.php, + https://wiki.php.net/rfc/cli_process_title) - Support for systemd in php-fpm: Add --with-fpm-systemd option to report health to systemd, and add systemd_interval option to -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Bump PECL package info version check to allow PECL installs with PHP 5.5+: NEWS ext/oci8/package.xml ext/oci8/php_oci8.h
Commit:6ac7c9d0a7d93a26d077e9c321f030118d279cd8 Author:Christopher Jones Mon, 8 Jul 2013 13:29:49 -0700 Parents: ac26d0e6558f3c7e8c555feb0511867da5984344 Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6ac7c9d0a7d93a26d077e9c321f030118d279cd8 Log: Bump PECL package info version check to allow PECL installs with PHP 5.5+ Changed paths: M NEWS M ext/oci8/package.xml M ext/oci8/php_oci8.h Diff: diff --git a/NEWS b/NEWS index ca5d3fa..3ba0e47 100644 --- a/NEWS +++ b/NEWS @@ -42,6 +42,9 @@ PHP NEWS . Fixed bug #61860 (Offsets may be wrong for grapheme_stri* functions). (Stas) +- OCI8: + . Bump PECL package info version check to allow PECL installs with PHP 5.5+ + - PDO: . Allowed PDO_OCI to compile with Oracle Database 12c client libraries. (Chris Jones) diff --git a/ext/oci8/package.xml b/ext/oci8/package.xml index c51d216..feadf19 100644 --- a/ext/oci8/package.xml +++ b/ext/oci8/package.xml @@ -6,7 +6,7 @@ http://pear.php.net/dtd/package-2.0.xsd";> oci8 pecl.php.net Extension for Oracle Database - This extension allows you to access Oracle databases. It can be built with PHP 4.3.9 to 5.x. It can be linked with Oracle 9.2, 10.2, 11.1, or 11.2 client libraries. + This extension allows you to access Oracle databases. It can be built with PHP 4.3.9 to 5.x. It can be linked with Oracle 9.2, 10, 11, or 12.1 client libraries. Christopher Jones @@ -33,12 +33,12 @@ http://pear.php.net/dtd/package-2.0.xsd";> no - 2012-10-21 + 2013-07-08 12:00:00 - 1.4.9 - 1.4.9 + 1.4.10 + 1.4.10 stable @@ -46,7 +46,7 @@ http://pear.php.net/dtd/package-2.0.xsd";> http://www.php.net/license";>PHP - Re-fixed bug #60901 (Improve "tail" syntax for AIX installation) + Bump PECL package info version check to allow PECL installs with PHP 5.5+ @@ -397,7 +397,7 @@ http://pear.php.net/dtd/package-2.0.xsd";> 4.3.9 -5.4.99 +6.0.0 1.4.0b1 @@ -412,6 +412,21 @@ http://pear.php.net/dtd/package-2.0.xsd";> + 1.4.9 + 1.4.9 + + + stable + stable + + http://www.php.net/license";>PHP + + Re-fixed bug #60901 (Improve "tail" syntax for AIX installation) + + + + + 1.4.8 1.4.8 diff --git a/ext/oci8/php_oci8.h b/ext/oci8/php_oci8.h index 6632bc8..f107952 100644 --- a/ext/oci8/php_oci8.h +++ b/ext/oci8/php_oci8.h @@ -46,7 +46,7 @@ */ #undef PHP_OCI8_VERSION #endif -#define PHP_OCI8_VERSION "1.4.9" +#define PHP_OCI8_VERSION "1.4.10" extern zend_module_entry oci8_module_entry; #define phpext_oci8_ptr &oci8_module_entry -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
