[PHP-CVS] com php-src: Build OCI8 2.0 on Windows with Oracle Database 12c libraries only: ext/oci8/config.w32
Commit:b6d0cb05533d1c7a8f0cce5cffc20352669a2506 Author:Christopher Jones Wed, 18 Sep 2013 19:50:32 -0700 Parents: 3d165224da8b814b1a97f9ff02d27914a70b1f3f Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=b6d0cb05533d1c7a8f0cce5cffc20352669a2506 Log: Build OCI8 2.0 on Windows with Oracle Database 12c libraries only Changed paths: M ext/oci8/config.w32 Diff: diff --git a/ext/oci8/config.w32 b/ext/oci8/config.w32 index fdd7fa5..ac573a8 100644 --- a/ext/oci8/config.w32 +++ b/ext/oci8/config.w32 @@ -1,82 +1,38 @@ // $Id$ // vim:ft=javascript -if (PHP_OCI8 != "no" && PHP_OCI8_11G != "no") { - if (!PHP_OCI8_SHARED && !PHP_OCI8_11G_SHARED) { - WARNING("oci8 and oci8-11g provide the same extension and cannot both be built statically"); - PHP_OCI8 = "no" - PHP_OCI8_11G = "no" - } -} - -ARG_WITH("oci8", "OCI8 support", "no"); - -if (PHP_OCI8 != "no") { - - oci8_dirs = new Array( - PHP_OCI8 - ); - - oci8_lib_paths = ""; - oci8_inc_paths = ""; - - // find the Oracle install - for (i = 0; i < oci8_dirs.length; i++) { - oci8_lib_paths += oci8_dirs[i] + "\\lib;"; - oci8_lib_paths += oci8_dirs[i] + "\\lib\\msvc;"; - oci8_inc_paths += oci8_dirs[i] + "\\include;"; - } - - oci8_inc_paths += PHP_PHP_BUILD + "\\include\\instantclient;" - oci8_lib_paths += PHP_PHP_BUILD + "\\lib\\instantclient;"; - - if (CHECK_HEADER_ADD_INCLUDE("oci.h", "CFLAGS_OCI8", oci8_inc_paths) && - CHECK_LIB("oci.lib", "oci8", oci8_lib_paths)) - { - EXTENSION('oci8', 'oci8.c oci8_lob.c oci8_statement.c oci8_collection.c oci8_interface.c'); - - AC_DEFINE('HAVE_OCI8', 1); - AC_DEFINE('HAVE_OCI_INSTANT_CLIENT', 1); - AC_DEFINE('HAVE_OCI_LOB_READ2', 1); - - } else { - WARNING("oci8 not enabled: Oracle Database libraries or Oracle 10g Instant Client not found"); - PHP_OCI8 = "no" - } -} - -ARG_WITH("oci8-11g", "OCI8 support using Oracle 11g Instant Client", "no"); +ARG_WITH("oci8-12c", "OCI8 support using Oracle Database 12c Instant Client", "no"); -if (PHP_OCI8_11G != "no") { +if (PHP_OCI8_12C != "no") { - oci8_11g_dirs = new Array( - PHP_OCI8_11G + oci8_12c_dirs = new Array( + PHP_OCI8_12C ); - oci8_11g_lib_paths = ""; - oci8_11g_inc_paths = ""; + oci8_12c_lib_paths = ""; + oci8_12c_inc_paths = ""; // find the Oracle install - for (i = 0; i < oci8_11g_dirs.length; i++) { - oci8_11g_lib_paths += oci8_11g_dirs[i] + "\\lib;"; - oci8_11g_lib_paths += oci8_11g_dirs[i] + "\\lib\\msvc;"; - oci8_11g_inc_paths += oci8_11g_dirs[i] + "\\include;"; + for (i = 0; i < oci8_12c_dirs.length; i++) { + oci8_12c_lib_paths += oci8_12c_dirs[i] + "\\lib;"; + oci8_12c_lib_paths += oci8_12c_dirs[i] + "\\lib\\msvc;"; + oci8_12c_inc_paths += oci8_12c_dirs[i] + "\\include;"; } - oci8_11g_inc_paths += PHP_PHP_BUILD + "\\include\\instantclient_11;" - oci8_11g_lib_paths += PHP_PHP_BUILD + "\\lib\\instantclient_11;"; + oci8_12c_inc_paths += PHP_PHP_BUILD + "\\include\\instantclient_12;" + oci8_12c_lib_paths += PHP_PHP_BUILD + "\\lib\\instantclient_12;"; - if (CHECK_HEADER_ADD_INCLUDE("oci.h", "CFLAGS_OCI8_11G", oci8_11g_inc_paths) && - CHECK_LIB("oci.lib", "oci8_11g", oci8_11g_lib_paths)) + if (CHECK_HEADER_ADD_INCLUDE("oci.h", "CFLAGS_OCI8_12C", oci8_12c_inc_paths) && + CHECK_LIB("oci.lib", "oci8_12c", oci8_12c_lib_paths)) { - EXTENSION('oci8_11g', 'oci8.c oci8_lob.c oci8_statement.c oci8_collection.c oci8_interface.c', null, null, null, "ext\\oci8_11g") + EXTENSION('oci8_12c', 'oci8.c oci8_lob.c oci8_statement.c oci8_collection.c oci8_interface.c', null, null, null, "ext\\oci8_12c") AC_DEFINE('HAVE_OCI8', 1); AC_DEFINE('HAVE_OCI_INSTANT_CLIENT', 1); AC_DEFINE('HAVE_OCI_LOB_READ2', 1); } else { - WARNING("oci8-11g not enabled: Oracle Database libraries or Oracle 11g Instant Client not found"); - PHP_OCI8_11G = "no" + WARNING("oci8-12c not enabled: Oracle Database client libraries or Oracle Database 12c Instant Client not found"); + PHP_OCI8_12C = "no" } } -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] tag php-src: update tag php-5.5.4
Tag php-5.5.4 in php-src.git was updated from 5631897163294ebf15efb3bfaf39ef508b553bdc Tag: de81e561f2b58d9854b9a030643e1a94951d7b93 Tagger: Julien Pauli Wed Sep 18 15:40:28 2013 +0200 Log: Retagged 5.5.4 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.12 (GNU/Linux) iQEcBAABAgAGBQJSOa1VAAoJEP6FfZqQ2Q7BiloIAN27wzLi2VcWPMyIS0+ypezD vre/dMBb+fJxA3O+ez18kLi5bShZdmRwMH948lsZ75QxEmIF2SUVMiCJcjkWRKxY Dk8+fwdz9d6LRgPamkKDKWGhRJ3Ec5MNznxiBJ3hoz/c5V9E1ZCc6Wvp/njDjpTb GeO9EVELG5tVGQHfxG2+2ODZ6u4up+nUttL18CmGo3B/4D+Iiv/VHBZBnNI7Gshr 37tXt3kWvXS4SEEkJt/SSL/HDKWGDksn/VjoTcyaYMcn0cL1ebP8941rgV3Qm3He j9K+eKKeGKIZyMe3Vo5EphJFoME791JhFXHavguDirKRU7UTy4mt9tWGvIRCA/g= =Dkog -END PGP SIGNATURE- Link: http://git.php.net/?p=php-src.git;a=tag;h=de81e561f2b58d9854b9a030643e1a94951d7b93 Target: 805934fef05d51649c98cd8dc6ee24c40458a47e Author: Julien Pauli Wed, 18 Sep 2013 10:26:37 +0200 Parents: 94e4c4df86719dbdf265b9d7ccfd1db8cfd32fdf Target link: http://git.php.net/?p=php-src.git;a=commitdiff;h=805934fef05d51649c98cd8dc6ee24c40458a47e Target log: PHP-5.5.4 Changed paths: M NEWS M configure.in M main/php_version.h -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] del php-src: ext/filter/logical_filters.c ext/spl/internal/emptyiterator.inc ext/spl/spl_iterators.c ext/spl/tests/bug60577.phpt main/fopen_wrappers.c
Branch: PHP-5.5.4 Deleted commits count: 1 User: JulienPauli Wed, 18 Sep 2013 13:19:49 + Changed paths: M ext/filter/logical_filters.c M ext/spl/internal/emptyiterator.inc M ext/spl/spl_iterators.c D ext/spl/tests/bug60577.phpt M main/fopen_wrappers.c Diff: diff --git b/ext/filter/logical_filters.c a/ext/filter/logical_filters.c index 0e3297b..653cce2 100644 --- b/ext/filter/logical_filters.c +++ a/ext/filter/logical_filters.c @@ -714,7 +714,7 @@ void php_filter_validate_ip(PHP_INPUT_FILTER_PARAM_DECL) /* {{{ */ if (flags & FILTER_FLAG_NO_RES_RANGE) { if ( (ip[0] == 0) || - (ip[0] == 100 && (ip[1] == 0 || ip[1] <= 127)) || + (ip[0] == 100 && (ip[1] >= 64 || ip[1] <= 127)) || (ip[0] == 128 && ip[1] == 0) || (ip[0] == 191 && ip[1] == 255) || (ip[0] == 169 && ip[1] == 254) || diff --git b/ext/spl/internal/emptyiterator.inc a/ext/spl/internal/emptyiterator.inc index d02b15b..ac80e79 100644 --- b/ext/spl/internal/emptyiterator.inc +++ a/ext/spl/internal/emptyiterator.inc @@ -15,7 +15,7 @@ * @version 1.0 * @since PHP 5.1 */ -class EmptyIterator implements Iterator, Countable +class EmptyIterator implements Iterator { /** No operation. * @return void @@ -57,15 +57,6 @@ class EmptyIterator implements Iterator, Countable { // nothing to do } - - /** -* @return int -*/ - function count() - { - return 0; - } - } -?> +?> \ No newline at end of file diff --git b/ext/spl/spl_iterators.c a/ext/spl/spl_iterators.c index 476c64e..3053275 100644 --- b/ext/spl/spl_iterators.c +++ a/ext/spl/spl_iterators.c @@ -3241,23 +3241,12 @@ SPL_METHOD(EmptyIterator, next) } } /* }}} */ -/* {{{ proto int EmptyIterator::count() - Does nothing */ -SPL_METHOD(EmptyIterator, count) -{ - if (zend_parse_parameters_none() == FAILURE) { - return; - } - RETURN_LONG(0); -} /* }}} */ - static const zend_function_entry spl_funcs_EmptyIterator[] = { SPL_ME(EmptyIterator, rewind, arginfo_recursive_it_void, ZEND_ACC_PUBLIC) SPL_ME(EmptyIterator, valid,arginfo_recursive_it_void, ZEND_ACC_PUBLIC) SPL_ME(EmptyIterator, key, arginfo_recursive_it_void, ZEND_ACC_PUBLIC) SPL_ME(EmptyIterator, current, arginfo_recursive_it_void, ZEND_ACC_PUBLIC) SPL_ME(EmptyIterator, next, arginfo_recursive_it_void, ZEND_ACC_PUBLIC) - SPL_ME(EmptyIterator, count,arginfo_recursive_it_void, ZEND_ACC_PUBLIC) PHP_FE_END }; @@ -3718,7 +3707,6 @@ PHP_MINIT_FUNCTION(spl_iterators) REGISTER_SPL_STD_CLASS_EX(EmptyIterator, NULL, spl_funcs_EmptyIterator); REGISTER_SPL_ITERATOR(EmptyIterator); - REGISTER_SPL_IMPLEMENTS(EmptyIterator, Countable); REGISTER_SPL_SUB_CLASS_EX(RecursiveTreeIterator, RecursiveIteratorIterator, spl_RecursiveTreeIterator_new, spl_funcs_RecursiveTreeIterator); REGISTER_SPL_CLASS_CONST_LONG(RecursiveTreeIterator, "BYPASS_CURRENT", RTIT_BYPASS_CURRENT); diff --git b/ext/spl/tests/bug60577.phpt a/ext/spl/tests/bug60577.phpt deleted file mode 100644 index 33fc133..000 --- b/ext/spl/tests/bug60577.phpt +++ /dev/null @@ -1,8 +0,0 @@ ---TEST-- -count(new EmptyIterator) should return zero ---FILE-- - MAXPATHLEN - 1 ? MAXPATHLEN - 1 : strlen(filepath); - real_path = estrndup(filepath, copy_len); + if (real_path) { + memcpy(real_path, filepath, copy_len); + real_path[copy_len] = '\0'; + } else { + real_path = estrndup(filepath, copy_len); + } close(fdtest); return real_path; } else { -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: PHP-5.5.4: NEWS configure.in main/php_version.h
Commit:805934fef05d51649c98cd8dc6ee24c40458a47e Author:Julien Pauli Wed, 18 Sep 2013 10:26:37 +0200 Parents: 94e4c4df86719dbdf265b9d7ccfd1db8cfd32fdf Branches: PHP-5.5.4 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=805934fef05d51649c98cd8dc6ee24c40458a47e Log: PHP-5.5.4 Changed paths: M NEWS M configure.in M main/php_version.h Diff: diff --git a/NEWS b/NEWS index 37db7e6..3a9326e 100644 --- a/NEWS +++ b/NEWS @@ -1,31 +1,6 @@ PHPNEWS ||| -?? ??? 2013, PHP 5.5.5 - -- CLI server: - . Fixed bug #65633 (built-in server treat some http headers as -case-sensitive). (Adam) - -- Datetime: - . Fixed bug #65502 (DateTimeImmutable::createFromFormat returns DateTime). -(Boro Sitnikovski) - . Fixed bug #65548 (Comparison for DateTimeImmutable doesn't work). -(Boro Sitnikovski) - -- GD - . Ensure that the defined interpolation method is used with the generic -scaling methods. (Pierre) - -- OPcache: - . Fixed bug #65665 (Exception not properly caught when opcache enabled). -(Laruence) - . Fixed bug #65510 (5.5.2 crashes in _get_zval_ptr_ptr_var). (Dmitry) - -- SPL: - . Fix bug #64782 (SplFileObject constructor make $context optional / give it -a default value). (Nikita) - -?? ??? 2013, PHP 5.5.4 +18 Sep 2013, PHP 5.5.4 - Core: . Fixed bug #60598 (cli/apache sapi segfault on objects manipulation). diff --git a/configure.in b/configure.in index 4013062..f8f6a48 100644 --- a/configure.in +++ b/configure.in @@ -119,8 +119,8 @@ int zend_sprintf(char *buffer, const char *format, ...); PHP_MAJOR_VERSION=5 PHP_MINOR_VERSION=5 -PHP_RELEASE_VERSION=5 -PHP_EXTRA_VERSION="-dev" +PHP_RELEASE_VERSION=4 +PHP_EXTRA_VERSION="" 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 d9ea4aa..e233466 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 5 -#define PHP_RELEASE_VERSION 5 -#define PHP_EXTRA_VERSION "-dev" -#define PHP_VERSION "5.5.5-dev" -#define PHP_VERSION_ID 50505 +#define PHP_RELEASE_VERSION 4 +#define PHP_EXTRA_VERSION "" +#define PHP_VERSION "5.5.4" +#define PHP_VERSION_ID 50504 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: better way to fix PRIu64 availability on windows: main/php_variables.c win32/php_inttypes.h
Commit:86dfe7be49a674358e69003413c4a48bee3463ed Author:Anatol Belski Wed, 18 Sep 2013 15:14:36 +0200 Parents: dc7015d4e4c2f9cb139ccb2befc4075f6a228a24 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=86dfe7be49a674358e69003413c4a48bee3463ed Log: better way to fix PRIu64 availability on windows Changed paths: M main/php_variables.c A win32/php_inttypes.h diff --git a/main/php_variables.c b/main/php_variables.c index 353aa63..ab9aee3 100644 --- a/main/php_variables.c +++ b/main/php_variables.c @@ -29,6 +29,9 @@ #include "php_content_types.h" #include "SAPI.h" #include "zend_globals.h" +#ifdef PHP_WIN32 +# include "win32/php_inttypes.h" +#endif /* for systems that need to override reading of environment variables */ void _php_import_environment_variables(zval *array_ptr TSRMLS_DC); @@ -292,11 +295,7 @@ static inline int add_post_vars(zval *arr, post_var_data_t *vars, zend_bool eof while (add_post_var(arr, vars, eof TSRMLS_CC)) { if (++vars->cnt > max_vars) { php_error_docref(NULL TSRMLS_CC, E_WARNING, -#ifdef PHP_WIN32 - "Input variables exceeded %I64u. " -#else "Input variables exceeded %" PRIu64 ". " -#endif "To increase the limit change max_input_vars in php.ini.", max_vars); return FAILURE; diff --git a/win32/php_inttypes.h b/win32/php_inttypes.h new file mode 100644 index 000..2554277 --- /dev/null +++ b/win32/php_inttypes.h @@ -0,0 +1,305 @@ +// ISO C9x compliant inttypes.h for Microsoft Visual Studio +// Based on ISO/IEC 9899:TC2 Committee draft (May 6, 2005) WG14/N1124 +// +// Copyright (c) 2006 Alexander Chemeris +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are met: +// +// 1. Redistributions of source code must retain the above copyright notice, +// this list of conditions and the following disclaimer. +// +// 2. Redistributions in binary form must reproduce the above copyright +// notice, this list of conditions and the following disclaimer in the +// documentation and/or other materials provided with the distribution. +// +// 3. The name of the author may be used to endorse or promote products +// derived from this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +// EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +// OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// +/// + +#ifndef _MSC_VER // [ +#error "Use this header only with Microsoft Visual C++ compilers!" +#endif // _MSC_VER ] + +#ifndef _MSC_INTTYPES_H_ // [ +#define _MSC_INTTYPES_H_ + +#if _MSC_VER > 1000 +#pragma once +#endif + +#include "stdint.h" + +// 7.8 Format conversion of integer types + +typedef struct { + intmax_t quot; + intmax_t rem; +} imaxdiv_t; + +// 7.8.1 Macros for format specifiers + +#if !defined(__cplusplus) || defined(__STDC_FORMAT_MACROS) // [ See footnote 185 at page 198 + +// The fprintf macros for signed integers are: +#define PRId8 "d" +#define PRIi8 "i" +#define PRIdLEAST8 "d" +#define PRIiLEAST8 "i" +#define PRIdFAST8 "d" +#define PRIiFAST8 "i" + +#define PRId16 "hd" +#define PRIi16 "hi" +#define PRIdLEAST16 "hd" +#define PRIiLEAST16 "hi" +#define PRIdFAST16 "hd" +#define PRIiFAST16 "hi" + +#define PRId32 "I32d" +#define PRIi32 "I32i" +#define PRIdLEAST32 "I32d" +#define PRIiLEAST32 "I32i" +#define PRIdFAST32 "I32d" +#define PRIiFAST32 "I32i" + +#define PRId64 "I64d" +#define PRIi64 "I64i" +#define PRIdLEAST64 "I64d" +#define PRIiLEAST64 "I64i" +#define PRIdFAST64 "I64d" +#define PRIiFAST64 "I64i" + +#define PRIdMAX "I64d" +#define PRIiMAX "I64i" + +#define PRIdPTR "Id" +#define PRIiPTR "Ii" + +// The fprintf macros for unsigned integers are: +#define PRIo8 "o" +#define PRIu8 "u" +#define PRIx8 "x" +#define PRIX8 "X" +#define PRIoLEAST8 "o" +#define PRIuLEAST8 "u" +#define PRIxLEAST8 "x" +#define PRIXLEAST8 "X" +#define PRIoFAST8 "o" +#define P
[PHP-CVS] com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/spl/spl_iterators.c
Commit:94e4c4df86719dbdf265b9d7ccfd1db8cfd32fdf Author:David Soria Parra Wed, 18 Sep 2013 15:06:51 +0200 Parents: 2eb566188625162644a186bcb6757f22978c54f9 7a24ee13ec74bf3e85970e59dd69db8034ff434c Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=94e4c4df86719dbdf265b9d7ccfd1db8cfd32fdf Log: Merge branch 'PHP-5.4' into PHP-5.5 * PHP-5.4: Revert "EmptyIterator now implements Countable; fixes bug 60577" Bugs: https://bugs.php.net/60577 Changed paths: MM ext/spl/spl_iterators.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Revert "EmptyIterator now implements Countable; fixes bug 60577": NEWS ext/spl/internal/emptyiterator.inc ext/spl/spl_iterators.c ext/spl/tests/bug60577.phpt
Commit:7a24ee13ec74bf3e85970e59dd69db8034ff434c Author:David Soria Parra Wed, 18 Sep 2013 15:06:19 +0200 Parents: 7e9044b6a251f40da1217c3265b83a9caae8bff8 Branches: PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=7a24ee13ec74bf3e85970e59dd69db8034ff434c Log: Revert "EmptyIterator now implements Countable; fixes bug 60577" This reverts commit 8a936e8eb938965b0daaf076c109ec60141e57a7. Bugs: https://bugs.php.net/60577 Changed paths: M NEWS M ext/spl/internal/emptyiterator.inc M ext/spl/spl_iterators.c D ext/spl/tests/bug60577.phpt Diff: diff --git a/NEWS b/NEWS index d8895bd..6d94980 100644 --- a/NEWS +++ b/NEWS @@ -15,9 +15,6 @@ PHP NEWS . Fixed bug #64441 (FILTER_VALIDATE_URL rejects fully qualified domain names). (Syra) -- SPL: - . Fixed bug #60577 (count(new EmptyIterator) returns 1). (Levi Morrison) - ?? ??? 2013, PHP 5.4.20 - Core: diff --git a/ext/spl/internal/emptyiterator.inc b/ext/spl/internal/emptyiterator.inc index d02b15b..ac80e79 100644 --- a/ext/spl/internal/emptyiterator.inc +++ b/ext/spl/internal/emptyiterator.inc @@ -15,7 +15,7 @@ * @version 1.0 * @since PHP 5.1 */ -class EmptyIterator implements Iterator, Countable +class EmptyIterator implements Iterator { /** No operation. * @return void @@ -57,15 +57,6 @@ class EmptyIterator implements Iterator, Countable { // nothing to do } - - /** -* @return int -*/ - function count() - { - return 0; - } - } -?> +?> \ No newline at end of file diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c index ad76258..eb82476 100644 --- a/ext/spl/spl_iterators.c +++ b/ext/spl/spl_iterators.c @@ -3279,23 +3279,12 @@ SPL_METHOD(EmptyIterator, next) } } /* }}} */ -/* {{{ proto int EmptyIterator::count() - Does nothing */ -SPL_METHOD(EmptyIterator, count) -{ - if (zend_parse_parameters_none() == FAILURE) { - return; - } - RETURN_LONG(0); -} /* }}} */ - static const zend_function_entry spl_funcs_EmptyIterator[] = { SPL_ME(EmptyIterator, rewind, arginfo_recursive_it_void, ZEND_ACC_PUBLIC) SPL_ME(EmptyIterator, valid,arginfo_recursive_it_void, ZEND_ACC_PUBLIC) SPL_ME(EmptyIterator, key, arginfo_recursive_it_void, ZEND_ACC_PUBLIC) SPL_ME(EmptyIterator, current, arginfo_recursive_it_void, ZEND_ACC_PUBLIC) SPL_ME(EmptyIterator, next, arginfo_recursive_it_void, ZEND_ACC_PUBLIC) - SPL_ME(EmptyIterator, count,arginfo_recursive_it_void, ZEND_ACC_PUBLIC) PHP_FE_END }; @@ -3767,7 +3756,6 @@ PHP_MINIT_FUNCTION(spl_iterators) REGISTER_SPL_STD_CLASS_EX(EmptyIterator, NULL, spl_funcs_EmptyIterator); REGISTER_SPL_ITERATOR(EmptyIterator); - REGISTER_SPL_IMPLEMENTS(EmptyIterator, Countable); REGISTER_SPL_SUB_CLASS_EX(RecursiveTreeIterator, RecursiveIteratorIterator, spl_RecursiveTreeIterator_new, spl_funcs_RecursiveTreeIterator); REGISTER_SPL_CLASS_CONST_LONG(RecursiveTreeIterator, "BYPASS_CURRENT", RTIT_BYPASS_CURRENT); diff --git a/ext/spl/tests/bug60577.phpt b/ext/spl/tests/bug60577.phpt deleted file mode 100644 index 33fc133..000 --- a/ext/spl/tests/bug60577.phpt +++ /dev/null @@ -1,8 +0,0 @@ ---TEST-- -count(new EmptyIterator) should return zero ---FILE-- -http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/filter/logical_filters.c
Commit:2eb566188625162644a186bcb6757f22978c54f9 Author:David Soria Parra Wed, 18 Sep 2013 14:28:57 +0200 Parents: a34b141e08f02c34a100676080dddf7d9be84544 7e9044b6a251f40da1217c3265b83a9caae8bff8 Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2eb566188625162644a186bcb6757f22978c54f9 Log: Merge branch 'PHP-5.4' into PHP-5.5 * PHP-5.4: RFC 6598 reserved ip range starts at 100.64.0.0 Changed paths: MM ext/filter/logical_filters.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: RFC 6598 reserved ip range starts at 100.64.0.0: ext/filter/logical_filters.c
Commit:7e9044b6a251f40da1217c3265b83a9caae8bff8 Author:David Soria Parra Wed, 18 Sep 2013 14:26:10 +0200 Parents: 9bfd55cda3bd66b56af84a569fafd8a77cbb3726 Branches: PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=7e9044b6a251f40da1217c3265b83a9caae8bff8 Log: RFC 6598 reserved ip range starts at 100.64.0.0 Changed paths: M ext/filter/logical_filters.c Diff: diff --git a/ext/filter/logical_filters.c b/ext/filter/logical_filters.c index 71c5aba..1496488 100644 --- a/ext/filter/logical_filters.c +++ b/ext/filter/logical_filters.c @@ -714,7 +714,7 @@ void php_filter_validate_ip(PHP_INPUT_FILTER_PARAM_DECL) /* {{{ */ if (flags & FILTER_FLAG_NO_RES_RANGE) { if ( (ip[0] == 0) || - (ip[0] == 100 && (ip[1] == 0 || ip[1] <= 127)) || + (ip[0] == 100 && (ip[1] >= 64 || ip[1] <= 127)) || (ip[0] == 128 && ip[1] == 0) || (ip[0] == 191 && ip[1] == 255) || (ip[0] == 169 && ip[1] == 254) || -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] com php-src: fix build - PRIu64 vs %I64u: main/php_variables.c
On Wed, September 18, 2013 10:59, Michael Wallner wrote: > Hi Anatol! > > > On 18 September 2013 10:34, Anatol Belski wrote: > >> That's a good idea, i also thought about macrifying all those at once. >> Not >> sure it belongs to stdint, it's actually more like printf format. I'll >> do this anyway, have to look for a right place. > > POSIX has it in inttypes.h > > > > > -- > Regards, > Mike > > Hi Michael, oki then, i'll rework this fix to put it to win/php_stdint.h Regards Anatol -- 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.5': main/fopen_wrappers.c
Commit:33c4b61c7f477994d4f30fff349cb1815680642d Author:Michael Wallner Wed, 18 Sep 2013 11:12:44 +0200 Parents: cdf5d201ab570284d8865a4b8366bddb662410eb a34b141e08f02c34a100676080dddf7d9be84544 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=33c4b61c7f477994d4f30fff349cb1815680642d Log: Merge branch 'PHP-5.5' * PHP-5.5: fix a very rare case of use of uninitialized value combined with a memleak Changed paths: MM main/fopen_wrappers.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: fix a very rare case of use of uninitialized value combined with a memleak: main/fopen_wrappers.c
Commit:9bfd55cda3bd66b56af84a569fafd8a77cbb3726 Author:Michael Wallner Wed, 18 Sep 2013 11:10:55 +0200 Parents: dfd7d1063a5292b04f6134284337550f4f513749 Branches: PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9bfd55cda3bd66b56af84a569fafd8a77cbb3726 Log: fix a very rare case of use of uninitialized value combined with a memleak Changed paths: M main/fopen_wrappers.c Diff: diff --git a/main/fopen_wrappers.c b/main/fopen_wrappers.c index 6f11cf3..9b8645a 100644 --- a/main/fopen_wrappers.c +++ b/main/fopen_wrappers.c @@ -775,7 +775,12 @@ PHPAPI char *expand_filepath_with_mode(const char *filepath, char *real_path, co * we cannot cannot getcwd() and the requested, * relatively referenced file is accessible */ copy_len = strlen(filepath) > MAXPATHLEN - 1 ? MAXPATHLEN - 1 : strlen(filepath); - real_path = estrndup(filepath, copy_len); + if (real_path) { + memcpy(real_path, filepath, copy_len); + real_path[copy_len] = '\0'; + } else { + real_path = estrndup(filepath, copy_len); + } close(fdtest); return real_path; } else { -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: fix test concurrency: ext/phar/tests/phar_extract2.phpt
Commit:cdf5d201ab570284d8865a4b8366bddb662410eb Author:Michael Wallner Wed, 18 Sep 2013 11:02:45 +0200 Parents: e9877fe92e8f9a0cc212362f6c35550b92036b3e Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=cdf5d201ab570284d8865a4b8366bddb662410eb Log: fix test concurrency Changed paths: M ext/phar/tests/phar_extract2.phpt Diff: diff --git a/ext/phar/tests/phar_extract2.phpt b/ext/phar/tests/phar_extract2.phpt index fafe254..7de8cee 100644 --- a/ext/phar/tests/phar_extract2.phpt +++ b/ext/phar/tests/phar_extract2.phpt @@ -23,7 +23,7 @@ $phar->extractTo(dirname(__FILE__) . '/extract2', 'mount2'); $phar->extractTo(dirname(__FILE__) . '/extract2'); $out = array(); -foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator(dirname(__FILE__) . '/extract', 0x3000), RecursiveIteratorIterator::CHILD_FIRST) as $path => $file) { +foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator(dirname(__FILE__) . '/extract2', 0x3000), RecursiveIteratorIterator::CHILD_FIRST) as $path => $file) { $extracted[] = $path; } @@ -51,10 +51,10 @@ $dir = dirname(__FILE__) . '/extract1/'; @rmdir($dir); ?> --EXPECTF-- -%sextract%cfile1.txt -%sextract%cfile2.txt -%sextract%cone -%sextract%csubdir -%sextract%csubdir%cectory -%sextract%csubdir%cectory%cfile.txt +%sextract2%cfile1.txt +%sextract2%cfile2.txt +%sextract2%cone +%sextract2%csubdir +%sextract2%csubdir%cectory +%sextract2%csubdir%cectory%cfile.txt ===DONE=== -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] com php-src: fix build - PRIu64 vs %I64u: main/php_variables.c
Hi Anatol! On 18 September 2013 10:34, Anatol Belski wrote: > That's a good idea, i also thought about macrifying all those at once. Not > sure it belongs to stdint, it's actually more like printf format. I'll do > this anyway, have to look for a right place. POSIX has it in inttypes.h -- Regards, Mike -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: fix test concurrency: ext/phar/tests/031.phpt ext/phar/tests/032.phpt ext/phar/tests/files/phar_oo_test.inc ext/phar/tests/phar_buildfromdirectory1.phpt ext/phar/tests/phar_buil
Commit:14d53417879256044c40b2ef8d0aa32b1f215acb Author:Michael Wallner Wed, 18 Sep 2013 10:52:51 +0200 Parents: 6866b45a48a773f434c04828c9d0a05ae9d9cf3f Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=14d53417879256044c40b2ef8d0aa32b1f215acb Log: fix test concurrency Changed paths: M ext/phar/tests/031.phpt M ext/phar/tests/032.phpt M ext/phar/tests/files/phar_oo_test.inc M ext/phar/tests/phar_buildfromdirectory1.phpt M ext/phar/tests/phar_buildfromdirectory2-win.phpt M ext/phar/tests/phar_buildfromdirectory2.phpt M ext/phar/tests/phar_buildfromdirectory3.phpt M ext/phar/tests/phar_buildfromdirectory4.phpt M ext/phar/tests/phar_buildfromdirectory5.phpt M ext/phar/tests/phar_buildfromdirectory6.phpt M ext/phar/tests/phar_buildfromiterator1.phpt M ext/phar/tests/phar_buildfromiterator10.phpt M ext/phar/tests/phar_buildfromiterator2.phpt M ext/phar/tests/phar_buildfromiterator3.phpt M ext/phar/tests/phar_buildfromiterator4.phpt M ext/phar/tests/phar_buildfromiterator5.phpt M ext/phar/tests/phar_buildfromiterator6.phpt M ext/phar/tests/phar_buildfromiterator7.phpt M ext/phar/tests/phar_buildfromiterator8.phpt M ext/phar/tests/phar_buildfromiterator9.phpt M ext/phar/tests/phar_extract.phpt M ext/phar/tests/phar_extract2.phpt M ext/phar/tests/phar_extract3.phpt M ext/phar/tests/phar_oo_001.phpt M ext/phar/tests/phar_oo_001U.phpt M ext/phar/tests/phar_oo_002.phpt M ext/phar/tests/phar_oo_002U.phpt M ext/phar/tests/phar_oo_003.phpt M ext/phar/tests/phar_oo_004.phpt M ext/phar/tests/phar_oo_004U.phpt M ext/phar/tests/phar_oo_005.phpt M ext/phar/tests/phar_oo_005U.phpt M ext/phar/tests/phar_oo_005_5.2.phpt M ext/phar/tests/phar_oo_006.phpt M ext/phar/tests/phar_oo_007.phpt M ext/phar/tests/phar_oo_008.phpt M ext/phar/tests/phar_oo_009.phpt M ext/phar/tests/phar_oo_010.phpt M ext/phar/tests/phar_oo_011.phpt M ext/phar/tests/phar_oo_011b.phpt M ext/phar/tests/phar_oo_012.phpt M ext/phar/tests/phar_oo_012_confirm.phpt M ext/phar/tests/phar_oo_012b.phpt diff --git a/ext/phar/tests/031.phpt b/ext/phar/tests/031.phpt index 4d59886..d458f06 100644 --- a/ext/phar/tests/031.phpt +++ b/ext/phar/tests/031.phpt @@ -22,10 +22,10 @@ require $pname; ===DONE=== --CLEAN-- --EXPECTF-- string(25) "getMessage(); ===DONE=== --CLEAN-- --EXPECTF-- -phar "%sphar_oo_test.phar.php" does not have a signature===DONE=== \ No newline at end of file +phar "%s032.phar.php" does not have a signature===DONE=== \ No newline at end of file diff --git a/ext/phar/tests/files/phar_oo_test.inc b/ext/phar/tests/files/phar_oo_test.inc index e92b444..4542156 100644 --- a/ext/phar/tests/files/phar_oo_test.inc +++ b/ext/phar/tests/files/phar_oo_test.inc @@ -2,7 +2,8 @@ ini_set('date.timezone', 'GMT'); -$fname = dirname(__FILE__) . '/phar_oo_test.phar.php'; +$tname = basename(current(get_included_files()), ".php"); +$fname = dirname(__FILE__) . "/$tname.phar.php"; $pname = 'phar://' . $fname; $file = (binary)''; diff --git a/ext/phar/tests/phar_buildfromdirectory1.phpt b/ext/phar/tests/phar_buildfromdirectory1.phpt index 63e06fa..957f246 100644 --- a/ext/phar/tests/phar_buildfromdirectory1.phpt +++ b/ext/phar/tests/phar_buildfromdirectory1.phpt @@ -7,7 +7,7 @@ phar.require_hash=0 phar.readonly=0 --FILE-- buildFromDirectory(1); @@ -19,7 +19,7 @@ try { ===DONE=== --CLEAN-- --EXPECTF-- diff --git a/ext/phar/tests/phar_buildfromdirectory2-win.phpt b/ext/phar/tests/phar_buildfromdirectory2-win.phpt index 9dbcf96..5ed890a 100644 --- a/ext/phar/tests/phar_buildfromdirectory2-win.phpt +++ b/ext/phar/tests/phar_buildfromdirectory2-win.phpt @@ -11,7 +11,7 @@ phar.readonly=0 --FILE-- buildFromDirectory(1); } catch (Exception $e) { var_dump(get_class($e)); @@ -21,7 +21,7 @@ try { ===DONE=== --CLEAN-- --EXPECTF-- diff --git a/ext/phar/tests/phar_buildfromdirectory2.phpt b/ext/phar/tests/phar_buildfromdirectory2.phpt index 639ff0b..a33e50a 100644 --- a/ext/phar/tests/phar_buildfromdirectory2.phpt +++ b/ext/phar/tests/phar_buildfromdirectory2.phpt @@ -11,7 +11,7 @@ phar.readonly=0 --FILE-- buildFromDirectory(1); } catch (Exception $e) { var_dump(get_class($e)); @@ -21,7 +21,7 @@ try { ===DONE=== --CLEAN-- --EXPECTF-- diff --git a/ext/phar/tests/phar_buildfromdirectory3.phpt b/ext/phar/tests/phar_buildfromdirectory3.phpt index 2134cbd..921e395 100644 --- a/ext/phar/tests/phar_buildfromdirectory3.phpt +++ b/ext/phar/tests/phar_buildfromdirectory3.phpt @@ -9,7 +9,7 @@ phar.readonly=0 buildFromDirectory('files', new stdClass); } catch (Exception $e) { var_dump(get_class($e)); @@ -19,7 +19,7 @@ try { ===DONE=== --CLEAN-- --EXPECTF-- diff --git a/ext/phar/tests/phar_buildfromdirectory4.phpt b/ext/phar/tests/phar_buildfromdirectory4.phpt index 683ac4b..5ee2c33 100644 --- a/ext/phar/tests/phar_buildfromdirectory4.phpt ++
[PHP-CVS] com php-src: fix test concurrency: ext/standard/tests/dir/chdir_basic.phpt ext/standard/tests/dir/chdir_variation2.phpt ext/standard/tests/file/bug41655_2.phpt ext/standard/tests/file/fopen_
Commit:002763fb7b603b30fab3955c0acd132298926c1b Author:Michael Wallner Wed, 18 Sep 2013 10:52:18 +0200 Parents: 4a85b5e190d6651bee26bbbeff4ed09d2932f352 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=002763fb7b603b30fab3955c0acd132298926c1b Log: fix test concurrency Changed paths: M ext/standard/tests/dir/chdir_basic.phpt M ext/standard/tests/dir/chdir_variation2.phpt M ext/standard/tests/file/bug41655_2.phpt M ext/standard/tests/file/fopen_include_path.inc M ext/standard/tests/file/fopen_variation16.phpt M ext/standard/tests/file/fopen_variation17.phpt M ext/standard/tests/file/fscanf_variation53.phpt M ext/standard/tests/file/rename_variation1.phpt M ext/standard/tests/file/rename_variation2-win32.phpt M ext/standard/tests/file/rename_variation2.phpt M ext/standard/tests/file/rename_variation3.phpt M ext/standard/tests/file/rename_variation4.phpt M ext/standard/tests/file/rename_variation5.phpt M ext/standard/tests/streams/stream_get_meta_data_socket_basic.phpt M ext/standard/tests/streams/stream_get_meta_data_socket_variation1.phpt M ext/standard/tests/streams/stream_get_meta_data_socket_variation2.phpt M ext/standard/tests/streams/stream_get_meta_data_socket_variation3.phpt M ext/standard/tests/streams/stream_get_meta_data_socket_variation4.phpt diff --git a/ext/standard/tests/dir/chdir_basic.phpt b/ext/standard/tests/dir/chdir_basic.phpt index 5fc0e5b..81d3c7c 100644 --- a/ext/standard/tests/dir/chdir_basic.phpt +++ b/ext/standard/tests/dir/chdir_basic.phpt @@ -14,40 +14,40 @@ Test chdir() function : basic functionality echo "*** Testing chdir() : basic functionality ***\n"; $base_dir_path = dirname(__FILE__); -$level_one_dir_name = "level_one"; -$level_one_dir_path = "$base_dir_path/$level_one_dir_name"; +$level1_one_dir_name = "level1_one"; +$level1_one_dir_path = "$base_dir_path/$level1_one_dir_name"; -$level_two_dir_name = "level_two"; -$level_two_dir_path = "$base_dir_path/$level_one_dir_name/$level_two_dir_name"; +$level1_two_dir_name = "level1_two"; +$level1_two_dir_path = "$base_dir_path/$level1_one_dir_name/$level1_two_dir_name"; // create directories -mkdir($level_one_dir_path); -mkdir($level_two_dir_path); +mkdir($level1_one_dir_path); +mkdir($level1_two_dir_path); echo "\n-- Testing chdir() with absolute path: --\n"; chdir($base_dir_path); -var_dump(chdir($level_one_dir_path)); +var_dump(chdir($level1_one_dir_path)); var_dump(getcwd()); echo "\n-- Testing chdir() with relative paths: --\n"; -var_dump(chdir($level_two_dir_name)); +var_dump(chdir($level1_two_dir_name)); var_dump(getcwd()); ?> ===DONE=== --CLEAN-- --EXPECTF-- *** Testing chdir() : basic functionality *** -- Testing chdir() with absolute path: -- bool(true) -string(%d) "%slevel_one" +string(%d) "%slevel1_one" -- Testing chdir() with relative paths: -- bool(true) -string(%d) "%slevel_one%elevel_two" +string(%d) "%slevel1_one%elevel1_two" ===DONE=== diff --git a/ext/standard/tests/dir/chdir_variation2.phpt b/ext/standard/tests/dir/chdir_variation2.phpt index fa70f9e..9ca6a97 100644 --- a/ext/standard/tests/dir/chdir_variation2.phpt +++ b/ext/standard/tests/dir/chdir_variation2.phpt @@ -15,32 +15,32 @@ echo "*** Testing chdir() : usage variations ***\n"; $base_dir_path = dirname(__FILE__); -$level_one_dir_name = "level_one"; -$level_one_dir_path = "$base_dir_path/$level_one_dir_name"; +$level2_one_dir_name = "level2_one"; +$level2_one_dir_path = "$base_dir_path/$level2_one_dir_name"; -$level_two_dir_name = "level_two"; -$level_two_dir_path = "$base_dir_path/$level_one_dir_name/$level_two_dir_name"; +$level2_two_dir_name = "level2_two"; +$level2_two_dir_path = "$base_dir_path/$level2_one_dir_name/$level2_two_dir_name"; // create directories -mkdir($level_one_dir_path); -mkdir($level_two_dir_path); +mkdir($level2_one_dir_path); +mkdir($level2_two_dir_path); -echo "\n-- \$directory = './level_one': --\n"; +echo "\n-- \$directory = './level2_one': --\n"; var_dump(chdir($base_dir_path)); -var_dump(chdir("./$level_one_dir_name")); +var_dump(chdir("./$level2_one_dir_name")); var_dump(getcwd()); -echo "\n-- \$directory = 'level_one/level_two': --\n"; +echo "\n-- \$directory = 'level2_one/level2_two': --\n"; var_dump(chdir($base_dir_path)); -var_dump(chdir("$level_one_dir_name/$level_two_dir_name")); +var_dump(chdir("$level2_one_dir_name/$level2_two_dir_name")); var_dump(getcwd()); echo "\n-- \$directory = '..': --\n"; var_dump(chdir('..')); var_dump(getcwd()); -echo "\n-- \$directory = 'level_two', '.': --\n"; -var_dump(chdir($level_two_dir_path)); +echo "\n-- \$directory = 'level2_two', '.': --\n"; +var_dump(chdir($level2_two_dir_path)); var_dump(chdir('.')); var_dump(getcwd()); @@ -49,13 +49,13 @@ var_dump(chdir('../')); var_dump(getcwd()); echo "\n-- \$directory = './': --\n"; -var_dump(chdir($level_two_dir_path)); +var_dump(chdir($level2_two_dir_path));
[PHP-CVS] com php-src: fix test concurrency: ext/spl/tests/DirectoryIterator_getBasename_basic_test.phpt ext/spl/tests/DirectoryIterator_getBasename_pass_array.phpt ext/spl/tests/RecursiveDirectoryIte
Commit:6866b45a48a773f434c04828c9d0a05ae9d9cf3f Author:Michael Wallner Wed, 18 Sep 2013 10:52:35 +0200 Parents: 002763fb7b603b30fab3955c0acd132298926c1b Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6866b45a48a773f434c04828c9d0a05ae9d9cf3f Log: fix test concurrency Changed paths: M ext/spl/tests/DirectoryIterator_getBasename_basic_test.phpt M ext/spl/tests/DirectoryIterator_getBasename_pass_array.phpt M ext/spl/tests/RecursiveDirectoryIterator_getSubPath_basic.phpt M ext/spl/tests/RecursiveDirectoryIterator_getSubPathname_basic.phpt M ext/spl/tests/SplFileObject_fgetcsv_basic.phpt M ext/spl/tests/SplFileObject_fgetcsv_delimiter_basic.phpt M ext/spl/tests/SplFileObject_fgetcsv_delimiter_error.phpt M ext/spl/tests/SplFileObject_fgetcsv_enclosure_basic.phpt M ext/spl/tests/SplFileObject_fgetcsv_enclosure_error.phpt M ext/spl/tests/SplFileObject_fgetcsv_escape_basic.phpt M ext/spl/tests/SplFileObject_fgetcsv_escape_default.phpt M ext/spl/tests/SplFileObject_fgetcsv_escape_error.phpt M ext/spl/tests/SplFileObject_fputcsv_002.phpt M ext/spl/tests/SplFileObject_fputcsv_error.phpt M ext/spl/tests/dit_006.phpt diff --git a/ext/spl/tests/DirectoryIterator_getBasename_basic_test.phpt b/ext/spl/tests/DirectoryIterator_getBasename_basic_test.phpt index ed1f473..d4f22f6 100644 --- a/ext/spl/tests/DirectoryIterator_getBasename_basic_test.phpt +++ b/ext/spl/tests/DirectoryIterator_getBasename_basic_test.phpt @@ -4,7 +4,7 @@ DirectoryIterator::getBasename() - Basic Test PHPNW Testfest 2009 - Adrian Hardy --FILE-- --CLEAN-- diff --git a/ext/spl/tests/DirectoryIterator_getBasename_pass_array.phpt b/ext/spl/tests/DirectoryIterator_getBasename_pass_array.phpt index b2df8a5..ef13520 100644 --- a/ext/spl/tests/DirectoryIterator_getBasename_pass_array.phpt +++ b/ext/spl/tests/DirectoryIterator_getBasename_pass_array.phpt @@ -4,7 +4,7 @@ DirectoryIterator::getBasename() - Pass unexpected array PHPNW Testfest 2009 - Adrian Hardy --FILE-- --CLEAN-- diff --git a/ext/spl/tests/RecursiveDirectoryIterator_getSubPath_basic.phpt b/ext/spl/tests/RecursiveDirectoryIterator_getSubPath_basic.phpt index f0b2b01..f6bc266 100644 --- a/ext/spl/tests/RecursiveDirectoryIterator_getSubPath_basic.phpt +++ b/ext/spl/tests/RecursiveDirectoryIterator_getSubPath_basic.phpt @@ -5,7 +5,7 @@ Pawel Krynicki #testfest AmsterdamPHP 2012-06-23 --FILE-- diff --git a/ext/spl/tests/RecursiveDirectoryIterator_getSubPathname_basic.phpt b/ext/spl/tests/RecursiveDirectoryIterator_getSubPathname_basic.phpt index 7b12672..6527d84 100644 --- a/ext/spl/tests/RecursiveDirectoryIterator_getSubPathname_basic.phpt +++ b/ext/spl/tests/RecursiveDirectoryIterator_getSubPathname_basic.phpt @@ -5,7 +5,7 @@ Pawel Krynicki #testfest AmsterdamPHP 2012-06-23 --FILE-- --EXPECTF-- diff --git a/ext/spl/tests/SplFileObject_fgetcsv_basic.phpt b/ext/spl/tests/SplFileObject_fgetcsv_basic.phpt index abfe5f2..84b5403 100644 --- a/ext/spl/tests/SplFileObject_fgetcsv_basic.phpt +++ b/ext/spl/tests/SplFileObject_fgetcsv_basic.phpt @@ -2,7 +2,7 @@ SplFileObject::fgetcsv default path --FILE-- fgetcsv()); ?> --CLEAN-- --EXPECTF-- array(4) { diff --git a/ext/spl/tests/SplFileObject_fgetcsv_delimiter_basic.phpt b/ext/spl/tests/SplFileObject_fgetcsv_delimiter_basic.phpt index 4402d6c..a8125a0 100644 --- a/ext/spl/tests/SplFileObject_fgetcsv_delimiter_basic.phpt +++ b/ext/spl/tests/SplFileObject_fgetcsv_delimiter_basic.phpt @@ -2,7 +2,7 @@ SplFileObject::fgetcsv with alternative delimiter --FILE-- fgetcsv('|')); ?> --CLEAN-- --EXPECTF-- array(4) { diff --git a/ext/spl/tests/SplFileObject_fgetcsv_delimiter_error.phpt b/ext/spl/tests/SplFileObject_fgetcsv_delimiter_error.phpt index 64d6514..169ded7 100644 --- a/ext/spl/tests/SplFileObject_fgetcsv_delimiter_error.phpt +++ b/ext/spl/tests/SplFileObject_fgetcsv_delimiter_error.phpt @@ -2,7 +2,7 @@ SplFileObject::fgetcsv with alternative delimiter --FILE-- fgetcsv('invalid')); ?> --CLEAN-- --EXPECTF-- Warning: SplFileObject::fgetcsv(): delimiter must be a character in %s on line %d diff --git a/ext/spl/tests/SplFileObject_fgetcsv_enclosure_basic.phpt b/ext/spl/tests/SplFileObject_fgetcsv_enclosure_basic.phpt index efbb5fb..efe765c 100644 --- a/ext/spl/tests/SplFileObject_fgetcsv_enclosure_basic.phpt +++ b/ext/spl/tests/SplFileObject_fgetcsv_enclosure_basic.phpt @@ -2,7 +2,7 @@ SplFileObject::fgetcsv with alternative delimiter --FILE-- fgetcsv(',', '"')); ?> --CLEAN-- --EXPECTF-- array(4) { diff --git a/ext/spl/tests/SplFileObject_fgetcsv_enclosure_error.phpt b/ext/spl/tests/SplFileObject_fgetcsv_enclosure_error.phpt index 7487b83..f8c14f0 100644 --- a/ext/spl/tests/SplFileObject_fgetcsv_enclosure_error.phpt +++ b/ext/spl/tests/SplFileObject_fgetcsv_enclosure_error.phpt @@ -2,7 +2,7 @@ SplFileObject::fgetcsv with alternative delimiter --FILE-- fgetcsv(',', 'invalid')); ?> --CLEAN--
[PHP-CVS] com php-src: fix test concurrency: ext/libxml/tests/bug61367-read.phpt ext/libxml/tests/bug61367-write.phpt
Commit:e9877fe92e8f9a0cc212362f6c35550b92036b3e Author:Michael Wallner Wed, 18 Sep 2013 10:53:11 +0200 Parents: 14d53417879256044c40b2ef8d0aa32b1f215acb Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e9877fe92e8f9a0cc212362f6c35550b92036b3e Log: fix test concurrency Changed paths: M ext/libxml/tests/bug61367-read.phpt M ext/libxml/tests/bug61367-write.phpt Diff: diff --git a/ext/libxml/tests/bug61367-read.phpt b/ext/libxml/tests/bug61367-read.phpt index 75d0006..b4ecaa0 100644 --- a/ext/libxml/tests/bug61367-read.phpt +++ b/ext/libxml/tests/bug61367-read.phpt @@ -32,10 +32,10 @@ XML } } -var_dump(mkdir('test_bug_61367')); -var_dump(mkdir('test_bug_61367/base')); -var_dump(file_put_contents('test_bug_61367/bad', 'blah')); -var_dump(chdir('test_bug_61367/base')); +var_dump(mkdir('test_bug_61367-read')); +var_dump(mkdir('test_bug_61367-read/base')); +var_dump(file_put_contents('test_bug_61367-read/bad', 'blah')); +var_dump(chdir('test_bug_61367-read/base')); stream_wrapper_register( 'exploit', 'StreamExploiter' ); $s = fopen( 'exploit://', 'r' ); @@ -43,9 +43,9 @@ $s = fopen( 'exploit://', 'r' ); ?> --CLEAN-- --EXPECTF-- bool(true) @@ -53,7 +53,7 @@ bool(true) int(4) bool(true) -Warning: DOMDocument::loadXML(): I/O warning : failed to load external entity "file:///%s/test_bug_61367/bad" in %s on line %d +Warning: DOMDocument::loadXML(): I/O warning : failed to load external entity "file:///%s/test_bug_61367-read/bad" in %s on line %d Warning: DOMDocument::loadXML(): Failure to process entity file in Entity, line: 4 in %s on line %d diff --git a/ext/libxml/tests/bug61367-write.phpt b/ext/libxml/tests/bug61367-write.phpt index e18b071..63e99a8 100644 --- a/ext/libxml/tests/bug61367-write.phpt +++ b/ext/libxml/tests/bug61367-write.phpt @@ -19,10 +19,10 @@ class StreamExploiter { } } -var_dump(mkdir('test_bug_61367')); -var_dump(mkdir('test_bug_61367/base')); -var_dump(file_put_contents('test_bug_61367/bad', 'blah')); -var_dump(chdir('test_bug_61367/base')); +var_dump(mkdir('test_bug_61367-write')); +var_dump(mkdir('test_bug_61367-write/base')); +var_dump(file_put_contents('test_bug_61367-write/bad', 'blah')); +var_dump(chdir('test_bug_61367-write/base')); stream_wrapper_register( 'exploit', 'StreamExploiter' ); $s = fopen( 'exploit://', 'r' ); @@ -30,9 +30,9 @@ $s = fopen( 'exploit://', 'r' ); ?> --CLEAN-- --EXPECTF-- bool(true) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: PHP-5.5.4: NEWS configure.in main/php_version.h
Commit:6454767de131552792921d40dae337a05cecabf0 Author:Julien Pauli Wed, 18 Sep 2013 10:26:37 +0200 Parents: 5e3da04fb033734d2e69542fe835660c0df8dc48 Branches: PHP-5.5.4 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6454767de131552792921d40dae337a05cecabf0 Log: PHP-5.5.4 Changed paths: M NEWS M configure.in M main/php_version.h Diff: diff --git a/NEWS b/NEWS index 37db7e6..3a9326e 100644 --- a/NEWS +++ b/NEWS @@ -1,31 +1,6 @@ PHPNEWS ||| -?? ??? 2013, PHP 5.5.5 - -- CLI server: - . Fixed bug #65633 (built-in server treat some http headers as -case-sensitive). (Adam) - -- Datetime: - . Fixed bug #65502 (DateTimeImmutable::createFromFormat returns DateTime). -(Boro Sitnikovski) - . Fixed bug #65548 (Comparison for DateTimeImmutable doesn't work). -(Boro Sitnikovski) - -- GD - . Ensure that the defined interpolation method is used with the generic -scaling methods. (Pierre) - -- OPcache: - . Fixed bug #65665 (Exception not properly caught when opcache enabled). -(Laruence) - . Fixed bug #65510 (5.5.2 crashes in _get_zval_ptr_ptr_var). (Dmitry) - -- SPL: - . Fix bug #64782 (SplFileObject constructor make $context optional / give it -a default value). (Nikita) - -?? ??? 2013, PHP 5.5.4 +18 Sep 2013, PHP 5.5.4 - Core: . Fixed bug #60598 (cli/apache sapi segfault on objects manipulation). diff --git a/configure.in b/configure.in index 4013062..f8f6a48 100644 --- a/configure.in +++ b/configure.in @@ -119,8 +119,8 @@ int zend_sprintf(char *buffer, const char *format, ...); PHP_MAJOR_VERSION=5 PHP_MINOR_VERSION=5 -PHP_RELEASE_VERSION=5 -PHP_EXTRA_VERSION="-dev" +PHP_RELEASE_VERSION=4 +PHP_EXTRA_VERSION="" 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 d9ea4aa..e233466 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 5 -#define PHP_RELEASE_VERSION 5 -#define PHP_EXTRA_VERSION "-dev" -#define PHP_VERSION "5.5.5-dev" -#define PHP_VERSION_ID 50505 +#define PHP_RELEASE_VERSION 4 +#define PHP_EXTRA_VERSION "" +#define PHP_VERSION "5.5.4" +#define PHP_VERSION_ID 50504 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] com php-src: fix build - PRIu64 vs %I64u: main/php_variables.c
On Wed, September 18, 2013 09:52, Michael Wallner wrote: > On 17 September 2013 16:02, Anatol Belski wrote: > >> Commit:4a85b5e190d6651bee26bbbeff4ed09d2932f352 >> Author:Anatol Belski Tue, 17 Sep 2013 16:02:08 >> +0200 >> Parents: e6084da4735c945cb071c4d9259ea0d702eb77c6 >> Branches: master >> >> >> Link: >> http://git.php.net/?p=php-src.git;a=commitdiff;h=4a85b5e190d6651bee26bb >> beff4ed09d2932f352 >> >> Log: >> fix build - PRIu64 vs %I64u >> > > How about adding such constants to win32/php_stdint.h instead? > > > -- > Regards, > Mike > > That's a good idea, i also thought about macrifying all those at once. Not sure it belongs to stdint, it's actually more like printf format. I'll do this anyway, have to look for a right place. Regards Anatol -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] tag php-src: create tag php-5.5.4
Tag php-5.5.4 in php-src.git was created Tag: 5631897163294ebf15efb3bfaf39ef508b553bdc Tagger: Julien Pauli Wed Sep 18 10:26:45 2013 +0200 Log: Tagged 5.5.4 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.12 (GNU/Linux) iQEcBAABAgAGBQJSOWPMAAoJEP6FfZqQ2Q7BRIUH/R+vE1IxBGUv+AqNJCjlAwwU ax+y3ecPDscWr8rCD+JWUk/INePQUfoPGvDY0gK8u8+wAv19MZ7qkaDxQgl+/kck uHw8HLvPBmlXHK4ggWBhDc3JSttzpKAE4zv/J6Prr9yH+NX0+NK9Q9V0h0A1dcN4 Sllzr/nd86InYFGByby6lLMYRf9KbeCvB28EDuekxLw4YzbY1OnMtRkX622wbJbW a/ZWaQ6fdelepOjD2K+74tR7EVYqJbdp/D3hGwZ1ux1HnS9hqPXjPWnHmZCvEjPG AaUjzkdAVdbBu6ph89lc1YI9eKwVCXj1x2wJgnliBs2ArSEs/inP+tycucPd2iU= =fzUn -END PGP SIGNATURE- Link: http://git.php.net/?p=php-src.git;a=tag;h=5631897163294ebf15efb3bfaf39ef508b553bdc Target: 6454767de131552792921d40dae337a05cecabf0 Author: Julien Pauli Wed, 18 Sep 2013 10:26:37 +0200 Parents: 5e3da04fb033734d2e69542fe835660c0df8dc48 Target link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6454767de131552792921d40dae337a05cecabf0 Target log: PHP-5.5.4 Changed paths: M NEWS M configure.in M main/php_version.h -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] com php-src: NEWS/UPGRADING{,.INTERNALS} notes about temp POST stream: NEWS UPGRADING UPGRADING.INTERNALS
On 18 September 2013 07:45, Jacques Marneweck wrote: > Hi Michael: > > Can you fix the typo of $HTTP_ROW_POST_DATA to $HTTP_RAW_POST_DATA in the > UPGRADING > file. > Sure! Thanks for the hint.
Re: [PHP-CVS] com php-src: fix build - PRIu64 vs %I64u: main/php_variables.c
On 17 September 2013 16:02, Anatol Belski wrote: > Commit:4a85b5e190d6651bee26bbbeff4ed09d2932f352 > Author:Anatol Belski Tue, 17 Sep 2013 16:02:08 > +0200 > Parents: e6084da4735c945cb071c4d9259ea0d702eb77c6 > Branches: master > > Link: > http://git.php.net/?p=php-src.git;a=commitdiff;h=4a85b5e190d6651bee26bbbeff4ed09d2932f352 > > Log: > fix build - PRIu64 vs %I64u > How about adding such constants to win32/php_stdint.h instead? -- Regards, Mike -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] com php-src: NEWS/UPGRADING{,.INTERNALS} notes about temp POST stream: NEWS UPGRADING UPGRADING.INTERNALS
Hi Michael: Can you fix the typo of $HTTP_ROW_POST_DATA to $HTTP_RAW_POST_DATA in the UPGRADING file. Thanks. Regards --jm Michael Wallner 17 September 2013 11:08 AM Commit: 4a3936ef4abdeb72c7d323fe4b6a65e1ae0ef181Author:Michael Wallner Tue, 17 Sep 2013 11:08:23 +0200Parents: 1c15d70cbd91e3f502694a31704e959cf734d8daBranches: masterLink: http://git.php.net/?p=php-src.git;a=commitdiff;h=4a3936ef4abdeb72c7d323fe4b6a65e1ae0ef181Log:NEWS/UPGRADING{,.INTERNALS} notes about temp POST streamChanged paths: M NEWS M UPGRADING M UPGRADING.INTERNALSDiff:diff --git a/NEWS b/NEWSindex 60fac8c..540f896 100644--- a/NEWS+++ b/NEWS@@ -11,6 +11,9 @@ PHP NEWS (Gustavo) . Uploads equal or greater than 2GB in size are now accepted. (Ralf Lang, Mike)+ . Reduced POST data memory usage by 200-300%. Removed INI setting+ always_populate_raw_post_data and the $HTTP_RAW_POST_DATA global+ variable. (Mike) - cURL: . Implemented FR #65646 (re-enable CURLOPT_FOLLOWLOCATION with open_basedirdiff --git a/UPGRADING b/UPGRADINGindex e9fba51..f5e7cd0 100755--- a/UPGRADING+++ b/UPGRADING@@ -20,11 +20,23 @@ PHP X.Y UPGRADE NOTES 1. Backward Incompatible Changes +- Core:+ Removed $HTTP_RAW_POST_DATA global variable. Restore backwards compatibility + by:+ + global $HTTP_RAW_POST_DATA;+ if (!isset($HTTP_RAW_POST_DATA)) {+ $HTTP_ROW_POST_DATA = file_get_contents("php://input");+ }+ ?> 2. New Features +- Core:+ The php://input stream is now re-usable and can be used concurrently with + enable_post_data_reading=0. 2. Changes in SAPI modules@@ -91,6 +103,8 @@ PHP X.Y UPGRADE NOTES 10. Changes to INI File Handling +- Core:+ Removed always_populate_raw_post_data. 11. Other Changesdiff --git a/UPGRADING.INTERNALS b/UPGRADING.INTERNALSindex 7cb5539..90202f0 100644--- a/UPGRADING.INTERNALS+++ b/UPGRADING.INTERNALS@@ -5,6 +5,7 @@ UPGRADE NOTES - PHP X.Y 1. Internal API changes a. Addition of do_operation and compare object handlers b. return_value_ptr now always available, RETVAL_ZVAL_FAST macros+ c. POST data handling 2. Build system changes a. Unix build system changes@@ -57,6 +58,15 @@ UPGRADE NOTES - PHP X.Y 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. 2. Build system changes