com php-src: simple overwrites: NEWS README.RELEASE_PROCESS UPGRADING UPGRADING.INTERNALS configure.in php.i ni-development php.ini-production
win32/build/config .w32

From: Date: Sat, 15 Feb 2014 13:41:52 +0000
Subject: com php-src: simple overwrites: NEWS README.RELEASE_PROCESS UPGRADING UPGRADING.INTERNALS configure.in php.i ni-development php.ini-production
win32/build/config .w32
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-76080@lists.php.net to get a copy of this message
Commit: 533dab176c7c2460d6a7e9cd91b0cbf9ce580292 Author: Anatol Belski <ab@php.net> Sat, 15 Feb 2014 14:41:52 +0100 Parents: 9a7f242f861ee2a27cde1794aa1b0f4119102fde Branches: str_size_and_int64_56_backport Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=533dab176c7c2460d6a7e9cd91b0cbf9ce580292 Log: simple overwrites Changed paths: M NEWS M README.RELEASE_PROCESS M UPGRADING M UPGRADING.INTERNALS M configure.in M php.ini-development M php.ini-production M win32/build/config.w32

diff --git a/NEWS b/NEWS index 904168c..3d75746 100644 --- a/NEWS +++ b/NEWS @@ -1,11 +1,148 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| -?? ??? 20??, PHP 5.7.0 +?? ??? 2014, PHP 5.6.0 Alpha 3 -- DBA: - . Fixed bug #62490 (dba_delete returns true on missing item (inifile)). (Mike) +- Openssl + . Fixed segfault when accessing non-existent context for client SNI use + (Daniel Lowrey) + . Fixed bug #66501 (Add EC key support to php_openssl_is_private_key). + (Mark Zedwood) -- XSL: - . Fixed bug #64776 (The XSLT extension is not thread safe). (Mike) +13 Feb 2014, PHP 5.6.0 Alpha 2 +- Core: + . Added T_POW (**) operator + (RFC: https://wiki.php.net/rfc/pow-operator). (Tjerk Meesters) + . Implemented unified default encoding + (RFC: https://wiki.php.net/rfc/default_encoding). (Yasuo Ohgaki) + +- mysqli + . Added new function mysqli_get_links_stats() as well as new INI variable + mysqli.rollback_on_cached_plink of type bool (Andrey) + +- PCRE: + . Upgraded to PCRE 8.34. (Anatol) + +- ldap + . Added new function ldap_modify_batch(). (Ondrej Hosek) + +- Openssl + . Peer certificates now verified by default in client socket operations + (RFC: https://wiki.php.net/rfc/tls-peer-verification). (Daniel Lowrey) + +23 Jan 2014, PHP 5.6.0 Alpha 1 +- CLI server: + . Added some MIME types to the CLI web server. (Chris Jones) + +- Core: + . Improved IS_VAR operands fetching. (Laruence, Dmitry) + . Improved empty string handling. Now ZE uses an interned string instead of + allocation new empty string each time. (Laruence, Dmitry) + . Implemented internal operator overloading + (RFC: https://wiki.php.net/rfc/operator_overloading_gmp). (Nikita) + . Made calls from incompatible context issue an E_DEPRECATED warning instead + of E_STRICT (phase 1 of RFC: https://wiki.php.net/rfc/incompat_ctx). + (Gustavo) + . Uploads equal or greater than 2GB in size are now accepted. + (Ralf Lang, Mike) + . Reduced POST data memory usage by 200-300%. Changed INI setting + always_populate_raw_post_data to throw a deprecation warning when enabling + and to accept -1 for never populating the $HTTP_RAW_POST_DATA global + variable, which will be the default in future PHP versions. (Mike) + . Implemented dedicated syntax for variadic functions + (RFC: https://wiki.php.net/rfc/variadics). (Nikita) + . Fixed bug #50333 Improving multi-threaded scalability by using + emalloc/efree/estrdup (Anatol, Dmitry) + . Implemented constant scalar expressions (with support for constants) + (RFC: https://wiki.php.net/rfc/const_scalar_exprs). (Bob) + . Fixed bug #65784 (Segfault with finally). (Laruence, Dmitry) + . Fixed bug #66509 (copy() arginfo has changed starting from 5.4). (willfitch) + +- cURL: + . Implemented FR #65646 (re-enable CURLOPT_FOLLOWLOCATION with open_basedir + or safe_mode). (Adam) + +- GMP: + . Moved GMP to use object as the underlying structure and implemented various + improvements based on this. + (RFC: https://wiki.php.net/rfc/operator_overloading_gmp). (Nikita) + . Added gmp_root() and gmp_rootrem() functions for calculating nth roots. + (Nikita) + +- Hash: + . Added gost-crypto (CryptoPro S-box) GOST hash algo. (Manuel Mausz) + +- JSON: + . Fixed case part of bug #64874 ("json_decode handles whitespace and + case-sensitivity incorrectly") + +- mysqlnd: + . Disabled flag for SP OUT variables for 5.5+ servers as they are not natively + supported by the overlying APIs. (Andrey) + +- OPcache: + . Added an optimization of class constants and constant calls to some + internal functions (Laruence, Dmitry) + . Added an optimization pass to convert FCALL_BY_NAME into DO_FCALL. + (Laruence, Dmitry) + . Added an optimization pass to merged identical constants (and related + cache_slots) in op_array->literals table. (Laruence, Dmitry) + . Added script level constant replacement optimization pass. (Dmitry) + +- Openssl: + . Added crypto_method option for the ssl stream context. (Martin Jansen) + . Added certificate fingerprint support. (Tjerk Meesters) + . Added explicit TLSv1.1 and TLSv1.2 stream transports. (Daniel Lowrey) + . Fixed bug #65729 (CN_match gives false positive). (Tjerk Meesters) + . Peer name verification matches SAN DNS names for certs using + the Subject Alternative Name x509 extension. (Daniel Lowrey) + . Fixed segfault when built against OpenSSL>=1.0.1 (Daniel Lowrey) + . Added SPKAC support. (Jason Gerfen) + +- PDO_pgsql: + . Fixed Bug #42614 (PDO_pgsql: add pg_get_notify support). (Matteo) + . Fixed Bug #63657 (pgsqlCopyFromFile, pgsqlCopyToArray use Postgres < 7.3 + syntax). (Matteo) + +- phpdbg: + . Included phpdbg sapi (RFC: https://wiki.php.net/rfc/phpdbg). + (Felipe Pena, Joe Watkins and Bob Weinand) + +- pgsql: + . pg_version() returns full report which obtained by PQparameterStatus(). + (Yasuo) + . Added pg_lo_truncate(). (Yasuo) + . Added 64bit large object support for PostgreSQL 9.3 and later. (Yasuo) + +- Session: + . Fixed Bug #65315 (session.hash_function silently fallback to default md5) + (Yasuo) + . Implemented Request #54649 (Create session_serializer_name()). (Yasuo) + . Implemented Request #17860 (Session write short circuit). (Yasuo) + . Implemented Request #20421 (session_abort() and session_reset() function). + (Yasuo) + . Implemented Request #11100 (session_gc() function). (Yasuo) + +- Standard: + . Implemented FR #65634 (HTTP wrapper is very slow with protocol_version + 1.1). (Adam) + . Implemented Change crypt() behavior w/o salt RFC. (Yasuo) + https://wiki.php.net/rfc/crypt_function_salt + . Implemented request #49824 (Change array_fill() to allow creating empty + array). (Nikita) + +- XMLReader: + . Fixed bug #55285 (XMLReader::getAttribute/No/Ns methods inconsistency). + (Mike) + +- Zip: + . update libzip to version 1.11.2. + PHP don't use any ilibzip private symbol anymore. (Pierre, Remi) + . new method ZipArchive::setPassword($password). (Pierre) + . add --with-libzip option to build with system libzip. (Remi) + . new methods: + ZipArchive::setExternalAttributesName($name, $opsys, $attr [, $flags]) + ZipArchive::setExternalAttributesIndex($idx, $opsys, $attr [, $flags]) + ZipArchive::getExternalAttributesName($name, &$opsys, &$attr [, $flags]) + ZipArchive::getExternalAttributesIndex($idx, &$opsys, &$attr [, $flags]) <<< NOTE: Insert NEWS from last stable release here prior to actual release! >>> diff --git a/README.RELEASE_PROCESS b/README.RELEASE_PROCESS index 4343b62..21305f2 100644 --- a/README.RELEASE_PROCESS +++ b/README.RELEASE_PROCESS @@ -139,7 +139,7 @@ Rolling a stable release 1. Checkout your release branch, you should have created when releasing previous RC and bump the version numbers in ``main/php_version.h``, ``configure.in`` and possibly ``NEWS``. -2. If a CVE commit needs to be merged to the release, then have it commited to +2. If a CVE commit needs to be merged to the release, then have it committed to the base branches and merged upwards as usual (f.e commit the CVE fix to 5.3, merge to 5.4, 5.5 etc...). Then you can cherry-pick it in your release branch. Don't forget to update NEWS manually in an extra commit then. diff --git a/UPGRADING b/UPGRADING index f5e36fe..de12a73 100755 --- a/UPGRADING +++ b/UPGRADING @@ -20,34 +20,111 @@ PHP X.Y UPGRADE NOTES 1. Backward Incompatible Changes ======================================== -- DBA - . dba_delete() now returns false if the key was not found for the inifile - handler, too. +- JSON: + json_decode() no longer accepts non-lowercase variants of lone JSON true, + false or null values. For example, True or FALSE will now cause json_decode to + return NULL and set an error value you can fetch with json_last_error(). + This affects JSON texts consisting solely of true, false or null. Text + containing non-lowercase values inside JSON arrays or objects has never been + accepted. + +- openssl: + To prevent Man-in-the-Middle attacks against encrypted transfers client + streams now verify peer certificates by default. Previous versions + required users to manually enable peer verification. As a result of this + change, existing code using ssl:// or tls:// stream wrappers (e.g. + file_get_contents(), fsockopen(), stream_socket_client()) may no longer + connect successfully without manually disabling peer verification via the + stream context's "verify_peer" setting. Encrypted transfers delegate to + operating system certificate stores by default, so many/most users *should* + be unaffected by this transparent security enhancement. ======================================== 2. New Features ======================================== +- Added constant scalar expressions syntax. + (https://wiki.php.net/rfc/const_scalar_exprs) + +- Added dedicated syntax for variadic functions. + (https://wiki.php.net/rfc/variadics) + +- Added support for argument unpacking to complement the variadic syntax. + (https://wiki.php.net/rfc/argument_unpacking) + +- Added T_POW (**) operator. + (https://wiki.php.net/rfc/pow-operator) + +- Added unified default encoding. default_charset=UTF-8 and functions/extensions + use encoding settings honor default_charset. + (https://wiki.php.net/rfc/default_encoding) + +- The php://input stream is now re-usable and can be used concurrently with + enable_post_data_reading=0. + +- Added gost-crypto (CryptoPro S-box) hash algo. + +- Added openssl certificate fingerprint support (inclusive stream context + option). + +- Added openssl crypto method stream context option. + +- Added openssl peer verification support for SAN x509 extension + +- Added use function and use const. + (https://wiki.php.net/rfc/use_function) ======================================== 2. Changes in SAPI modules ======================================== +- Added phpdbg sapi. + (https://wiki.php.net/rfc/phpdbg) ======================================== 3. Deprecated Functionality ======================================== +- Incompatible context calls: + Instance calls from an incompatible context are now deprecated and issue + E_DEPRECATED instead of E_STRICT. See https://wiki.php.net/rfc/incompat_ctx ======================================== 4. Changed Functions ======================================== +- cURL: + CURLOPT_SAFE_UPLOAD is now turned on by default and uploads with @file + do not work unless it is explicitly set to false. + +- Crypt: + crypt() will now raise an E_NOTICE error if the salt parameter is omitted. + See: https://wiki.php.net/rfc/crypt_function_salt + +- XMLReader: + XMLReader::getAttributeNs and XMLReader::getAttributeNo now return NULL if + the attribute could not be found, just like XMLReader::getAttribute. ======================================== 5. New Functions ======================================== +- GMP: + Added gmp_root($a, $nth) and gmp_rootrem($a, $nth) for calculating nth roots. + +- Openssl: + Added string openssl_x509_fingerprint($x509, $type, $binary). + Added string openssl_spki_new($private_key, $challenge, $algorithm) + Added bool openssl_spki_verify($spkac) + Added string openssl_spki_export($spkac) + Added string openssl_spki_export_challenge($spkac) + +- LDAP: + Added ldap_escape($value, $ignore = "", $flags = 0). + Added ldap_modify_batch($link_identifier, $dn, $modifications) described in https://wiki.php.net/rfc/ldap_modify_batch. + +- Zip: + Added ZipArchive::setPassword($password) ======================================== 6. New Classes and Interfaces @@ -63,18 +140,50 @@ PHP X.Y UPGRADE NOTES 8. Other Changes to Extensions ======================================== +- GMP: + The GMP extension now uses objects as the underlying data structure, rather + than resources. GMP instances now support dumping, serialization, cloning, + casts to primitive types and have overloaded operators. + (RFC: https://wiki.php.net/rfc/operator_overloading_gmp) + +- OCI8: + - Added Implicit Result Set support for Oracle Database 12c with a + new oci_get_implicit_resultset() function. + - Using 'oci_execute($s, OCI_NO_AUTO_COMMIT)' for a SELECT no longer + unnecessarily initiates an internal ROLLBACK during connection + close. + - Added DTrace probes enabled with PHP's generic --enable-dtrace + - The oci_internal_debug() function is now a no-op. + - The phpinfo() output format for OCI8 has changed. ======================================== 9. New Global Constants ======================================== +- LDAP: + LDAP_ESCAPE_FILTER int(1) + LDAP_ESCAPE_DN int(2) ======================================== 10. Changes to INI File Handling ======================================== +- Core: + Changed always_populate_raw_post_data to throw a deprecation warning when + enabled and to recognize ohe value -1 for never populating the global + $HTTP_RAW_POST_DATA variable, which will be default in future PHP versions. ======================================== 11. Other Changes ======================================== +- File upload: + Uploads equal or greater than 2GB in size are now accepted. + +- HTTP stream wrapper: + HTTP 1.1 requests now include a Connection: close header unless explicitly + overridden by setting a Connection header via the header context option. + +- Zip: + New --with-libzip option allow to use system libzip. Version > 0.11 required, + Version >= 0.11.2 recommended for all features. diff --git a/UPGRADING.INTERNALS b/UPGRADING.INTERNALS index 97b281a..d1aca29 100644 --- a/UPGRADING.INTERNALS +++ b/UPGRADING.INTERNALS @@ -17,11 +17,108 @@ UPGRADE NOTES - PHP X.Y 1. Internal API changes ======================== - a. zend_set_memory_limit() now takes the TSRMLS_CC macro as its last argument + a. Addition of do_operation and compare object handlers + + Two new object handlers have been added: + + do_operation: + typedef int (*zend_object_do_operation_t)( + zend_uchar opcode, zval *result, zval *op1, zval *op2 TSRMLS_DC + ); + + compare: + typedef int (*zend_object_compare_zvals_t)( + zval *result, zval *op1, zval *op2 TSRMLS_DC + ); + The first handler is used to overload arithmetic operations. The first + argument specifies the opcode of the operator, result is the target zval, + op1 the first operand and op2 the second operand. For unary operations + op2 is NULL. If the handler returns FAILURE PHP falls back to the default + behavior for the operation. + + The second handler is used to perform comparison operations with + non-objects. The value written into result must be an IS_LONG with value + -1 (smaller), 0 (equal) or 1 (greater). The return value is a SUCCESS/FAILURE + return code. The difference between this handler and compare_objects is + that it will be triggered for comparisons with non-objects and objects of + different types. It takes precedence over compare_objects. + + Further docs in the RFC: https://wiki.php.net/rfc/operator_overloading_gmp + + b. return_value_ptr now always available, RETVAL_ZVAL_FAST macros + + The return_value_ptr argument to internal functions is now always set. + Previously it was only available for functions returning by-reference. + return_value_ptr can now be used to return zvals without copying them. + For this purpose two new macros are provided: + + RETVAL_ZVAL_FAST(zv); /* analog to RETVAL_ZVAL(zv, 1, 0) */ + RETURN_ZVAL_FAST(zv); /* analog to RETURN_ZVAL(zv, 1, 0) */ + + The macros behave similarly to the non-FAST variants with copy=1 and + dtor=0, but will try to return the zval without making a copy by utilizing + return_value_ptr. + + c. POST data handling + + The sapi_request_info's members post_data, post_data_len and raw_post_data as + well as raw_post_data_len have been replaced with a temp PHP stream + request_body. + + The recommended way to access raw POST data is to open and use a php://input + stream wrapper. It is safe to be used concurrently and more than once. + + d. Arginfo changes + + The pass_rest_by_reference argument of the ZEND_BEGIN_ARG_INFO and + ZEND_BEGIN_ARG_INFO_EX() is no longer used. The value passed to it is ignored. + + Instead a variadic argument is created using ZEND_ARG_VARIADIC_INFO(): + + ZEND_ARG_VARIADIC_INFO(0, name) /* pass rest by value */ + ZEND_ARG_VARIADIC_INFO(1, name) /* pass rest by reference */ + ZEND_ARG_VARIADIC_INFO(ZEND_SEND_PREFER_REF, name) + /* pass rest by prefer-ref */ + + ZEND_ARG_VARIADIC_INFO() should only be used for the last argument. + + The following changes were applied to the zend_arg_info struct: + + typedef struct _zend_arg_info { + const char *class_name; + zend_uint class_name_len; + zend_uchar type_hint; + + zend_uchar pass_by_reference; + zend_bool allow_null; + - zend_bool pass_by_reference; + + zend_bool is_variadic; + } zend_arg_info; + + The following changes were applied to the zend_internal_function_info struct: + + typedef struct _zend_internal_function_info { + zend_uint required_num_args; + zend_uchar _type_hint; + zend_bool return_reference; + - zend_bool pass_rest_by_reference; + + zend_bool _allow_null; + + zend_bool _is_variadic; + } zend_internal_function_info; + + The CHECK_ARG_SEND_TYPE(), ARG_MUST_BE_SENT_BY_REF(), + ARG_SHOULD_BE_SENT_BY_REF() and ARG_MAY_BE_SENT_BY_REF() macros now assume + that the argument passed to them is a zend_function* and that it is non-NULL. ======================== 2. Build system changes ======================== + a. Unix build system changes + - The bison version check is now a blacklist instead of a whitelist. + - The bison binary can be specified through the YACC environment/configure + variable. Previously `bison` was assumed to be in $PATH. + + b. Windows build system changes + - diff --git a/configure.in b/configure.in index d959465..6bd6872 100644 --- a/configure.in +++ b/configure.in @@ -60,7 +60,7 @@ AH_BOTTOM([ #endif #if ZEND_BROKEN_SPRINTF -zend_str_size_int zend_sprintf(char *buffer, const char *format, ...); +zend_size_t zend_sprintf(char *buffer, const char *format, ...); #else # define zend_sprintf sprintf #endif @@ -118,7 +118,7 @@ zend_str_size_int zend_sprintf(char *buffer, const char *format, ...); ]) PHP_MAJOR_VERSION=5 -PHP_MINOR_VERSION=7 +PHP_MINOR_VERSION=6 PHP_RELEASE_VERSION=0 PHP_EXTRA_VERSION="-dev" PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION" diff --git a/php.ini-development b/php.ini-development index ed4ddd5..50fbba1 100644 --- a/php.ini-development +++ b/php.ini-development @@ -699,6 +699,13 @@ default_charset = "UTF-8" ; http://php.net/output-encoding ;output_encoding = +; Always populate the $HTTP_RAW_POST_DATA variable. PHP's default behavior is +; to disable this feature and it will be removed in a future version. +; If post reading is disabled through enable_post_data_reading, +; $HTTP_RAW_POST_DATA is *NOT* populated. +; http://php.net/always-populate-raw-post-data +;always_populate_raw_post_data = -1 + ;;;;;;;;;;;;;;;;;;;;;;;;; ; Paths and Directories ; ;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/php.ini-production b/php.ini-production index 4a8f0e4..fcd96bf 100644 --- a/php.ini-production +++ b/php.ini-production @@ -697,6 +697,13 @@ default_charset = "UTF-8" ; http://php.net/output-encoding ;output_encoding = +; Always populate the $HTTP_RAW_POST_DATA variable. PHP's default behavior is +; to disable this feature and it will be removed in a future version. +; If post reading is disabled through enable_post_data_reading, +; $HTTP_RAW_POST_DATA is *NOT* populated. +; http://php.net/always-populate-raw-post-data +;always_populate_raw_post_data = -1 + ;;;;;;;;;;;;;;;;;;;;;;;;; ; Paths and Directories ; ;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/win32/build/config.w32 b/win32/build/config.w32 index b907c86..2645b47 100644 --- a/win32/build/config.w32 +++ b/win32/build/config.w32 @@ -449,4 +449,3 @@ if (PHP_STATIC_ANALYZE == "yes") { ADD_FLAG("CFLAGS", " /analyze "); ADD_FLAG("CFLAGS", " /wd6308 "); } -
« previous php.cvs (#76080) next »