Compare commits

..
Author SHA1 Message Date
Johannes Schlüter bbdb07f3ab PHP 5.3.3RC2 2010-07-01 15:46:49 +00:00
Johannes Schlüter 2b48156eab 5.3.3 RC2 2010-07-01 15:44:18 +00:00
Felipe Pena 92ba590555 - BFN 2010-07-01 01:12:21 +00:00
Pierre Joye 1fe5265c3e - WS 2010-06-30 22:06:49 +00:00
Ilia Alshanetsky 112ac7e978 Fixed bug #33210 (getimagesize() fails to detect width/height on certain JPEGs). 2010-06-30 12:21:35 +00:00
Stanislav Malyshev af2d266a09 sync version with PECL 2010-06-30 04:23:32 +00:00
Felipe Pena 4e606e3ceb - Fixed bug #48930 (__COMPILER_HALT_OFFSET__ incorrect in PHP >= 5.3) 2010-06-30 02:45:10 +00:00
Felipe Pena 96bb25e8e7 - Reverted fix for bug #48930 (due binary compatibility breakage) 2010-06-29 11:37:13 +00:00
Stanislav Malyshev 865f85718f fix SplObjectStorage unserialization (CVE-2010-2225) 2010-06-29 00:58:31 +00:00
Pierre Joye 9c60bd8df7 - typo for iconv DLL .lib 2010-06-28 23:26:48 +00:00
Felipe Pena a8e80ec235 - Reverted fix for bug #51421 2010-06-28 16:37:57 +00:00
Felipe Pena 0488a86634 - Fix arginfo name 2010-06-28 01:19:08 +00:00
Felipe Pena ced29dd706 - Improved initialization 2010-06-27 22:13:41 +00:00
Felipe Pena 9b07568c43 - Fixed bug #48930 (__COMPILER_HALT_OFFSET__ incorrect in PHP >= 5.3) 2010-06-27 21:46:16 +00:00
Felipe Pena 0cc45e7bdb - BFN 2010-06-26 22:07:04 +00:00
Felipe Pena 10a9634bc9 - Fixed bug #51421 (Abstract __construct constructor argument list not enforced) 2010-06-26 22:05:13 +00:00
Felipe Pena eb5e97adf5 - Fixed bug #52160 (Invalid E_STRICT redefined constructor error) 2010-06-26 19:19:16 +00:00
Felipe Pena 419f589580 - Fixed tests 2010-06-26 17:17:47 +00:00
Felipe Pena 9ea7a70e24 - Fixed bug #52193 (converting closure to array yields empty array) 2010-06-26 17:14:33 +00:00
Felipe Pena e64734f986 - Fixed bug #52183 (Reflectionfunction reports invalid number of arguments for function aliases) 2010-06-26 16:03:39 +00:00
Christopher Jones 22458ed4d5 Remove hard coded lib extension. Prepare for OCI8 1.4.2 release 2010-06-25 21:18:09 +00:00
Christopher Jones 86544f5971 Fix bug #52186 (phpinfo shows 10.1 or 11.1 when installed with ORACLE_HOME 10.2 or 11.2) 2010-06-25 21:09:13 +00:00
Felipe Pena 5a3a34e3e6 - Fixed bug #52138 (Constants are parsed into the ini file for section names) 2010-06-24 22:32:42 +00:00
Andrey Hristov 89bd3af6b9 Two functions, which should be methods so one can catch
their output, for example
2010-06-24 19:52:13 +00:00
Pierre Joye d27d572a7d - typo 2010-06-24 00:15:12 +00:00
Sriram Natarajan 2bb9bbb803 - Fixed bug #52162 (custom request header variables with numbers are removed) 2010-06-23 19:06:33 +00:00
Johannes Schlüter 08e1471c16 Install SQLite3 header 2010-06-23 15:11:02 +00:00
Andrey Hristov 53324e8830 Fix sprintf modifiers all around the place. In most cases
%u should be used. Where size_t is used then MYSQLND_SZ_T_SPEC should be
the modifier
2010-06-21 15:32:26 +00:00
Andrey Hristov 698539fa79 fix valgrind warnings on 64bit, thread_is is strictly 32bit 2010-06-21 14:49:45 +00:00
Ilia Alshanetsky 6b990988f1 MFB: Implemented FR #51295 (SQLite3::busyTimeout not existing). (Mark) 2010-06-21 11:06:31 +00:00
Pierre Joye 6ee4060bfa - #45808, stream_socket_enable_crypto() blocks and eats CPU 2010-06-20 16:33:16 +00:00
Felipe Pena c6e852d7db - Completed the fix for bug #52010
# Fixing pdo drivers
2010-06-20 14:12:06 +00:00
Jérôme Loyet ffdd175918 - Fixed bug #52086 (No new line at the end of a included file crahes the PHP FPM daemon) 2010-06-19 16:31:19 +00:00
Andrey Hristov 5a4a66cdd5 Fix for bug #52115 mysqli_result::fetch_all returns null, not an empty array 2010-06-18 17:25:41 +00:00
Andrey Hristov 6b730a04ae missed this one in the last commit, the real type 2010-06-18 12:00:57 +00:00
Andrey Hristov 7f79e86886 fix type mismatch, this is fresh misunderstanding 2010-06-18 11:56:25 +00:00
Johannes Schlüter 7d0eedf08c - Ignore empty filename for mail.log, treat it like none given 2010-06-18 10:16:35 +00:00
Ulf Wendel f3448471df Don't bail if there is another extension that exports constants starting with mysql<something> 2010-06-18 09:56:18 +00:00
Johannes Schlüter d52e132203 back to -dev 2010-06-18 08:22:14 +00:00
Johannes Schlüter 8661e8d298 PHP 5.3.3RC1 2010-06-17 17:16:57 +00:00
Johannes Schlüter 8a142cb861 5.3.3RC1 2010-06-17 17:10:16 +00:00
Pierre Joye a46cb6b513 - fix build 2010-06-17 16:56:48 +00:00
Johannes Schlüter 06c987663a - 80 lines are nice, sentences stop with a period
- Merge in 5.3.2 NEWS ...
2010-06-17 12:31:57 +00:00
Andrey Hristov ae4ae5a313 split mysqlnd_connect() in two parts, one doing the authorization 2010-06-17 11:37:49 +00:00
Pierre Joye c4c6b69b64 - #51424 2010-06-17 10:22:51 +00:00
Pierre Joye 84f3b13264 - #51424, solaris part 2010-06-17 10:22:03 +00:00
Pierre Joye 49418ce7da - Fix bug #52101, dns_get_record()garbage in 'ipv6' field 2010-06-17 09:26:29 +00:00
Felipe Pena d4746a659e - BFN 2010-06-16 23:40:23 +00:00
Felipe Pena 42c4bafbbd - New tests related to #52098 2010-06-16 23:33:01 +00:00
Felipe Pena d596ea742a - Fix crash when calling a method of a class that inherits PDOStatement if instantiated directly 2010-06-16 23:13:29 +00:00
Andrey Hristov d47e50a9ff no more needed because of the charset fix in the previous changeset 2010-06-16 19:01:13 +00:00
Pierre Joye cfd930d218 - #50563, removing E_WARNING from parse_url() 2010-06-16 18:56:24 +00:00
Pierre Joye 4029454a0d - Fix bug #50578, incorrect shebang in phar.phar 2010-06-16 18:30:35 +00:00
Timm Friebe ec54570362 - MFT: Fixed segmentation fault when reading rows
# Problem surfaces when using FreeTDS, ASE 12.5 and reading text fields
# with NULL values. This is essentially a workaround for a bug in Free-
# TDS which is not setting the NULL indicators correctly, but provides
# a protection against possible segfaults if any other driver ever does
# this again:-)
2010-06-16 09:49:25 +00:00
Antony Dovgal 3896e7403d improve ptrace() test
change error to warning - there can be no trace method available at all
2010-06-16 08:58:42 +00:00
Ben Longden ddc9246071 Merged SplFileObject::fgetcsv tests from trunk 2010-06-15 21:42:04 +00:00
Felipe Pena f310305fc2 - New entries 2010-06-15 19:37:20 +00:00
Pierre Joye 2cfb5e4254 - Fix #51002, fix possible memory corruption with very long names 2010-06-15 18:48:33 +00:00
Pierre Joye 33ac0d0e33 - cleanup, no vc6 support in trunk 2010-06-15 13:50:14 +00:00
Pierre Joye d686b7579a - #51424, silent warnings on win 2010-06-15 13:43:15 +00:00
Ben Longden d1c912628d Merged SplTempFileObject tests from trunk 2010-06-15 11:20:21 +00:00
Ilia Alshanetsky 24b8bc3489 Removed the in_transaction handler for 5.3 to avoid BC break due to structure change 2010-06-15 11:13:20 +00:00
Pierre Joye 8fcd33ed18 - Fix #51424, crypt() function hangs after 3rd call 2010-06-15 09:26:06 +00:00
Dmitry Stogov 3d5f729181 Fixed bug #52041 (Memory leak when writing on uninitialized variable returned from function) 2010-06-15 08:22:51 +00:00
Andrey Hristov 0da5464a81 Fix the test for libmysql, which expects the certificates
to be in the directory where the interpreter is started. When
using mysqlnd they should not include path and will be found
in the directory of the script.
2010-06-14 18:23:17 +00:00
Andrey Hristov 83051b1a86 And a fix for MySQL Server which is pre 5.1.23, which doesn't support
preserving of the charset when performing change_user. This is libmysql
only code.
2010-06-14 18:19:13 +00:00
Andrey Hristov 1d9c49bb3c Fixed bug #52082 (character_set_client & character_set_connection reset after
mysqli_change_user())

libmysql >= 5.1.23 will PASS, older library versions will fail
2010-06-14 17:16:20 +00:00
Pierre Joye 0296501274 - MFH 2010-06-14 09:56:50 +00:00
Pierre Joye 22df3125d5 - drop comment 2010-06-14 09:15:20 +00:00
Pierre Joye d652e02235 - #52043,GD doesn't recognize latest libJPEG version 2010-06-14 08:12:10 +00:00
Jérôme Loyet 205775507a Fix #52067, chroot and chdir path were not checked at startup. If configured with unexistant directories, FPM entered in an error loop. 2010-06-13 10:30:35 +00:00
Felipe Pena 764a95f6f3 - Fixed bug #49320 (PDO returns null when SQLite connection fails) 2010-06-12 22:04:48 +00:00
Felipe Pena f1e02c5cc7 - Fixed bug #52051 (handling of case sensitivity of old-style constructors changed in 5.3+) 2010-06-12 15:30:21 +00:00
Felipe Pena 4d3944f941 - Fixed bug #52057 (ReflectionClass fails on Closure class) 2010-06-11 23:37:55 +00:00
Felipe Pena 5eb64a4957 - Fixed bug #52060 (Memory leak when passing a closure to method_exists()) 2010-06-11 23:20:13 +00:00
Patrick Allaert 899bc2f582 - Fixed bug #52019 (make lcov doesn't support TESTS variable anymore) 2010-06-11 14:04:57 +00:00
Dmitry Stogov d24c14cb59 Fixed bug #51552 (debug_backtrace() causes segmentation fault and/or memory issues) 2010-06-11 08:53:31 +00:00
Ulf Wendel afcb62ba1e Fixing tests 2010-06-10 13:40:13 +00:00
Andrey Hristov 7aaef918a6 export mysqlnd_globals_id, per Johannes 2010-06-10 12:24:03 +00:00
Ilia Alshanetsky 90906a91e9 Added inTransaction() method to PDO, with specialized support for Postgres 2010-06-10 12:11:19 +00:00
Dmitry Stogov 748dd20476 Fixed bug #51822i (Segfault with strange __destruct() for static class variables) 2010-06-10 11:45:51 +00:00
Ilia Alshanetsky 9daa864c4f Added support for copy to/from array/file for pdo_pgsql extension.
# original patch by Denis Gasparin
2010-06-10 11:11:29 +00:00
Andrey Hristov e692080fc5 void functions return nothing 2010-06-10 09:37:58 +00:00
Dmitry Stogov cac310d87e Fixed bug #52001 (Memory allocation problems after using variable variables) 2010-06-10 09:13:22 +00:00
Christopher Jones 442fa8dc1b Explicitly use db-5.0 and don't default to db sym link 2010-06-09 17:33:44 +00:00
Ilia Alshanetsky f7d82d0e0d Fixed bug #52010 (open_basedir restrictions mismatch on vacuum command). 2010-06-09 16:04:54 +00:00
Ilia Alshanetsky 0d4720a61b Fixed bug #51273 (Faultstring property does not exist when the faultstring is empty)
# Patch by dennis at transip dot nl
2010-06-09 15:48:22 +00:00
Pierre Joye 9e5313fdca - [DOC] MFH: add session.entropy* support to windows 2010-06-08 22:30:16 +00:00
Pierre Joye 32447e4902 - restore previous setting 2010-06-08 22:27:14 +00:00
Sriram Natarajan dbddbb6e34 - Fixed Bug #51168 (fails to compile with Sun Studio)
# C99 standard supports inline keyword and supported by
 # by major compilers like GCC, HP C, IBM C and Sun C
2010-06-08 21:23:48 +00:00
Felipe Pena 178ee9325d - Fix order 2010-06-08 19:47:04 +00:00
Antony Dovgal 3c9e1e6d70 support both 'warn' and 'warning' as error levels 2010-06-08 18:59:11 +00:00
Pierre Joye 73a413bdea - use new function to get random bytes 2010-06-08 18:27:23 +00:00
Pierre Joye 481f77890d - WS 2010-06-08 18:26:03 +00:00
Ulf Wendel 20f6aaeca9 Make the tests pass with sql strict mode enabled 2010-06-08 15:47:51 +00:00
Ulf Wendel aeae0d1bad Portability improvement 2010-06-08 14:57:10 +00:00
Ulf Wendel 3e5ac35bd9 Portability improvements 2010-06-08 14:29:05 +00:00
Pierre Joye 761dbeedbb - duplicate entry 2010-06-08 13:48:02 +00:00
Pierre Joye f8b17007e0 - [DOC] add session.entropy* support to windows 2010-06-08 13:46:19 +00:00
Antony Dovgal 9badd4f0fb fix bug #50101 (name clash between global and local variable) 2010-06-08 13:27:30 +00:00
Ulf Wendel 6b1d256af5 More SQL strict mode updates 2010-06-08 13:05:49 +00:00
Pierre Joye 68cd943189 - add striped down version of RNG layer to have a reliable random src on windows 2010-06-08 13:00:54 +00:00
Pierre Joye 5afc8e2c83 - add striped down version of RNG layer to have a reliable random src on windows 2010-06-08 13:00:11 +00:00
Antony Dovgal ae01c146d1 fix bug #51276 (php_load_extension() is missing when HAVE_LIBDL is undefined) 2010-06-08 12:54:11 +00:00
Antony Dovgal a8be1c1d4b fix micro-memleaks (happened once per process) 2010-06-08 12:02:55 +00:00
Ulf Wendel 0fb528edee Making tests pass strict sql mode. 2010-06-08 10:55:12 +00:00
Felipe Pena b65a473efb - Let's generate this #ifdef only on zend_vm_execute.h 2010-06-07 23:04:30 +00:00
Felipe Pena d78fb2b14a - Fix script 2010-06-07 14:37:35 +00:00
Pierre Joye 6d1d27bc3a - show the free_op1 warning only once, until a fix is applied 2010-06-07 01:37:59 +00:00
Pierre Joye 707980c2be - show the free_op1 warning only once, until a fix is applied 2010-06-06 20:32:51 +00:00
Pierre Joye badf05a8ea - silent warning (unary minus operator applied to unsigned type) 2010-06-06 15:28:30 +00:00
Pierre Joye b690b940ca - label only used when mmap is available 2010-06-06 12:32:25 +00:00
Christopher Jones 5441c86936 New test for file_exists (bug #39863). It currently xfail's 2010-06-05 19:44:48 +00:00
Felipe Pena a14dd7502b - Fixed bug #51991 (spl_autoload and *nix support with namespace) 2010-06-04 00:10:15 +00:00
Felipe Pena c42d8b3776 - Fix proto and argname 2010-06-03 18:39:21 +00:00
Felipe Pena 7deae5022d - Added ZipArchive arginfo 2010-06-03 18:23:14 +00:00
Christopher Jones 9ef6a73dee Add Berkeley DB 5 support. (An outstanding issue with BDB 4.8 related to 51086 that also affects BDB 5 is not yet resolved) 2010-06-03 07:03:05 +00:00
Felipe Pena 8454cca44c - Fix memleak when passing a non string/object parameter 2010-06-03 00:43:37 +00:00
Rasmus Lerdorf a259f797bf vim fail 2010-06-02 19:26:10 +00:00
Rasmus Lerdorf 6ba6263817 Tweak the fix for bug #51847 to still call libintl_setlocale
when libintl has done that redefine.
2010-06-02 19:24:36 +00:00
Pierre Joye 24ef65019f - silent warning 2010-06-02 19:20:04 +00:00
Pierre Joye c453a8fcda - fix leak on error in mcrypt_create_iv on windows 2010-06-02 15:27:38 +00:00
Pierre Joye 7c1d43dd95 - allow shared build 2010-06-02 10:00:58 +00:00
Rasmus Lerdorf d4cca6da93 Fix for bug #51847
Someone in libintl world decided it was a good idea to do:

#undef setlocale
#define setlocale libintl_setlocale

That means, of course, that any use of "setlocale" by the
preprocessor now becomes libintl_setlocale which means we
no longer have a _zif_setlocale symbol in string.o, but we
magically have a _zif_libintl_setlocale symbol.  The linker
is obviously not very happy about this when basic_functions.o
tries to find _zif_setlocale.

So, let's not do that again.
2010-06-02 05:53:13 +00:00
Johannes Schlüter d7b1fa9d35 Berkeley DB 5's SQL frontend gives a slightly different error than libsqlite 2010-06-01 16:39:36 +00:00
Andrey Hristov 4a0b4494d4 defensive programming, check before using a resource 2010-06-01 14:16:27 +00:00
Andrey Hristov 41406516b6 Perform later initialization 2010-06-01 09:47:46 +00:00
Andrey Hristov 2a043ed2d3 More check for valid MYSQLND_STMT before using it 2010-05-31 18:26:19 +00:00
Andrey Hristov 38f6c131e5 Don't reference row_packet before checking if dereferencing is possible 2010-05-31 18:18:37 +00:00
Andrey Hristov b472636375 Check if data is correct and initialize in a safe manner 2010-05-31 18:10:25 +00:00
Andrey Hristov 047d6f2855 Handle problems in the row_decoder, return type used to be void,
now it can return on problems.
2010-05-31 17:57:03 +00:00
Andrey Hristov b61d7501c9 Bail if allocation fails 2010-05-31 17:09:13 +00:00
Andrey Hristov 4cd5db922b Fix test 2010-05-31 16:53:33 +00:00
Andrey Hristov cf140b3bf7 try to workaround problems with non-c99 on HPUX 2010-05-31 16:51:03 +00:00
Ulf Wendel c0a8ce2f61 Updating test to reflect the latest and more verbose mysqlnd error messages, updating mysqlnd error message as well. 2010-05-31 13:56:42 +00:00
Ulf Wendel 0ab82cecc2 Fixing test - see also gcov results 2010-05-31 13:28:15 +00:00
Ulf Wendel 9b334da667 Fixing test - make sure it checks the same conditions for libmysql and mysqlnd 2010-05-31 12:55:59 +00:00
Ulf Wendel fb80ebe102 Fixing test 2010-05-31 12:22:48 +00:00
Ulf Wendel 4b5666a539 Fixing mysqli_stmt_attr_set @ libmysql 2010-05-31 12:10:04 +00:00
Ulf Wendel 2613069cd4 Improve EXPECTF to work with other than default schemata 2010-05-31 10:52:14 +00:00
Pierre Joye 46c0f21386 - Added recent Windows versions to php_uname and fix undefined windows version 2010-05-30 07:46:45 +00:00
Pierre Joye e2d9e0ae70 - ws 2010-05-30 07:36:19 +00:00
Jérôme Loyet dbe35d87d6 fix commit 299383 2010-05-29 22:00:43 +00:00
Jérôme Loyet e750930899 typo (thx to Brian P. Mercer) 2010-05-29 10:39:35 +00:00
Dmitry Stogov 54caf22325 Fixed bug #50976 (Soap headers Authorization not allowed) 2010-05-28 12:18:03 +00:00
Dmitry Stogov 42d25dc2b2 Fixed bug #50762 (in WSDL mode Soap Header handler function only being called if defined in WSDL). (mephius at gmail dot com) 2010-05-28 10:52:16 +00:00
Johannes Schlüter 901fc6f3a4 These files talk about PHP 3, flex, CVS, ... interesting to archeologists only 2010-05-27 23:12:44 +00:00
Johannes Schlüter 9cfcc89a0b Update EXTENSIONS file 2010-05-27 23:08:39 +00:00
Johannes Schlüter 435405f5da Update credits 2010-05-27 22:51:28 +00:00
Johannes Schlüter bb3faf2d25 Make the credits script more verbose 2010-05-27 22:50:31 +00:00
Johannes Schlüter a622dd6bfb From user's perspective this was added 2010-05-27 22:41:36 +00:00
Jérôme Loyet 66ef4d185c bug: include paths were not evaluated to to full path 2010-05-27 22:31:28 +00:00
Jérôme Loyet ce03ced4d7 typo 2010-05-27 22:18:58 +00:00
Ulf Wendel ba6ee3fc06 Open server bug: mysqlnd works around it, libmysql fails. Let's skip because MySQL Server version tests are tricky and error prone. 2010-05-27 13:01:17 +00:00
Andrey Hristov 3aa95c59cc Check before use, because mysqlnd can return NULL
and this will crash. However, this can happen only in case of OOM.
2010-05-27 12:44:10 +00:00
Andrey Hristov 6ebe80be5d Don't use NULL pointer, always check before use 2010-05-27 12:39:12 +00:00
Ulf Wendel 6356bcbbb9 Test fixes and updates to work with a wider range of MySQL server configs 2010-05-27 12:09:39 +00:00
Andrey Hristov ce2fbe1931 Fix possible crashes, in case of OOM, due to half-baken
objects.
2010-05-27 12:05:02 +00:00
Andrey Hristov 5efee3d587 Fix crashes in the allocator in case of OOM. 2010-05-27 12:00:48 +00:00
Andrey Hristov b7385f02fd Fix deallocation which can crash if the object is half-baken.
Happens during OOM.
2010-05-27 08:51:46 +00:00
Antony Dovgal 4d005a8e65 merge FPM SAPI from trunk (as agreed with Johannes) 2010-05-26 15:14:43 +00:00
Andrey Hristov ce136a825c Don't use conn->net without checking if it is NULL, because
it can be NULL in OOM conditions. This would cause a crash.
2010-05-26 13:47:43 +00:00
Andrey Hristov 0d468290be Fix test 2010-05-26 13:36:49 +00:00
Andrey Hristov d6458c3b1e Add checks to check the underlying pointer in the resource.
It can happen that the underlying pointer is freed (like in
the case of connection reconnect), and then it cannot be allocated
anymore, which means that NULL will be used consequently by the
functions that fetch the resource and the crash is immediate.
2010-05-26 07:28:43 +00:00
Felipe Pena 00191c3c34 - Fixed bug #51899 (Parse error in parse_ini_file() function when empy value followed by no newline) 2010-05-26 02:18:17 +00:00
Felipe Pena c4be9c3890 - Fixed bug #51905 (ReflectionParameter fails if default value is an array with an access to self::) 2010-05-26 00:00:58 +00:00
Andrey Hristov 58f13c3c9f Handle the situation when MYSQLND_PROTOCOL's methods return NULL.
mysqlnd should not crash but gracefully return with an error.
2010-05-25 23:18:13 +00:00
Andrey Hristov bccf2cea5d Handle the situation when mysql_init()/mysqlnd_init()
return NULL. It is a rare case of OOM but PHP shouldn't crash, if possible.
2010-05-25 22:55:10 +00:00
Felipe Pena f3009cb596 - Fixed bug #51911 (ReflectionParameter::getDefaultValue() memory leaks with constant array) 2010-05-25 22:46:17 +00:00
Andrey Hristov c5ff0eb5b8 Gracefully handle OOM in mysqlnd_stmt_init. Release the handle
and return NULL.
2010-05-25 22:42:25 +00:00
Andrey Hristov bcdc3b30f7 Init should return status value because initialization can fail.
In this case mysqlnd_init() should return NULL to the end-user.
2010-05-25 22:40:47 +00:00
Andrey Hristov 621cdd9019 Use the specialized macro for this case 2010-05-25 22:38:11 +00:00
Andrey Hristov c389adb96a Use only memory that has been allocated 2010-05-25 22:36:33 +00:00
Andrey Hristov 4abc7a1e69 Access memory which was really allocated 2010-05-25 22:34:47 +00:00
Andrey Hristov 348880ce66 Fix shared build 2010-05-25 21:54:21 +00:00
Andrey Hristov 337513ffa0 Handle OOM in the code that generates PS Execute requests
to the server. Fixes crashes in case of OOM.
2010-05-25 19:19:29 +00:00
Andrey Hristov ed4ce335d8 Fix metadata duplicatin which wasn't crash-safe in case of OOM. 2010-05-25 18:14:37 +00:00
Rasmus Lerdorf 5583cd237f Check for -1 as well here 2010-05-24 23:52:11 +00:00
Rasmus Lerdorf 159369c68c Let's have a sane error message here instead of some cryptic zlib error 2010-05-24 23:27:39 +00:00
Andrey Hristov 29c99daa0f Check set->data for validity before using it.
Prevents crashes after OOM.
2010-05-21 13:37:18 +00:00
Andrey Hristov ef1eeff882 When OOM hits the wire, don't crash. 2010-05-21 13:06:52 +00:00
Andrey Hristov 9c90bf42c1 Fix for Bug #51870
PDO::fetchAll after a PDO::execute with bindings lead to a segv.

It is only in unreleased code and thus doesn't deserve a NEWS entry
2010-05-21 11:09:28 +00:00
Ilia Alshanetsky ea3a6539dc Added support for JSON_NUMERIC_CHECK option in json_encode() that converts
numeric strings to integers.
2010-05-20 19:37:52 +00:00
Christopher Jones 3bdc7518a2 New current()/next() test 2010-05-20 17:55:58 +00:00
Felipe Pena b4500e9b85 - Added arginfo 2010-05-20 17:28:16 +00:00
Antony Dovgal 797bb31e24 fix ZTS build 2010-05-20 11:20:44 +00:00
Sara Golemon 2655e63e10 MFH: Add IV to openssl_(en|de)crypt()
Add openssl_cipher_iv_length()
2010-05-19 21:18:16 +00:00
Michael Wallner 60c236be92 * fixed bug #47842 sscanf() does not support 64-bit values 2010-05-19 11:28:08 +00:00
Pierre Joye 0d47dff287 - #51854, fix logic (patch by Tjerk) 2010-05-18 19:39:39 +00:00
Andrey Hristov c91c86b743 Remove duplicated code.
Use one centralized functions for data extraction.
2010-05-18 11:50:31 +00:00
Michael Wallner 8a402bf368 fix typo 2010-05-18 08:02:10 +00:00
Michael Wallner f4994234e2 add missing news about backlog socket context option for stream_socket_server() 2010-05-18 07:49:15 +00:00
Michael Wallner a1de9f382a * fixed bug #49819: STDOUT losing data with posix_isatty() 2010-05-18 07:25:29 +00:00
Pierre Joye 50a1b1d06c - #43233 2010-05-17 20:22:20 +00:00
Pierre Joye 57cfa703bf - #43233, sasl support for ldap on windows 2010-05-17 20:09:42 +00:00
Pierre Joye df59ed1c11 - 51844 2010-05-17 18:56:43 +00:00
Pierre Joye a22cd02f2f - #51844, checkdnsrr does not support types other than MX 2010-05-17 18:55:35 +00:00
Dmitry Stogov 059e2be153 Fixed a possible crash because of recursive GC invocation 2010-05-17 07:50:33 +00:00
Rasmus Lerdorf 9db78b574b typo 2010-05-15 15:37:18 +00:00
Felipe Pena c9fc939be0 - Fixed bug #51827 (Bad warning when register_shutdown_function called with wrong num of parameters) 2010-05-14 23:48:03 +00:00
Andrey Hristov e3be1e0bea result_meta local storage 2010-05-14 16:42:17 +00:00
Andrey Hristov c881ee30ea Allow overloading of mysqlnd_result_meta_init().
Add free space for future hooks.
2010-05-14 15:11:56 +00:00
Andrey Hristov 34ffc8a6c4 Export MYSQLND_PROTOCOL methods 2010-05-14 13:32:27 +00:00
Andrey Hristov b86ebe46cb - Give possibility to overload mysqlnd_result_init().
- Always use conn->m->stmt_init instead of mysqlnd_stmt_init()
2010-05-14 13:18:39 +00:00
Andrey Hristov ce0ea97850 OOM fixes 2010-05-14 13:04:33 +00:00
Andrey Hristov a78fa3fcaf - initialize some variables
- initialize the methods in a shorter way, use the compiler.
 = on structures copies them. Allows also exportability of
 the methods.
2010-05-13 15:29:08 +00:00
Andrey Hristov 90f16527af Export the methods of MYSQLND_NET 2010-05-13 14:15:23 +00:00
Andrey Hristov aad53cbdec Export the result_metadata methods to external modules. 2010-05-13 11:16:11 +00:00
Andrey Hristov 87bac04bf1 Better fix for #51605 2010-05-13 11:05:09 +00:00
Dmitry Stogov 32a09f39be Fixed a possible resource destruction issues in shm_put_var() 2010-05-13 08:34:06 +00:00
Dmitry Stogov 24704df3a8 Fixed a possible memory corruption in ArrayObject::uasort() Reported by Stefan Esser 2010-05-13 08:09:54 +00:00
Felipe Pena a8cad398fc - Fixed bug #51791 (constant() aborts execution when fail to check undefined constant) 2010-05-13 02:13:30 +00:00
Christopher Jones c5a068e025 Errors using reserved words as methods 2010-05-12 21:34:32 +00:00
Dmitry Stogov 24a1dbabc8 Fixed a possible memory corruption in parse_str(). Reported by Stefan Esser 2010-05-12 11:32:25 +00:00
Dmitry Stogov f94a437d9d Fixed a possible information leak because of interruption of XOR operator 2010-05-12 11:10:06 +00:00
Dmitry Stogov 27ef344f2b Fixed a possible memory corruption in pack(). Reported by Stefan Esser 2010-05-12 11:04:57 +00:00
Michael Wallner ad15797925 Fixed bug #51725 (xmlrpc_get_type() returns true on invalid dates). (Mike) 2010-05-12 09:37:25 +00:00
Christopher Jones 87b4f2a79d Restructure into PHP/PECL/PEAR component areas (at the expense of duplication) 2010-05-11 18:25:44 +00:00
Dmitry Stogov c2b911a0ec Fixed bug #49893 (Crash while creating an instance of Zend_Mail_Storage_Pop3) 2010-05-11 16:09:43 +00:00
Andrey Hristov d3b7aaa3fc One more time fixing the tests, lets use $IS_MYSQLND which comes from connect.inc 2010-05-11 15:55:07 +00:00
Andrey Hristov d4828ccd23 here comes the news, too 2010-05-11 15:50:21 +00:00
Andrey Hristov ab232ebb09 Fix for mysqli_stmt_execute.phpt, should be ran only against
4.1+ servers. MySQL's SLEEP function is available since 5.0.12, thus
the tests that use this function should be ran only if the server
is at least 5.0.12.
2010-05-11 15:49:03 +00:00
Andrey Hristov fd6f3961f8 These tests should be run only if mysqli uses mysqlnd. Part of fix for
Bug #51712 Test mysql_mysqlnd_read_timeout_long must fail on MySQL4
2010-05-11 15:27:03 +00:00
Raphael Geissert 7d4dde57d9 Document CGI options in the manpage (bug #51718)
Patch by Daniel Egeberg
2010-05-11 15:07:31 +00:00
Ilia Alshanetsky c7a553a7fb Removed double allocation of buffer inside openssl_random_pseudo_bytes() and cleanup code 2010-05-11 14:31:00 +00:00
Dmitry Stogov 57f8649eac Fixed a possible memory corruption in substr_replace() 2010-05-11 11:59:13 +00:00
Dmitry Stogov 5b18acdcc9 Fixed a possible memory corruption because of unexpected call-time pass by refernce and following memory clobbering through callbacks. 2010-05-11 10:41:19 +00:00
Andrey Hristov 962aa93ec7 Fix for bug #51605 (Mysqli zombie links) 2010-05-11 10:03:16 +00:00
Felipe Pena d787d545d2 - Fixed bug #51740 (acinclude.m4 macro PHP_CHECK_SIZEOF is not properly quoted)
Patch by: dave dot mulford at gmail dot com
2010-05-05 21:55:44 +00:00
Rob Richards 1e96fbe4a8 fix bug #48601 (xpath() returns FALSE for legitimate query)
add test
2010-05-05 11:40:11 +00:00
Dmitry Stogov 6597e85562 Fixed bug #50698 (SoapClient should handle wsdls with some incompatiable endpoints). (Justin Dearing) 2010-05-05 07:43:45 +00:00
Rob Richards 617e8a4f8c fix bug #49490 (XPath namespace prefix conflict)
add test
2010-05-04 15:41:49 +00:00
Derick Rethans 7cf3911cb8 - Fixed bug #49081 (DateTime::diff() mistake if start in January and interval >
28 days). (Derick)
2010-05-04 15:11:41 +00:00
Andrey Hristov ebae62d7c4 OOM stability fixes 2010-05-04 14:02:42 +00:00
Andrey Hristov 04d24bde20 Add possibility to control the allocator in when PHP is compiled
with debug
2010-05-04 13:49:43 +00:00
Rob Richards 3860164101 fix bug #51721 (mark DOMNodeList and DOMNamedNodeMap as Traversable) 2010-05-04 12:55:26 +00:00
Adam Harvey e32090a163 Fix misordered news item. 2010-05-04 11:59:54 +00:00
Adam Harvey 73ddb79613 Fix for bug #48289 (iconv_mime_encode() quoted-printable scheme is broken).
Thanks to Hiroaki Kawai for the original patch.
2010-05-04 11:56:59 +00:00
Adam Harvey 9d67273740 Well, as long as we're dealing with typos... :) 2010-05-04 11:01:46 +00:00
Felipe Pena f8b1db2d0d - Fix typo 2010-05-04 10:59:26 +00:00
Pierre Joye af567e7d54 - fix build 2010-05-04 09:51:03 +00:00
Adam Harvey e0e0147003 Alter the getmxrr() test to use lists.php.net (which we presumably control)
instead of ez.no (which we presumably don't) for the single MX record test.
2010-05-04 09:41:47 +00:00
Pierre Joye fdf0395e49 - Fixed bug #51732, Fileinfo __construct or open does not work with NULL 2010-05-04 08:48:58 +00:00
Dmitry Stogov 3a15e98155 Fixed a possible memory corruption in addcslashes(). 2010-05-04 08:02:51 +00:00
Pierre Joye 11040eae16 - revert fix for #51723 in 5.2, vc6 does not support strtoi64, use builtin functioon in 5.3 (trunk is vc9+ only) 2010-05-03 19:51:59 +00:00
Andrey Hristov 6202b46f2a Handle OOM in mysqlnd_res::store_result_fetch_data 2010-05-03 19:32:07 +00:00
Pierre Joye 55320ca1b8 - fix build (declaration must be first) 2010-05-03 19:29:05 +00:00
Andrey Hristov cac3520882 Handle OOM in mysqlnd_fetch_row_buffered_c() 2010-05-03 19:09:45 +00:00
Andrey Hristov 4a8d751cff Handle OOM in mysqlnd_fetch_row_unbuffered_c() 2010-05-03 19:02:48 +00:00
Andrey Hristov d0cef550a3 Handle OOM stemming from mysqlnd_result_init in the same
function and up the stack.
2010-05-03 18:50:47 +00:00
Pierre Joye 43f4d46cb3 - #51273, Content-length header is limited to 32bit integer with apache2/windows 2010-05-03 17:47:58 +00:00
Andrey Hristov 6dff9e55be Handle gracefully OOM in mysqlnd_mempool_create and up the stack 2010-05-03 17:07:18 +00:00
Felipe Pena 44bcdeeb77 - Replaced 'zend_hash_find' to 'zend_hash_quick_find' on zend_hash_compare() function 2010-05-03 16:36:04 +00:00
Andrey Hristov f9fe805abe Handle OOM in block_alloc_get_chunk, and also in the caller
in mysqlnd_wireprotocol.c
2010-05-03 16:20:46 +00:00
Andrey Hristov 864f2da733 Remove unused parameter 2010-05-03 16:09:05 +00:00
Ilia Alshanetsky 813e3cf14d Fixed bug #51690 (Phar::setStub looks for case-sensitive __HALT_COMPILER()) 2010-05-03 14:41:40 +00:00
Pierre Joye cbe5199c42 - WS 2010-05-03 14:29:07 +00:00
Andrey Hristov 88bf630798 One more case to handle in case of OOM, in block_alloc_resize_chunk 2010-05-03 14:26:08 +00:00
Andrey Hristov de4a5156e6 Handle OOM when resizing blocks during data fetch 2010-05-03 14:16:04 +00:00
Andrey Hristov 8fd0407b3a Fix compiler warnings - unused functions 2010-05-03 13:51:30 +00:00
Andrey Hristov d0abd9510e Better handing of OOM in mysqlnd::set_client_option 2010-05-03 13:45:58 +00:00
Pierre Joye 0871df60a3 - update bison version (mike) 2010-05-03 09:05:30 +00:00
Felipe Pena 151fc3b7c0 - Revert accidental changes 2010-05-02 20:11:22 +00:00
Ilia Alshanetsky 90c336026e - Fixed a possible stack exaustion inside fnmatch(). Reporeted by Stefan Esser 2010-05-02 19:34:21 +00:00
Raphael Geissert eca9e10bc0 Fix bug in unaligned memory access fix 2010-05-02 05:01:51 +00:00
Raphael Geissert 803869d6ff Fix unaligned memory accesses in enchant (bug #51289) 2010-05-01 23:32:40 +00:00
Felipe Pena 2b0464c3a9 - Fixed bug #51719 (typo in function prototype) 2010-05-01 18:54:49 +00:00
Raphael Geissert b373d8e184 Fix another typo s/exlcusive/exclusive 2010-05-01 18:30:38 +00:00
Raphael Geissert 174d2528b1 Fix typos s/connnection/connection 2010-05-01 18:27:42 +00:00
Pierre Joye 91bcba0343 - Fix #51688, ini per dir crashes when invalid document root are given 2010-04-30 08:15:09 +00:00
Andrey Hristov a3168a398c Handle OOM cases, in case of persistent connections this is real
and the Zend MM won't help.
2010-04-29 15:49:51 +00:00
Andrey Hristov 2c38266536 Fix valgrind warning, usage of nirvana memory 2010-04-29 15:17:44 +00:00
Andrey Hristov b72437494b Add a test case for the recently fixed memleak 2010-04-29 13:19:57 +00:00
Andrey Hristov fa40847263 Fix possible crashes in case of OOM, as well as a leak. 2010-04-29 13:13:41 +00:00
Andrey Hristov 16e4bd5d58 Try blob columns instead of int, and insert a lot of data at once 2010-04-29 12:07:02 +00:00
Andrey Hristov 9b468d9577 Fix crash if OOM and USE_ZEND_ALLOC=0 2010-04-29 11:49:08 +00:00
Christopher Jones c033a81b50 Bug #51691 (Unnecessary realloc causes crashes in PHP trunk tests with interned strings). Updated tests check some other edge cases 2010-04-29 05:07:16 +00:00
Derick Rethans 9d24798b38 - Updated to version 2010.9 (2010i) 2010-04-28 23:03:36 +00:00
Pierre Joye f4735e72e4 - we don't need that anymore 2010-04-28 22:25:31 +00:00
Christopher Jones 9b3e080098 Mask schemaname in error messages 2010-04-28 17:26:59 +00:00
Andrey Hristov ad4b429633 Fixed few buffer overflows reported by Stefan Esser. 2010-04-28 15:35:52 +00:00
Pierre Joye 0688e6ef01 - - Fixed #51128, imagefill() doesn't work with large images 2010-04-28 14:35:42 +00:00
Pierre Joye 17f5a9d2a2 - fix possible Dechunking Filter Buffer Overflow 2010-04-28 14:10:01 +00:00
Andrey Hristov 1838fcc7b0 const-ify fields 2010-04-28 12:29:13 +00:00
Ilia Alshanetsky 5031bfc395 Fixed a possible arbitrary memory access inside sqlite extension. Reported by Mateusz Kocielski. 2010-04-28 12:10:10 +00:00
Pierre Joye 07446082c8 - Fix #51671, imagefill does not work correctly for small images 2010-04-28 08:23:44 +00:00
Pierre Joye eaab2fbc4b - WS 2010-04-28 08:04:52 +00:00
Ilia Alshanetsky 7174b6ec78 Fixed string format validation inside phar extension. Reported by Stefan Esser 2010-04-27 17:13:24 +00:00
Andrey Hristov 3d900d4cad Fixed very rare memory leak in mysqlnd, when binding thousands of columns 2010-04-27 12:32:34 +00:00
Andrey Hristov eba793fa1f Of course, 64*4 is 256, not 1024 2010-04-27 11:02:51 +00:00
Andrey Hristov be5920b3e9 Move the macro to mysqlnd_enum_n_def.h, because it can be reused
in other places. Also, premultiply the values by 4 and add some
reserve for future releases of the server.
2010-04-27 10:53:27 +00:00
Etienne Kneuss a5d361e3ea Fixed #48361 (SplFileInfo::getPathName() should return the parent 2010-04-27 08:56:01 +00:00
Andrey Hristov 8525f7bb02 Test case for the buffer overflow in mysqlnd_change_user 2010-04-27 08:45:23 +00:00
Andrey Hristov 5bb74e6562 Fixed buffer overflow in mysqlnd_change_user 2010-04-27 08:26:24 +00:00
Hannes Magnusson 3283b811eb - Unifiy that message
- Mention php.ini
2010-04-27 08:23:25 +00:00
Hannes Magnusson 257a192095 Fix test 2010-04-27 08:17:17 +00:00
Andrey Hristov c92c788c85 Fixed possible buffer overflow in mysqlnd_conn__list_fields. 2010-04-27 08:02:08 +00:00
Etienne Kneuss c200eeeb61 Fix #51374 (Wrongly initialized object properties) 2010-04-27 05:58:39 +00:00
Pierrick Charron 8f128b2b13 Fixed bug #51670 getColumnMeta causes segfault when re-executing query after calling nextRowset 2010-04-27 05:56:56 +00:00
Etienne Kneuss 9f16874a53 Fix #49723 (Skip seek when unnecessary) 2010-04-27 04:57:48 +00:00
Kalle Sommer Nielsen cb30330800 Merge safe_mode changes into extensions that are in sync in both branches 2010-04-26 23:55:03 +00:00
Ilia Alshanetsky 64f372fae2 Fixed handling of session variable serialization on certain prefix characters. Reported by Stefan Esser 2010-04-26 18:35:54 +00:00
Pierre Joye 0f88851e92 - Fix #51582, Don't assume UINT64_C it's ever available 2010-04-26 10:34:53 +00:00
Felipe Pena 72ede78ebb - BFN #51624 2010-04-25 23:25:15 +00:00
Hannes Magnusson 267b5cea14 mention which setting! 2010-04-25 18:55:06 +00:00
Etienne Kneuss eb88d58e6c Fix #51532 (Invalid prototype for SplFileInfo::fscanf) 2010-04-25 05:18:42 +00:00
Felipe Pena 1c0ed3433e - Fixed memory leak 2010-04-24 16:59:09 +00:00
Christopher Jones eb0a3ff1af Initialize vars to prevent valgrind warnings in some cases 2010-04-24 00:44:56 +00:00
Andrey Hristov af6dd192b3 Fix for bug #51647 Certificate file without private key (pk in another file) doesn't work 2010-04-23 13:54:40 +00:00
Felipe Pena a5142d18cb - Fixed compiler warnings 2010-04-23 13:32:03 +00:00
Felipe Pena e86710ce11 - Fixed bug #51435 (Missing ifdefs / logic bug in crypt code cause compile errors) 2010-04-22 20:54:35 +00:00
Andrey Hristov 4842f96e2d Change the way the allocator is called - through an abstraction
to give the possibility of pluggability. Thanks to the macros
already used the changes are not pervasive.
2010-04-22 16:28:50 +00:00
Andrey Hristov 5431f235db Fix problem spotted by Felipe. 2010-04-22 16:22:56 +00:00
Antony Dovgal c996aea40d revert most of the Andrey's patch that causes segfaults
(as agreed with Pierre)
2010-04-22 15:59:44 +00:00
Andrey Hristov f71444c756 adding what last commit was missing 2010-04-22 15:14:45 +00:00
Andrey Hristov 34e56fea0b Remove dead code and add possibility to fine tune the size of
a mempool (used for result sets).
2010-04-22 15:07:40 +00:00
Andrey Hristov 2556733787 Add the posibility to switch off the compilation of statistics
collection, for those who want to optimize the last percent of their
binaries.
2010-04-22 13:03:44 +00:00
Antony Dovgal a1f753c8e3 initialize variable. this code still segfaults in OpenSSL, no idea why 2010-04-22 11:56:08 +00:00
Pierre Joye edc961cc66 - Bug #51629, CURLOPT_FOLLOWLOCATION error message is misleading 2010-04-22 11:49:10 +00:00
Pierre Joye 0fecc8c6a0 - Bug #51629, CURLOPT_FOLLOWLOCATION error message is misleading 2010-04-22 08:58:07 +00:00
Adam Harvey 592daf8453 Fix for bug #51604 (newline in end of header is shown in start of message).
Patch by Daniel Egeberg.
2010-04-22 02:22:49 +00:00
Felipe Pena ab81ddd1de - Changed order to FR 2010-04-21 22:30:06 +00:00
Felipe Pena ee185c604a - Fixed bug #51627 (script path not correctly evaluated)
Patch by: russell dot tempero at rightnow dot com
2010-04-21 22:22:31 +00:00
Felipe Pena 5a7786c63f - Fixed bug #51562 (query timeout in mssql can not be changed per query)
Patch by: ejsmont dot artur at gmail dot com
2010-04-21 14:19:27 +00:00
Felipe Pena 45b68febe9 - Fix mem. leak 2010-04-21 12:52:24 +00:00
Andrey Hristov 691522780f Hardening the reads of mysqlnd.
All packets but the row data packet are read into preallocated buffer,
either on the stack or on the heap (cmd_buffer). The size of the buffer
is always checked to skip buffer overruns. Only up to the size of the
buffer is stored into the buffer but packet->header.size has the size of
all data sent. In this case network layer bails.

This patch hardenes the reads, so if packets are malformed and shorter
than they should be there will be no further reads in the buffer.
In short, detection of malformed packets.
2010-04-20 20:02:32 +00:00
Andrey Hristov efa0077e08 put the trigger in the right place 2010-04-20 19:09:56 +00:00
Andrey Hristov 804b950562 It is possible that change user tries an user who has old password.
Instead of error message that doesn't say much there is more information now.
2010-04-20 18:04:24 +00:00
Felipe Pena 0cbfc91628 - Improve test 2010-04-20 16:45:46 +00:00
Felipe Pena df43d76e62 - Fixed bug #51615 (PHP crash with wrong HTML in SimpleXML) 2010-04-20 16:24:21 +00:00
Felipe Pena 1efc049863 - Fixed bug #51607 (pg_copy_from does not allow schema in the tablename argument)
Patch by: cbandy at jbandy dot com
2010-04-20 15:59:01 +00:00
Dmitry Stogov 336e957951 Fixed bug #49700 (memory leaks in php_date.c if garbage collector is enabled) 2010-04-20 15:41:35 +00:00
Felipe Pena 5aedea7179 - Fixed bug #51609 (pg_copy_to: Invalid results when using fourth parameter) 2010-04-20 14:11:53 +00:00
Felipe Pena a175419f84 - Fix copyrights 2010-04-20 13:50:34 +00:00
Antony Dovgal 5d2f7ab843 fix build 2010-04-20 12:50:02 +00:00
Dmitry Stogov 4c252d805d Fixed bug #48781 (Cyclical garbage collector memory leak) 2010-04-20 12:30:35 +00:00
Felipe Pena 0b401e1289 - Fixed bug #51608 (pg_copy_to: WARNING: nonstandard use of \\ in a string literal)
Patch by: cbandy at jbandy dot com
2010-04-20 11:49:23 +00:00
Antony Dovgal 9c97c26832 fix infinite loop in the test 2010-04-20 10:04:26 +00:00
Adam Harvey b47136d332 Added explanatory comments to filter_input and filter_input_array to document
why some code that looks intuitively wrong is actually correct. Related to
bug #51344 (FILTER_NULL_ON_FAILURE flag automatically set in filter_input()
functions).
2010-04-20 04:31:11 +00:00
Stanislav Malyshev 8088be390f fix 64-bit integer overflow in mhash_keygen_s2k 2010-04-20 00:45:07 +00:00
Felipe Pena 45c090f3e7 - Fixed bug #51590 (JSON_ERROR_UTF8 is undefined) 2010-04-18 18:07:27 +00:00
Christopher Jones de174766f8 Add fix made previously 2010-04-16 22:34:25 +00:00
Christopher Jones 7a4b40efc5 Add attribution (thanks Felipe) 2010-04-16 22:06:52 +00:00
Christopher Jones a812818670 Fixed Bug #51577 (Uninitialized memory reference with oci_bind_array_by_name) 2010-04-16 20:36:40 +00:00
Christopher Jones e79a8d440e Merge Kalle's tidy-up from trunk to keep files in sync 2010-04-16 19:47:23 +00:00
Christopher Jones ff515d0ee4 Fix php.ini comment typo 2010-04-15 19:22:01 +00:00
Andrey Hristov 664b2389ca Last batch of int/uint comparison fixes 2010-04-15 15:58:26 +00:00
Andrey Hristov 76d64590b0 More int/uint comparison warning fixes 2010-04-15 15:53:58 +00:00
Andrey Hristov cdac2b4ecf Fix some int/uint comparison warnings 2010-04-15 15:28:00 +00:00
Andrey Hristov 6cc57e0d0d Remove unused file 2010-04-15 15:22:56 +00:00
Andrey Hristov 48e413eb28 more WS 2010-04-15 15:16:29 +00:00
Andrey Hristov 6aa682f564 CS + WS changes 2010-04-15 12:55:04 +00:00
Antony Dovgal 187a0d9b28 final fix for long opts in getopt() 2010-04-15 11:50:43 +00:00
Andrey Hristov dd9fc198ce Fix for bug#49234 method not found ssl_set
Patch was tested and compiles on Windows. (Thanks Kalle)
2010-04-15 11:01:30 +00:00
Antony Dovgal 2404c4c84f discard first TWO symbols of a long argument 2010-04-14 15:49:38 +00:00
Pierre Joye 632c03de71 - #35638, add udate to imap_fetch_overview 2010-04-14 09:45:37 +00:00
Antony Dovgal 913970cebf simplify configure check for nanosleep() 2010-04-13 12:41:46 +00:00
Pierre Joye 036c5f9f31 - begintransaction entry 2010-04-12 19:57:07 +00:00
Ilia Alshanetsky 213e155713 Fixed bug #51512 (mb_send_mail* fail when mail.add_x_header is on by default) 2010-04-12 14:04:45 +00:00
Pierre Joye b298ed5b70 - [doc] merge stream_set_read_buffer, equivalent of stream_set_write_buffer for read operations. Fixing possible bad effects while reading devices 2010-04-12 13:10:05 +00:00
Rob Richards f53f94d24d fix bug #50828 (DOMNotation is not subclass of DOMNode) 2010-04-09 11:34:34 +00:00
Antony Dovgal dda73e99f2 make sure the actual length of the argument passed matches the
length of the argument declared
this fixes things like `php --zend-exten=1` or `php-fpm --fpm-con=conf`
2010-04-08 15:27:21 +00:00
Andrey Hristov 3bd2faff8c Fixint INT_AND_FLOAT_AS native. It was working ok on 64bit but
because on 32bit SIZEOF_LONG is 4 and INT64 from MySQL is 8 everything
was converted to string, even if it was able to put it in a long.
This closes Request #50651 Native type cast returns wrong result
2010-04-08 13:20:37 +00:00
Andrey Hristov be73f948d2 Fixing the second test 2010-04-08 13:18:52 +00:00
Andrey Hristov 48c3d20dd4 one more fix and both work with libmysql and mysqlnd 2010-04-08 10:53:38 +00:00
Antony Dovgal d2699793e0 fix build 2010-04-08 09:56:18 +00:00
Andrey Hristov 8338d48828 Fix for bug #51026 ssl not working 2010-04-08 09:01:21 +00:00
Pierre Joye 517d9bb1f2 - WS 2010-04-08 07:55:35 +00:00
Pierre Joye c4eafddbda - WS 2010-04-08 07:50:05 +00:00
Andrey Hristov 48392f04fa Another fix for the 16 chars user limitation of MySQL 2010-04-07 18:28:46 +00:00
Andrey Hristov 7670d2948d Fix test. The usernames in the server are 16 chars long 2010-04-07 18:05:42 +00:00
Andrey Hristov 798103d4e0 Fix the Windows build (void* arithmetic) as well as --disable-zlib
build.
2010-04-06 18:14:23 +00:00
Andrey Hristov dda0320c5c Stricly C 2010-04-06 14:33:55 +00:00
Antony Dovgal d7e716b8f0 fix typo 2010-04-06 13:42:21 +00:00
Andrey Hristov aa8f43fad9 Recommit with an Windows build fix:
Fix inconsistencies
- memory allocated with spprintf, or likes, outside of mysqlnd's
allocator functions should not be freed by the mysqlnd's allocator
(a wrapper around emalloc/malloc).
- memory allocated by the mysqlnd's allocator should only be freed
  by it.
- add a mode to track memory usage (malloc/free)
2010-04-06 13:28:23 +00:00
Stanislav Malyshev 5f11cd5693 change namespaced ctors - only __construct would work 2010-04-04 23:28:20 +00:00
Felipe Pena 462580cd7d - Fix tests 2010-04-04 17:21:27 +00:00
Felipe Pena 49a81742ef - Fix test 2010-04-04 16:57:44 +00:00
Felipe Pena 4d571dee74 - Fixed tests 2010-04-03 15:42:42 +00:00
Felipe Pena a140e70661 - Fixed bug #51445 (var_dump() invalid/slow *RECURSION* detection) 2010-04-02 21:44:09 +00:00
Rob Richards 0758c8794d fix bug #48983 (DomDocument : saveHTMLFile wrong charset) 2010-04-02 20:08:15 +00:00
Rasmus Lerdorf 9744284109 Fix tests 2010-04-02 18:27:48 +00:00
Rasmus Lerdorf 6d77506cfd Update the FILTER_VALIDATE_EMAIL filter to fix bug #49576 2010-04-02 17:56:37 +00:00
Rob Richards f1af56fb4e fix WS 2010-04-02 16:19:23 +00:00
Rob Richards 12b71200be re-apply bug fix #35673 (formatOutput does not work with saveHTML) from old trunk
add test
BFN
2010-04-02 16:15:06 +00:00
Stanislav Malyshev 44a5b8e459 fix #49192 - crash in GC when get_properties handler returns null 2010-04-01 22:54:03 +00:00
Pierre Joye 96e2651fa2 - revert revision 297277, break the builds (declaration must go 1st, size of void * and other known situations). Also Johannes, can you check that commit pls? Thought we were in bugs fixing only for 5.3 2010-04-01 20:21:50 +00:00
Stanislav Malyshev a3857fd963 fix #51394 - try harder to find script lineno when exception happens 2010-04-01 19:36:56 +00:00
Rasmus Lerdorf 8b1d84a6ce Add new full_special_chars filter to tests 2010-04-01 18:04:57 +00:00
Andrey Hristov f534df710e Fix inconsistencies
- memory allocated with spprintf, or likes, outside of mysqlnd's
allocator functions should not be freed by the mysqlnd's allocator
(a wrapper around emalloc/malloc).
- memory allocated by the mysqlnd's allocator should only be freed
  by it.
- add a mode to track memory usage (malloc/free)
2010-04-01 13:26:41 +00:00
Andrey Hristov a712d9cefb Better fix for bug #51347 mysqli_close / connection memory leak 2010-04-01 12:46:21 +00:00
Ilia Alshanetsky c2e16d3c5b On beginTransaction() reset error state 2010-04-01 12:08:55 +00:00
Andrey Hristov 311ab2c822 Fixed bug #51347 mysqli_close / connection memory leak
Streams API registers every stream as resource, which lands then
in EG(regular_list), however doesn't clean that when the stream is
closed. At the end this is a para-leak. At the end of the script
all memory is cleaned, however this is a problem for long runnig
scripts that open connections. For every opened and closed connection
about 150 Bytes on 32bit and 250 Bytes on 64bit will be "lost",
according to memory_get_usage().
2010-04-01 11:50:24 +00:00
Pierre Joye 60176163f1 - fix build 2010-04-01 10:34:05 +00:00
Rasmus Lerdorf b529350d4a Fix FILTER_VALIDATE_URL - Host names can't start with '.' or '-' 2010-03-31 23:56:30 +00:00
Rasmus Lerdorf a5b5743d71 full_special_chars filter from trunk - approved by johannes 2010-03-31 22:59:09 +00:00
Johannes Schlüter 53d35553c6 It's 2010 already 2010-03-30 21:09:07 +00:00
Johannes Schlüter 4dc1cef4fe Use php_error_docref instead of zend_error 2010-03-30 21:02:32 +00:00
Ilia Alshanetsky 658fe1d0c3 Upgraded bundled sqlite to version 3.6.23.1 2010-03-30 11:52:25 +00:00
Derick Rethans 462399b78b - Updated to version 2010.7 (2010g) 2010-03-29 17:22:53 +00:00
Andrey Hristov 94cd357f5b Make it coupled - what is allocated with mnd_ should be freed
with mnd_ and vice versa.
Added mnd_pestrndup and mnd_pestrdup, which wrap the normal
calls to be able to track this calls.
Fixed some failing tests.
2010-03-29 17:04:16 +00:00
Ilia Alshanetsky e99039d692 Upgraded bundled PCRE to version 8.02. 2010-03-29 11:58:06 +00:00
Christopher Jones 3e58dee19a Fix #51220 by adding . Also improve reliability for tests using undefined behavior. 2010-03-26 19:38:26 +00:00
Andrey Hristov ec36ac1610 Fix tests that fail when the MySQL's socket file is not /tmp/mysql.sock
as it is in when compiled from source and the default for mysqlnd.
SuSE for example uses /var/run/mysql/mysql.sock . Also, sql.safe_mode
(ext/mysql and ingres) needs the socket.
Fix possible crashes in mysqlnd. When packets are shorter, functions should
return error.
2010-03-26 16:58:25 +00:00
Adam Harvey 53cfb3d53d Fixed bug #51393 (DateTime::createFromFormat() fails if format string contains timezone). 2010-03-26 04:31:26 +00:00
Stanislav Malyshev 252082192a fix the protos 2010-03-25 19:17:17 +00:00
Christopher Jones 1a6f4efbad Fixed bug #51291 (oci_error doesn't report last error when called two times) 2010-03-24 22:08:55 +00:00
Hannes Magnusson abd893a2ae Fix tests 2010-03-24 22:06:21 +00:00
Hannes Magnusson a1cce74e96 Fix test (the key can be negative) 2010-03-24 21:57:30 +00:00
Andrey Hristov 78887ff757 Fix a segfault when using a mysqli object after unsuccesssful connect, the
handle should have been allocated with mysqli_init().
2010-03-24 15:17:57 +00:00
Andrey Hristov 9f20131311 fix build failure after recent commit by Kalle 2010-03-24 10:06:42 +00:00
Takeshi Abe a46e108b83 Fixed bug #51263 (imagettftext and rotated text uses wrong baseline) 2010-03-24 04:12:19 +00:00
Kalle Sommer Nielsen c8b33a6a01 Fix declaring 2010-03-23 13:21:22 +00:00
Ilia Alshanetsky 8a9364080b Added test for bug #51338 2010-03-23 11:51:38 +00:00
Christopher Jones ec3a46e194 name changes for consistency with planned additions 2010-03-22 22:37:20 +00:00
Ilia Alshanetsky 995d15ebcc Fixed bug #51338 (URL-Rewriter is still enabled if use_only_cookies is on). 2010-03-22 12:16:45 +00:00
Felipe Pena 3488cd43be - Fixed bug #49429, #51331 (odbc_autocommit doesn't work) 2010-03-20 18:19:16 +00:00
Christopher Jones ad0e1ae3f1 New tests for existing functionality 2010-03-19 22:15:40 +00:00
Andrei Zmievski f92fae2f66 I am sorry I tried fixing PHP without extensive discussion on the mailing list.
I am sorry I tried fixing PHP without extensive discussion on the mailing list.
I am sorry I tried fixing PHP without extensive discussion on the mailing list.

Hope all the relevant parties are satisfied.
2010-03-18 22:37:25 +00:00
Andrei Zmievski 3220f15ca2 Fix a few problems with large (2G-4G) file uploads. Added
--enable-large-uploads-fix switch because one change was in SAPI.h structure.
2010-03-18 21:07:38 +00:00
Andrey Hristov 981ba00606 Fix for complaint from the Zend MM, efree of a NULL pointer. 2010-03-17 18:08:25 +00:00
Andrey Hristov 4941b23bcd Fix a bug that a statement that is reset doesn't clean
the wire properly (as it is done when the statement is closed).
If there is more that one result sets returned from the PS
(like a call to SP that returns at least one RSet next to the
status rset) then the line was blocked. PS Multi-Res is not supported
in any libmysql from a GA-ed MySQL.
2010-03-17 18:00:47 +00:00
Andrey Hristov 3ff193c05e fix valgrind warning introduced with the latest patch. The memory
should be calloc-ed, not malloced, because the code that uses the
stmt storage needs that.
2010-03-17 11:40:37 +00:00
Christopher Jones 825d1abdfe Update oci_commit tests 2010-03-16 23:13:50 +00:00
Andrey Hristov 7496cc761e decouple the methods in MYSQLND_STMT from the data,
needed to move to a new structure MYSQLND_STMT. Makes
the code cleaner and less error-prone.
Also fix PDO/MySQL which directly touch mysqlnd internals
instead of using API calls.
2010-03-16 12:36:57 +00:00
Rob Richards da538251c1 - Fix win32 build. 2010-03-15 16:20:19 +00:00
Moriyoshi Koizumi 82fd4858b8 - Fix win32 build. (notified by Rob. Thanks) 2010-03-15 14:19:51 +00:00
Felipe Pena 54fc4537c6 - Fix mem. leak 2010-03-13 20:26:51 +00:00
Raphael Geissert d8da372fd0 Fix CVE-2010-0397: null pointer dereference when processing invalid XML-RPC
requests (bug #51288)
2010-03-13 18:40:29 +00:00
Christopher Jones 1c6ea06c73 New OCI8 test 2010-03-13 00:25:11 +00:00
Moriyoshi Koizumi 73ba495674 - Forgot to commit this patch. Sorry. 2010-03-12 16:19:25 +00:00
Andrey Hristov ccfd9cd744 allow persistency of PS 2010-03-12 13:03:46 +00:00
Jani Taskinen af49e58f51 - Reverted r296062 and r296065 2010-03-12 10:28:59 +00:00
Moriyoshi Koizumi ea539c8b88 - Update the bundled libmbfl to the latest on upstream. 2010-03-12 04:55:37 +00:00
Christopher Jones 321ca32642 New and improved DBA tests 2010-03-12 00:27:57 +00:00
Hannes Magnusson 3f15f8f4e3 Fix build (see r296062) 2010-03-11 19:50:04 +00:00
Michael Wallner 5b277c4da0 add backlock socket context option for stream_socket_server(),
which had a hardcoded backlog of 5 at two occurrances
2010-03-11 16:37:24 +00:00
Jani Taskinen b4e1296756 - Fix conflict 2010-03-11 11:23:38 +00:00
Jani Taskinen 06f072cb5e MFH: Improved / fixed output buffering (Michael Wallner) 2010-03-11 10:24:29 +00:00
Adam Harvey f60946eb54 Fixed bug #51269 (zlib.output_compression Overwrites Vary Header). 2010-03-11 06:20:22 +00:00
Raphael Geissert 2c3b1fd920 Properly skip tests that require the bundled gd lib when the external is used 2010-03-11 05:49:50 +00:00
Felipe Pena 78cf85ab44 - Fixed bug #51257 (CURL_VERSION_LARGEFILE incorrectly used after libcurl version 7.10.1)
patch by: aron dot ujvari at microsec dot hu
2010-03-10 22:58:46 +00:00
Christopher Jones 09df605181 Mask name of older DB4 versions 2010-03-09 18:06:20 +00:00
Adam Harvey bdbb2e77ca Fixed bug #51242 (Empty mysql.default_port does not default to 3306 anymore, but 0). 2010-03-09 05:08:31 +00:00
Felipe Pena 68f805a6d0 - Fixed bug #51237 (milter SAPI crash on startup)
patch by: igmar at palsenberg dot com
2010-03-08 23:29:46 +00:00
Felipe Pena 9186e478fa - Fix php-milter sample usage (-r option doesn't exists here) 2010-03-08 22:58:31 +00:00
Derick Rethans 6a759c0692 - Updated to version 2010.5 (2010e) 2010-03-08 20:08:51 +00:00
Kalle Sommer Nielsen 62f087df75 Rename the HAVE_LIBICONV_IN_LIBICONV macro to ICONV_ALIASED_LIBICONV, making it less cryptic 2010-03-08 15:51:08 +00:00
William Martin d42fd45f97 Add some bcmath tests 2010-03-08 15:16:51 +00:00
Kalle Sommer Nielsen b961634c5a Fix linking of iconv on Windows 2010-03-08 14:04:35 +00:00
Ilia Alshanetsky 48adfafab8 Fixed bug #51213 (pdo_mssql is trimming value of the money column). 2010-03-08 12:39:44 +00:00
Derick Rethans 3025ca8e17 - Fixed bug #46111 (Some timezone identifiers can not be parsed). 2010-03-07 19:18:06 +00:00
Derick Rethans b42dc0d061 - Re-generate mapping files, but now with BC zones as well.
#- Fixes the test case for bug #17988 that used a few of those.
2010-03-07 19:13:19 +00:00
Derick Rethans 4447b87d91 - Fixed bug #48902 (Timezone database fallback map is outdated). 2010-03-07 18:21:23 +00:00
Derick Rethans 02e4644786 - Fixed bug #49059 (DateTime::diff() repeats previous sub() operation). 2010-03-07 17:25:16 +00:00
Derick Rethans dbec5439b5 - Update test cases after the fix for bug #49778. 2010-03-07 17:23:40 +00:00
Derick Rethans 156d780cbd - Fixed bug #40778 (DateInterval::format("%a") is always zero when an interval
is created from an ISO string).
2010-03-07 15:26:39 +00:00
Felipe Pena 04753cae60 - Fix order 2010-03-07 13:58:02 +00:00
Derick Rethans f1286280d1 - Fixed bug #50555 (DateTime::sub() allows 'relative' time modifications). 2010-03-07 13:54:46 +00:00
Derick Rethans a2ad4ea8b5 - Change this test case because non-6 digits are supported now, and clarify
that the "1" doesn't show because the precision isn't high enough. (Same
  happens if you change it to 9).
2010-03-07 13:47:06 +00:00
Derick Rethans abd232c671 - Fixed copyright year. 2010-03-07 13:11:44 +00:00
Derick Rethans 2d2e02740a - Fixed bug #50392 (date_create_from_format enforces 6 digits for 'u' format
character).
2010-03-07 13:08:47 +00:00
Felipe Pena f867fadd22 - Fixed bug #50383 (Exceptions thrown in __call / __callStatic do not include file and line in trace) 2010-03-07 02:17:11 +00:00
Felipe Pena 4149bb3dfd - New test 2010-03-07 00:57:19 +00:00
Felipe Pena ea1447c3ce - Fixed bug #50810 (property_exists does not work for private) 2010-03-07 00:49:34 +00:00
Felipe Pena 03bec4299f - Fixed tests 2010-03-06 23:58:35 +00:00
Raphael Geissert 1f24be304f Add NEWS entries for filter overflow fix 2010-03-06 20:02:25 +00:00
Raphael Geissert db01920ad7 Detect overflows before they occur in the filter extension (bug #51023)
Thanks to Sean Finney for the patch
2010-03-06 18:54:55 +00:00
Derick Rethans 13e0d47cf3 - Fixed bug #51096 ('last day' and 'first day' are handled incorrectly when
parsing date strings).
- For 5.2 I just added the test case minus new 5.3 additions.
2010-03-06 16:04:47 +00:00
Felipe Pena 6c153e8634 - Fixed bug #50358 (Compile failure compiling ext/phar/util.lo) 2010-03-06 14:45:49 +00:00
Christopher Jones aa60f8e807 Test misc argument error conditions 2010-03-06 00:23:16 +00:00
Moriyoshi Koizumi 8481fd7c3b - Fixed bug #49267 (linking fails for iconv) 2010-03-05 09:12:13 +00:00
Christopher Jones f3ad58a8a0 Fixed bug #51086 (DBA DB4 doesn't work with Berkeley DB 4.8) 2010-03-05 06:45:28 +00:00
Christopher Jones db7843bbac Auto detect recent versions of Berkeley DB4 2010-03-05 05:23:01 +00:00
Felipe Pena 667f00f6dc - BFN #50999 2010-03-05 02:33:03 +00:00
Christopher Jones 7b329d5afc DBA tests: cleanup and sycn. Add new Berkeley DB 4 tests 2010-03-05 00:23:26 +00:00
Ilia Alshanetsky 4db5175f54 Fixed bug #51190 (ftp_put() returns false when transfer was successful). 2010-03-04 12:52:58 +00:00
Felipe Pena ecae1f4923 - Entry in wrong place... 2010-03-03 22:21:57 +00:00
Christopher Jones 777d61c203 Mask resource numbers 2010-03-03 19:12:04 +00:00
Rasmus Lerdorf c0b00711fa Fix test 2010-03-03 18:19:35 +00:00
Rasmus Lerdorf e24fff2dac Turn on gc before we test it 2010-03-03 17:53:15 +00:00
Adam Harvey 0efe78a577 Fix for bug #51192 (FILTER_VALIDATE_URL will invalidate a hostname that includes '-'). Original patch by solar@azrael.ws. 2010-03-03 09:25:50 +00:00
Felipe Pena f0587e8086 - Possible fix for bug #50999 2010-03-03 00:29:38 +00:00
Felipe Pena c302509726 - Fixed bug #50731 (Inconsistent namespaces sent to functions registered with spl_autoload_register) 2010-03-03 00:15:34 +00:00
Hannes Magnusson 004a72ce1a - The ctor requires both arguments
- Sync/fix ctor and export arguments to 5_2
2010-03-02 22:16:24 +00:00
Christopher Jones 40348f1a5b make portable 2010-03-02 17:00:18 +00:00
William Martin acc80f0fc3 Added SKIP sections in case extension isn't enabled 2010-03-02 13:21:25 +00:00
Ilia Alshanetsky 772a84d5b9 Fixed bug #51171 (curl_setopt() doesn't output any errors or warnings when an invalid option is provided) 2010-03-02 12:54:23 +00:00
Felipe Pena 79f618833f - Fixed bug #51176 (Static calling in non-static method behaves like $this->) 2010-03-02 00:16:40 +00:00
Rasmus Lerdorf fcf1058d6b Fix bug #43314
Assume worst case all-encoded case here
2010-03-01 23:49:01 +00:00
Christopher Jones a3ec3b003d Improve basic code coverage 2010-03-01 20:33:18 +00:00
Derick Rethans 438f1d7c7a - Updated to version 2010.3 (2010c) 2010-03-01 14:59:24 +00:00
Raphael Geissert 3be50a26a7 Add some sysvmsg coverage tests 2010-03-01 01:59:14 +00:00
Moriyoshi Koizumi 24829e8d4e - Merge from upstream (note: this is no behavioral change, so need not to be
merged to 5.3.2 branch)
2010-02-28 09:33:05 +00:00
Moriyoshi Koizumi 817ab0c34d - Whitespaces. 2010-02-28 07:49:36 +00:00
Adam Harvey 1f19a7dc6c Fix for bug #23229 (syslog function truncates messages): remove the hard-coded
500 character error message limit imposed when using error_log=syslog.
2010-02-26 18:01:03 +00:00
Kalle Sommer Nielsen 294e69dd8f Fix assignment when SimpleXML is disabled on Windows 2010-02-25 17:08:17 +00:00
Kalle Sommer Nielsen 8c634336f3 Added parameter parsing check to SimpleXMLElement::count() 2010-02-25 17:06:32 +00:00
Andrey Hristov 7db6387a7f Fix the text. Correct english and a bit shorter. 2010-02-24 21:16:04 +00:00
Pierre Joye 707d02b7f5 - merge/update/fix 2010-02-24 19:57:56 +00:00
Andrey Hristov f8eb9abf44 add better description to the problem 2010-02-24 18:00:01 +00:00
Joey Smith f829a21659 MFH'd crypt() tests - renamed to fit phpt schema, tests for DES-fallback,
use b'' on strings.
2010-02-23 21:14:51 +00:00
Christopher Jones ab96016673 Add info on PHP doc contributions and add internals references 2010-02-23 20:40:03 +00:00
Pierre Joye aff51406ef - update test 2010-02-23 17:46:10 +00:00
Pierre Joye fb9ce4aaa2 - return *0/*1 on failure instead of FALSE, to avoid possible issues with bad user code 2010-02-23 17:26:49 +00:00
Pierre Joye 5cbece0a8e - fix build when __GMP_BITS_PER_MP_LIMB is not defined but GMP_LIMB_BITS (no trace of this change in gmp's changelog...) 2010-02-23 11:07:39 +00:00
Peter Cowburn fbbe3e3686 Corrected typo in LimitIterator offset exception. Fixes #51119 2010-02-22 23:55:30 +00:00
Pierre Joye e8be606367 - restore the credit, always been this name, will always be 2010-02-22 09:15:32 +00:00
Jani Taskinen 6a5c911b3f - Fixed NEWS entry order + removed aliases (only real names here!) 2010-02-22 09:06:06 +00:00
Pierre Joye 2075801b32 - crypt entry 2010-02-22 00:39:55 +00:00
Pierre Joye 4c23ec2b66 - With "extended" hashes, detect and reject invalid "setting" strings.
With "traditional" hashes, support many "reasonable" invalid salts in
  UFC-crypt compatible way, reject the rest of invalid salts. (Solar Designer)
2010-02-22 00:05:02 +00:00
Pierre Joye c402adc3b2 - Corrected the sanity check of the "setting" string in _crypt_blowfish_rn() to
reject iteration counts encoded as 36 through 39.  Previously, these would be
  misinterpreted as being the same as 04 through 07. (Solar Designer)
2010-02-21 23:47:14 +00:00
Joey Smith dd8ab3ad57 Not sure how I screwed up that MFH so badly. Proper
fix to config.m4 applied for when checking different
crypt() types.
2010-02-21 18:50:14 +00:00
Raphael Geissert 009a48ab3f Fix the name of the locale in some tests 2010-02-21 18:22:46 +00:00
Pierre Joye 23fdc85e3a - Fix #51059, crypt can fail and return NULL, on almost all implementations 2010-02-21 18:11:11 +00:00
Pierre Joye acc6609a27 - get the right error on windows 2010-02-21 17:44:25 +00:00
Joey Smith dd6ecfc01e MFH fix to config.m4 to make MD5 check label accurate 2010-02-20 19:28:39 +00:00
Joey Smith 7a0b1e55d8 MFH crypt() tests 2010-02-20 19:13:09 +00:00
Jani Taskinen 116e217799 - Update shtool to 2.0.8 2010-02-18 08:33:48 +00:00
Raphael Geissert dcfb8ee366 Fix race condition in shtool's mkdir -p implementation (bug #51076) 2010-02-18 00:30:12 +00:00
Kalle Sommer Nielsen bf7de28e46 Fixed bug #50795 (man pages have bad whatis entries)
- Patch by Debian
2010-02-17 05:32:52 +00:00
Ilia Alshanetsky 3ea4abe92c update copyright 2010-02-16 13:01:50 +00:00
Scott MacVicar ac09f82940 mbstring filter files were referenced but never actually compiled 2010-02-16 09:46:06 +00:00
Scott MacVicar da727ba343 Building libmbfl seperately fails since the shared library version is an API reference rather than a version number 2010-02-16 09:35:31 +00:00
Raphael Geissert 9077a39555 Correct description of getservbyname_basic.phpt (bug #51022) 2010-02-16 05:38:50 +00:00
Felipe Pena 67329a897a - Fix test (Bug #51036) 2010-02-15 21:46:45 +00:00
Felipe Pena 19d4b739cf - Fix the fix :P 2010-02-15 21:37:46 +00:00
Felipe Pena 72d9e654e0 - Added missing SKIPIF 2010-02-15 21:32:25 +00:00
Felipe Pena 0a7fe05ab7 - Fix test (Bug #51035) 2010-02-15 21:24:17 +00:00
Felipe Pena b68880641e - Fix test (bug #51040) 2010-02-15 21:16:34 +00:00
Andrey Hristov c7f2f1a5b1 add typedefs for all structure methods, and then reuse these typedefs 2010-02-15 16:58:33 +00:00
Raphael Geissert cf0e2b7026 Fix strtolower.phpt (bug #51031) 2010-02-13 16:43:04 +00:00
Jani Taskinen e6fcefe50a - Fix test 2010-02-13 15:43:45 +00:00
Jani Taskinen f9843495d1 - Fixed tests 2010-02-13 01:08:04 +00:00
Jani Taskinen c9b509f90b - Removed duplicate tests (bug #51007) 2010-02-12 17:09:09 +00:00
Jani Taskinen f38bfa620e - Added missing SKIPIF section to tests (bug #51014) 2010-02-12 16:53:44 +00:00
Pierre Joye 299352bf54 - merge 5.3.2RC2 changes, unsorted # for now 2010-02-12 01:22:10 +00:00
Christopher Jones 373dd4d0d8 Release PECL OCI8 1.4.1 2010-02-11 22:43:54 +00:00
Pierre Joye da94f0736e - fix php_date_llabs declaration 2010-02-11 22:37:50 +00:00
Johannes Schlüter ed03634a8c Revert 290786: Fixed bug #49521 (PDO fetchObject sets values before calling
constructor)
2010-02-11 22:14:06 +00:00
Johannes Schlüter eb0de2af90 revert 293939 Fixed bug #50636 (MySQLi_Result sets values before calling
constructor)
2010-02-11 21:42:48 +00:00
Pierre Joye 15a3c450b7 - those are in 5.3.2 now, merge to 5.3.2 section is coming 2010-02-11 21:17:13 +00:00
Ilia Alshanetsky ad9bbf26ab Fixed safe_mode validation inside tempnam() when the directory path does not end with a /). 2010-02-11 12:32:21 +00:00
Christopher Jones e2b9a01e70 Spelling typo in new check message 2010-02-10 23:56:27 +00:00
Derick Rethans 5a43f269cc - Fixed bug #49585 (date_format buffer not long enough for >4 digit years).
#- Was already partly fixed with my previous commit.
2010-02-10 16:55:40 +00:00
Derick Rethans 8ac4d1190a - Added a test case for bug #45866
- Fixed tests: oo_002, bug46268
- Fixed bug #50930 (Wrong date by php_date.c patch with ancient gcc/glibc
  versions).
- Make sure faulty strings passed to DateTime::modify() notify the user.
- Revert fix for bug #50392 as it was fixed wrongly without a proper test case.
- Fixed a bug with the 'r' formatting function as the default buffer size that
  was allocated only fit 4 digit years.
2010-02-10 16:23:30 +00:00
Derick Rethans fe72945ac5 - Update to 2010.2.
#- Wondering why it wasn't committed yet...
2010-02-10 14:03:29 +00:00
Johannes Schlüter 466c122aaa Fix config test 2010-02-10 13:37:17 +00:00
Ilia Alshanetsky 95ecd5680f Typo fix 2010-02-09 22:47:03 +00:00
Johannes Schlüter f732d74f6b Detect if we can rely on compiler-specific alignment features else use custom
workarounds. Fixes #50753
2010-02-09 21:58:13 +00:00
Andrey Hristov 480c327ff5 make send_close a hook, too 2010-02-09 19:05:40 +00:00
Rasmus Lerdorf f370d79067 It's a size_t here, not an unsigned int. 2010-02-09 17:38:36 +00:00
Pierre Joye d010d0732c - improve netsnmp detection (and restor snmp on win) 2010-02-09 16:38:24 +00:00
Andrey Hristov 52371a2d15 Fix bug#50416
PROCEDURE db.myproc can't return a result set in the given context
2010-02-08 13:09:34 +00:00
Pierre Joye 658e86b847 - prevent unexpectable behaviors (for the user) with invalid path 2010-02-07 20:15:58 +00:00
Pierre Joye c58f63a38a - Fixed #44098, imap_utf8() returns only capital letters 2010-02-07 13:06:54 +00:00
Jani Taskinen e37ba52900 touch 2010-02-07 11:42:52 +00:00
Jani Taskinen b96f3d1e02 bfn 2010-02-07 11:41:44 +00:00
Jani Taskinen 7a303b3328 - Fixed bug #50952 (allow underscore _ in constants parsed in php.ini files) 2010-02-07 11:40:29 +00:00
Rasmus Lerdorf 1947334023 Fix bug #50940 2010-02-05 18:59:05 +00:00
Pierre Joye 3a239b15e9 - silent warning 2010-02-04 15:34:19 +00:00
Pierre Joye e929582421 - if they are outdated/wrong, no need to confuse the users 2010-02-04 08:24:29 +00:00
Johannes Schlüter 4ef9a91298 Allow newer oracle versions 2010-02-04 01:12:14 +00:00
Andrey Hristov e50de7d982 Pass tsrmls to all functions, which might need it in the future.
We are anyway breaking the internal ABI in 5.3.2 so this won't hurt
and make us prepared for the future.
2010-02-03 17:31:29 +00:00
Pierre Joye 3247c2595d - vc6 does not expose it 2010-02-03 16:11:56 +00:00
Christopher Jones dd38619aa5 Explicitly set mail.add_x_header in php.ini so test output matches expected results 2010-02-02 22:54:36 +00:00
Ulf Wendel 7c7d7ac1fa No idea which recent change has cause this little API change, however it is not a big change and maybe it is even an improvement. 2010-02-02 13:10:50 +00:00
Etienne Kneuss 18f8fa7ba3 Fix tests 2010-02-02 13:08:11 +00:00
Ilia Alshanetsky d5fd93e997 Fixed bug #50907 (X-PHP-Originating-Script adding two new lines in *NIX). 2010-02-02 12:50:21 +00:00
Dmitry Stogov 694a72c5af Fixed bug #50723 (Bug in garbage collector causes crash) 2010-02-02 12:32:29 +00:00
Etienne Kneuss 191b52d272 Remove trailing dots 2010-02-02 04:49:02 +00:00
Pierre Joye a6c3ac1016 - missing patch (update to 0.9.3) 2010-02-01 21:20:07 +00:00
Pierre Joye 3ef47217d7 - update to 0.9.3 2010-02-01 20:56:03 +00:00
Pierre Joye fa197ab9cc - fix test 2010-02-01 19:30:32 +00:00
Pierre Joye a28a91cc0c - fix leak 2010-02-01 18:58:42 +00:00
Andrey Hristov 7b68aab24c Fix second bug in that code, + instead of += thus not increasing
a pointer and mangling data. Again, ext/mysql and ext/mysqli doesn't
have access to this codepath.
2010-02-01 17:12:40 +00:00
Pierre Joye 860e06a8ba - system/version dependent msg 2010-02-01 16:19:27 +00:00
Andrey Hristov befab3e8c3 Fix a bug in mysqlnd where a pointer was not incremented
and thus wrong data was saved MYSQLND_FIELD::db. However, this
wasn't caught because there is no code in mysql/mysqli/pdo_mysql
which reads that field of the structure. The problem was found
during code review.
2010-02-01 16:12:03 +00:00
Pierre Joye 6d913a0272 - oops, wrong one applied, fix build. 2010-02-01 15:31:58 +00:00
Pierre Joye f25710db92 - set errno on failure so that the caller can still rely on strerror (reporting wrong error w/o this change) 2010-02-01 15:22:31 +00:00
Pierre Joye e1cdfbeb1d - fix system/version dependent msg, add skip cases, sync 2010-02-01 15:18:55 +00:00
Pierre Joye d839e3b9a4 - try again to get a crypto context when the key container did not exist (which is likely to be the case, on a 1st call) 2010-02-01 14:56:51 +00:00
Etienne Kneuss cca05f1403 Fix #48667 (Implementing Iterator and IteratorAggregate is now restricted in both orders) 2010-02-01 13:45:57 +00:00
Ilia Alshanetsky b0f76c2534 Fixed bug #50847 (strip_tags() removes all tags greater then 1023 bytes long) 2010-02-01 12:59:08 +00:00
Ulf Wendel 8aa8b6135b Tests related to #50727 2010-02-01 12:18:50 +00:00
Mikko Koppanen 0a445f4f08 Update the libmagic.patch to reflect the current situation. Contains a diff against upstream 5.03 2010-01-31 22:54:00 +00:00
Jani Taskinen d062a02a1c pff 2010-01-31 22:48:09 +00:00
Gwynne Raskind 775659b921 ZEND_EXTERN_MODULE_GLOBALS() is necessary with ZTS, at least on OS X. How confusing. 2010-01-31 20:00:36 +00:00
Ilia Alshanetsky 6616ceaefa Fixed crash in ZTS mode due to ini values not being initialized 2010-01-31 19:18:56 +00:00
Ilia Alshanetsky dff4e7fda1 Fixed a possible open_basedir/safe_mode bypass in session extension identified by Grzegorz Stachowiak. 2010-01-31 18:06:29 +00:00
Rasmus Lerdorf 693eff5dc2 Blah, PDO_DBG_ENABLED is a 0/1 toggle 2010-01-31 17:07:31 +00:00
Rasmus Lerdorf cc4e15ce53 RINIT/RSHUTDOWN do nothing unless PDO_DBG_ENABLED is defined,
so don't waste time calling them on every request.
2010-01-31 16:56:52 +00:00
Pierre Joye 565af741e4 - fix leak 2010-01-31 15:22:17 +00:00
Pierre Joye 5f935b4da5 - fix skip clauses 2010-01-30 21:24:04 +00:00
Pierre Joye 43b31ea3ea - fix test init 2010-01-30 21:12:20 +00:00
Pierre Joye 1bbc4f1721 - fix write access check when write mode only is requested (not RW) 2010-01-30 20:55:01 +00:00
Pierre Joye 891d7ebe1b - cleanup & correct msg 2010-01-30 20:21:16 +00:00
Pierre Joye 88a6d735b1 - this value is platform dependent (unix too) 2010-01-30 20:14:36 +00:00
Pierre Joye ef48a746fd - cs 2010-01-30 17:56:00 +00:00
Pierre Joye 8d9b6f04b4 - fix test, rewrite it (same cases are tested), CS, simplify, be verbose on error not otherwise (avoid infinite loop in pcre_match inside run-test) 2010-01-30 17:06:06 +00:00
Pierre Joye 957a996f16 - fix test 2010-01-28 21:29:00 +00:00
Pierre Joye 61274a0570 - more EOL fixes, don't use expectf 2010-01-28 00:37:20 +00:00
Pierre Joye 81ac81c494 - fix possible EOL conversion on svn co on windows 2010-01-28 00:05:37 +00:00
Pierre Joye 6c2f62c7a2 - skip if not enough permission and add to trunk 2010-01-27 23:54:52 +00:00
Pierre Joye 5d360fa1ce - fix leak 2010-01-27 16:52:36 +00:00
Pierre Joye e130a31441 - don't go through the reparse code when we have a share or DFS path (should fix #50542) 2010-01-27 16:46:43 +00:00
Pierre Joye 84b59b8582 - little comment to avoid undesired changes in this section 2010-01-27 16:44:48 +00:00
Pierre Joye b37f2257a4 - fix leak, win only 2010-01-27 16:43:16 +00:00
Jani Taskinen 0b03122dc0 - Short is enough, people will not understand it anyway. And this is not a TODO, this is what was already done.. 2010-01-27 16:14:53 +00:00
Pierre Joye 79aa615b55 - fix leak when the SID is already used and duplicated 2010-01-27 14:41:06 +00:00
Ilia Alshanetsky eb1dc0babf Fixed bug #50859 (build fails with openssl 1.0 due to md2 deprecation) 2010-01-27 12:55:01 +00:00
Pierre Joye ab91fa848a - update/fix/skip/add for rename tests 2010-01-27 11:23:43 +00:00
Pierre Joye dcd53bdfff - attempt to be more clear 2010-01-27 10:39:23 +00:00
Pierre Joye d58d42a824 - fix and update test according to recent fixes 2010-01-27 10:08:43 +00:00
Pierre Joye f52166739d - fix and update test according to recent fixes 2010-01-27 09:47:17 +00:00
Pierre Joye 4118379bda - update 2010-01-27 08:14:50 +00:00
Pierre Joye bbf9b6dcd3 - #50854, fix build on non windows 2010-01-27 07:48:31 +00:00
Pierre Joye b7aee13069 - removed debug breakpoint and improve inline comment 2010-01-27 02:03:41 +00:00
Pierre Joye 6925763347 - prevent bad things to happen when invalid path are passed to MoveFileEx 2010-01-27 01:18:43 +00:00
Pierre Joye 573c33b3b7 - [DOC] #45986, bad file descriptor warning when rename is used with invalid path, add php_win32_docref2_from_error to display system error for non posix api 2010-01-26 20:04:03 +00:00
Ilia Alshanetsky daa380c0cb Fixed bug #50829 (php.ini directive pdo_mysql.default_socket is ignored) 2010-01-26 13:15:52 +00:00
Nuno Lopes eedb2b6687 Daniel Convissor wants to test ext/date/lib, so enable code coverage data for him 2010-01-25 22:44:07 +00:00
Jani Taskinen 5952473b7a - Fixed bug #50832 (HTTP fopen wrapper does not support passwordless HTTP authentication) 2010-01-25 16:28:13 +00:00
Pierre Joye 5eb4db5e8f - Ensure that stderr output are not buffered, portability for tests 2010-01-25 14:47:19 +00:00
Pierre Joye d0ab70458d - make it work on win, simplify expect using expectf 2010-01-25 13:49:47 +00:00
Andrey Hristov 6407250e70 Fix for bug#50772
mysqli constructor without parameters does not return a working mysqli object
2010-01-25 13:23:32 +00:00
Ilia Alshanetsky db8a6974fb Added test case for bug #44827 2010-01-25 13:08:43 +00:00
Pierre Joye 8b5a46b3cd - disable the non win32 version on win 2010-01-25 09:10:45 +00:00
Pierre Joye 86d5f7fb38 - pls don't add .swp/bak/etc. :) 2010-01-25 09:09:02 +00:00
Pierre Joye 3111aa2638 - ws 2010-01-25 09:01:22 +00:00
Jani Taskinen 00a8cab860 fix entries..can you count to 80? 2010-01-24 18:39:14 +00:00
Pierre Joye f2dafc35ee - today entries 2010-01-24 18:05:36 +00:00
Pierre Joye f5aa7da785 - fix test, dir separator agnostic 2010-01-24 17:57:40 +00:00
Pierre Joye ce14d8cd5b - add win32 version of the test, damned error msg with eol in them 2010-01-24 17:53:10 +00:00
Derick Rethans 1edc6f8666 - Updated to version 2010.1 (./tzdata2010a) 2010-01-24 15:23:14 +00:00
Pierre Joye 1538f246f4 - nl fix 2010-01-24 14:41:47 +00:00
Pierre Joye 06674ee2c0 - \n or \r\n (phpt are text in svn) 2010-01-24 14:38:34 +00:00
Pierre Joye 7617d75d92 - fix tests 2010-01-24 14:18:09 +00:00
Pierre Joye e4065db32b - #50690, putenv does assign value when their length is one char 2010-01-24 13:49:47 +00:00
Pierre Joye f386e268cd - make getservbyname on windows behaves like *nux when proto is an empty string 2010-01-24 13:36:08 +00:00
Pierre Joye 6a7d96eef9 - prevent possible crash when error/warnings are raised during startup (like deprecated features), 5.3+ only 2010-01-24 12:39:31 +00:00
Pierre Joye aafd4f5008 - \n or \r\n as phpt are txt file in svn 2010-01-24 12:27:29 +00:00
Pierre Joye 25fb7ecc2b - skip if proc_nice is not available 2010-01-24 12:05:58 +00:00
Sriram Natarajan 0ea435c6e0 - Fixed bug #50756 (CURLOPT_FTP_SKIP_PASV_IP does not exist.) 2010-01-23 01:37:32 +00:00
Pierre Joye add029adef - fix win build, use bundled stdint 2010-01-21 23:23:17 +00:00
Andrey Hristov d9449d44a2 decrement correctly! 2010-01-21 18:17:19 +00:00
Andrey Hristov 2d7ca03976 Add possibility to restrain the number of levels 2010-01-21 18:12:18 +00:00
Stanislav Malyshev df15e2cde6 fix TS build 2010-01-21 18:07:28 +00:00
Ilia Alshanetsky 50016d9dec Upgraded bundled PCRE to version 8.01 2010-01-21 17:49:38 +00:00
Johannes Schlüter 6dda7add54 Overlong hostnames breakthistest on NIS enabled FreeBSD 2010-01-21 13:30:46 +00:00
Ilia Alshanetsky c0e90d0b8e Added missing INI settings 2010-01-20 13:06:27 +00:00
Takeshi Abe bea0320749 fix libgd FS100 (spurious horizontal line drawn by gdImageFilledPolygon) 2010-01-20 09:39:06 +00:00
Andrey Hristov 6136b785b9 Fix possible lock-ups when a trigger triggers a trigger.
Hanging was possible on the subsequent try to acquire a mutex.
Now it is correctly implemented and if a trigger is being executed
then no other trigger will be fired, on recursive calls.
2010-01-19 15:31:39 +00:00
Jani Taskinen 3d733ce6fa - Fixed bug #50791 (Compile failure: Bad logic in defining fopencookie emulation) 2010-01-19 13:44:08 +00:00
Johannes Schlüter 85fcabf3ce - A few more extern declarations 2010-01-19 13:24:02 +00:00
Ilia Alshanetsky 463506b269 Fixed test 2010-01-19 12:42:50 +00:00
Ilia Alshanetsky 7e79b2684a Upgraded bundled sqlite to version 3.6.22. 2010-01-19 12:38:55 +00:00
Jani Taskinen d9eed26a3d - Add missing skipif 2010-01-19 12:31:29 +00:00
Andrey Hristov ac1a5cd0f7 Make it GCC only feature (tracing). VC7 and up do the work
too and it might be tweaked later.
2010-01-19 12:13:06 +00:00
Jani Taskinen 95a4f5fabe - WS + CS fixes 2010-01-19 12:03:07 +00:00
Andrey Hristov f056cdaa3e fix windows 2010-01-19 11:44:43 +00:00
Johannes Schlüter 00afa7278b - Add extern declarations for fixing the build with some compilers 2010-01-19 10:44:36 +00:00
Ilia Alshanetsky 7e1f29e930 Fixed bug #50787 (stream_set_write_buffer() has no effect on socket streams). 2010-01-18 12:50:08 +00:00
Ilia Alshanetsky ebe5ff73f8 Fixed bug #50761 (system.multiCall crashes in xmlrpc extension). 2010-01-17 17:19:38 +00:00
Hannes Magnusson 6cd6c32d0f Kill very old export of the docs.
Fixes bug#50784
2010-01-17 16:25:20 +00:00
Hannes Magnusson 5ad1508fde These instructions are apparently outdated
# See http://news.php.net/php.windows/29806
2010-01-17 14:22:16 +00:00
Jani Taskinen e421bee7af - Fixed bug #48811 (Directives in PATH section do not get applied to subdirectories) 2010-01-16 21:01:12 +00:00
Rob Richards 915c8778e2 fix bug #49463 (setAttributeNS fails setting default namespace)
add test
2010-01-15 21:29:56 +00:00
Stanislav Malyshev 932e276c0b add filters to mcrypt
# trunk will follow soon
2010-01-15 21:02:20 +00:00
Rasmus Lerdorf 15e31de034 Fix gcc version check - bug #50771 2010-01-15 18:26:53 +00:00
Takeshi Abe e3e76d7baf fix wrong type and useless assignments 2010-01-15 17:09:14 +00:00
Pierre Joye 9583994828 - fix build 2010-01-14 19:44:54 +00:00
Ilia Alshanetsky fae24f9298 Added test for bug #50680 2010-01-14 15:45:49 +00:00
Andrey Hristov beaa4d0430 Fix compiler warning, copy&paste error 2010-01-14 12:31:29 +00:00
Andrey Hristov f551c57cf0 Fix compiler warning 2010-01-14 11:39:18 +00:00
Takeshi Abe f7a3b3f5aa imagepolygon() and imagefilledpolygon() does not allow negative number of points causing invalid allocation 2010-01-14 11:11:56 +00:00
Andrey Hristov fef4bf8a9d remove redefinition of bit_uint8korr 2010-01-14 10:35:28 +00:00
Andrey Hristov 36a037d236 Fix build of mysqli when libmysql is used, mysqlnd_portability.h
might not be available for some weird reasons. Added the macros
that we need, in that case

Code by Jess Portnoy
2010-01-14 09:47:57 +00:00
Andrey Hristov 6a8d4c3287 more PHPAPI for phpize-d builds 2010-01-13 18:07:02 +00:00
Andrey Hristov 4bbdce5ca7 export more functionality for phpize builds 2010-01-13 18:00:41 +00:00
Andrey Hristov 176e6dd2f2 make mysqlnd's tracing API more reusable 2010-01-13 14:06:02 +00:00
Ilia Alshanetsky 6254378830 Fixed bug #50732 (exec() adds single byte twice to $output array). 2010-01-13 13:44:58 +00:00
Takeshi Abe dd17af94c5 removed an unused variable 2010-01-13 06:55:03 +00:00
Frank M. Kromann 1709009f1d Don't free soap_headers just before comparing the length. This causes SoapClient to fail when requesting a URL 2010-01-13 05:32:02 +00:00
Christopher Jones 218eba34ee Bump version in early preparation for release 2010-01-12 19:12:49 +00:00
Ilia Alshanetsky d2e14e3f20 Fixed bug #50728 (All PDOExceptions hardcode 'code' property to 0) 2010-01-12 12:46:54 +00:00
David Soria Parra e3f76cc8c3 Revert commit 292222. It's not needed anymore to specify c99. 2010-01-12 09:28:02 +00:00
Stanislav Malyshev 28e9a01a3e name resource build script resourcebundle.build 2010-01-11 23:46:43 +00:00
Andrey Hristov dc09fa81f5 more typedef cosmetics 2010-01-11 20:18:56 +00:00
Andrey Hristov c4b380a076 remove stale export 2010-01-11 20:12:46 +00:00
Andrey Hristov 2331e28509 cosmetics. typedef-ed types should be in capital case 2010-01-11 20:10:10 +00:00
Andrey Hristov 1a108f1bae remove extern defintion of a variable that is no more
used outside of the file where it is declared.
Also really export with PHPAPI the protocol init/deinit functions
2010-01-11 19:13:43 +00:00
Andrey Hristov 8b3931b444 this function should be exporten in all cases, not only under PHP6 2010-01-11 18:40:11 +00:00
Andrey Hristov d999552ae7 missed to commit in 5_3, here it comes, reusability of stats 2010-01-11 18:31:02 +00:00
David Soria Parra 33fc7d77d7 Fixes #50496. Drop stdbool.h dependency as it requires _STDC_C99 set on some systems. 2010-01-11 16:22:12 +00:00
Andrey Hristov 9b8d026d86 Rework the statistics macros to be reusable by external entities.
Rename handlers to triggers. Dynamically allocate space for the
statistics thus allow reusability.
2010-01-11 14:27:35 +00:00
Andrey Hristov 4a549fbb3d missed to commit to the branch 2010-01-11 12:37:42 +00:00
Dmitry Stogov d2f681cecd Fixed bug #50519 (segfault in garbage collection when using set_error_handler and DomDocument) 2010-01-11 10:07:10 +00:00
Ilia Alshanetsky bf0f58825e Year++ 2010-01-11 03:01:19 +00:00
Pierre Joye 7aacc1ccbc - use png_sig_cmp to support libpng 1.4, old is deprecated already in older version 2010-01-10 02:13:45 +00:00
Andrey Hristov 81695689b9 export some calls to init/deinit code outside of the module 2010-01-08 18:52:08 +00:00
Andrey Hristov d20fdd603b improve the stats subsystem. Reduce the number of macro definitions
in half by smartly introducing 2 new macros. Make MYSQLND::stats a pointer
from being aggregated and add triggers.
2010-01-08 17:35:20 +00:00
Andrey Hristov 3264e51983 add restart_psession and end_psession hooks 2010-01-08 13:47:03 +00:00
Takeshi Abe c18d4364ed Bug #49600 (imageTTFText text shifted right)
- fix difference of horizontal position between imagettftext() and imagettfbbox()
2010-01-08 12:18:52 +00:00
Jani Taskinen b690cb881d fix news 2010-01-08 09:56:38 +00:00
Rasmus Lerdorf 58867bacc1 Worked with Samy Kamkar to improve LCG entropy. 2010-01-08 09:43:14 +00:00
Christopher Jones 679b228391 Bug #47281 ( is limited in size of characters). Also remove redundant code line. 2010-01-07 23:59:20 +00:00
Andrey Hristov 73b23fca37 Change of way the packet objects are created/initialised
If the protocol gets changed, ever, we can decide at runtime
easily which protocol to use by instantiating the right protocol
object. But this is restricted to the structure of the packets, not
the flow.
2010-01-07 19:44:59 +00:00
Ilia Alshanetsky 1ee6c8277f Fixed bug #50680 (strtotime() does not support eighth ordinal number). 2010-01-07 12:54:44 +00:00
Sebastian Bergmann de93d96de4 sed -i "s#1997-2008#1997-2010#g" **/*.c **/*.h 2010-01-07 11:02:39 +00:00
Christopher Jones 5e8e34bac8 Fixed bug #49560 (oci8: using LOBs causes slow PHP shutdown)
- Improved descriptor refcounting to remove unneeded items sooner
 - Replaced n^2 list traversal during descriptor list destruction
2010-01-06 18:58:16 +00:00
Rob Richards bc1feb9034 fix bug #50661 (DOMDocument::loadXML does not allow UTF-16)
add test
2010-01-06 13:13:17 +00:00
Ilia Alshanetsky d5b2007bed Fixed bug #50657 (copy() with an empty (zero-byte) HTTP source succeeds but returns false). 2010-01-06 12:54:53 +00:00
Sebastian Bergmann d2281d1dff sed -i "s#1998-2009#1998-2010#g" **/*.c **/*.h **/*.php 2010-01-05 20:46:53 +00:00
Sebastian Bergmann 3defe76254 sed -i "s#1998-2009#1998-2010#g" **/*.re **/*.y **/*.l 2010-01-05 20:40:23 +00:00
Sriram Natarajan 5d0419e05a - Addressing minor leak noticed while addressing bug #48590 2010-01-05 19:25:23 +00:00
Pierrick Charron c9a85e3a7e Fixed bug #50576 (XML_OPTION_SKIP_TAGSTART option has no effect). 2010-01-05 13:03:40 +00:00
Ilia Alshanetsky 1af7f5bda7 Added test case for bug #50632 2010-01-05 12:25:00 +00:00
Sriram Natarajan 2c8bdf40d0 - Fixed bug #48590 (SoapClient does not honor max_redirects) 2010-01-05 03:07:43 +00:00
Pierre Joye c5c6bc8250 - [doc] add support for DISABLE_AUTHENTICATOR in imap_open (fix #33500) 2010-01-05 01:12:18 +00:00
Stanislav Malyshev 8f4337f255 add ICU resource bundle support, contributed by Hans-Peter Oeri 2010-01-04 21:44:45 +00:00
Ulf Wendel 795f716832 Updating test to new libmysql feature set (first introduced in MySQL 6.0 but now backported to MySQL 5.5). 2010-01-04 15:29:18 +00:00
Ulf Wendel 0004679f8a The internal zval cache has been removed and not been reintroduced... remove corresponding test code 2010-01-04 15:05:34 +00:00
Ulf Wendel bd4c681a42 Fixing test 2010-01-04 14:59:04 +00:00
Ulf Wendel bf9d5991ea Tweaking test. Andrey, you once requested such a test, please have a look if it does exactly what you want it to do. 2010-01-04 14:34:44 +00:00
Ulf Wendel 39e27c9030 The internal zval cache has been removed and not been reintroduced... remove corresponding test code 2010-01-04 13:44:10 +00:00
Ilia Alshanetsky 8543914732 Update copyright year in the man file 2010-01-04 12:38:07 +00:00
Ilia Alshanetsky 299c4c43ed Fixed bug #50632 (filter_input() does not return default value if the variable does not exist) 2010-01-03 22:58:37 +00:00
Pierrick Charron 614fd65795 Fixed bug #50636 (MySQLi_Result sets values before calling constructor) 2010-01-03 16:59:33 +00:00
Sebastian Bergmann 9ba1e81665 sed -i "s#1997-2009#1997-2010#g" **/*.c **/*.h **/*.php 2010-01-03 09:23:27 +00:00
Sebastian Bergmann ebb467ff02 sed -i "s#1997-2009#1997-2010#g" **/*.re **/*.y **/*.l 2010-01-03 08:22:14 +00:00
Ilia Alshanetsky b63f178e97 Fixed bug #44827 (define() allows :: in constant names). 2009-12-30 19:15:11 +00:00
Jani Taskinen 72a9c6d37a - Sync with HEAD 2009-12-29 19:25:09 +00:00
Jani Taskinen 1a64bb9c05 - WS + CS + folding tags 2009-12-29 18:59:58 +00:00
Pierrick Charron eac3e3e4a4 Add a test for tidyNode::__construct() 2009-12-29 16:06:27 +00:00
Ilia Alshanetsky c3230ad217 Fixed bug #48190 (Content-type parameter "boundary" is not case-insensitive in HTTP uploads). 2009-12-29 15:57:54 +00:00
Pierrick Charron 3554a27429 Set the tidyNode constructor private 2009-12-28 17:01:24 +00:00
Derick Rethans ec74871ad4 - Updated to version 2009.21 (2009u) 2009-12-28 14:30:50 +00:00
Andrey Hristov d76fa2b46c move network creation to the init hook 2009-12-28 11:17:10 +00:00
Felipe Pena 0d5a318090 - Fixed ZTS build 2009-12-27 18:13:37 +00:00
Mikko Koppanen 29b7cd5dcf Share the php_sockets.h header
Share php_sockets_le_socket_name
2009-12-27 01:00:50 +00:00
Mikko Koppanen 1e6695feb7 spprintf the dbname
use VCWD_ACCESS instead of access
2009-12-27 00:43:33 +00:00
Rasmus Lerdorf e9b1ab57a4 Along with the valid char set, also add a length check to the
session id here to avoid a lower-level error on the open() 
later on in case we exceed MAX_PATH.  The lower level open()
error includes the session dir path in it, so this is a very
low-priority security fix.  People should not be running
production systems with display_errors turned on.
2009-12-26 23:38:25 +00:00
Mikko Koppanen 1496161f01 Upgrade bundled libmagic to 5.03 (fixes CDF parsing related issues)
Clean up / remove whitespace differences to make next merge easier
Removed unnecessary files from trunk
2009-12-26 15:00:21 +00:00
Pierrick Charron 832eb472c5 Changed tidyNode class to disallow manual node creation. 2009-12-25 21:24:36 +00:00
Matteo Beccati 166b3ef63d Removed spurious high-ascii char from previous commmit 2009-12-25 21:01:06 +00:00
Matteo Beccati 09587d3cbf - Updated ext/pgsql tests to work w/ PostgreSQL 8.5
# tested w/ 8.5alpha3
2009-12-25 20:56:00 +00:00
Antony Dovgal 42d05a5c02 remove automatic file unlocking on shutdown and/or stream close
(make it win32-specific for 5_2, as discussed with Ilia)
2009-12-25 20:34:59 +00:00
Matteo Beccati 9326c7e3a2 - Updated pdo_pgsql tests to be 8.5+ friendly 2009-12-25 20:11:07 +00:00
Dmitry Stogov db8e4a089c Fixed bug #50519 (segfault in garbage collection when using set_error_handler and DomDocument) 2009-12-25 13:11:18 +00:00
Pierrick Charron 3cc801b9b0 Fixed bug #50558 (Broken object model when extending tidy) 2009-12-25 01:35:57 +00:00
Ilia Alshanetsky c2296af6a6 Added missing host validation for HTTP urls inside FILTER_VALIDATE_URL. 2009-12-24 18:47:15 +00:00
Mikko Koppanen 207d9133ca Changed stream_resolve_include_path to use zend_resolve_path
backported stream_resolve_include_path to PHP 5.3
backported stream_resolve_include_path test to PHP 5.3
2009-12-24 13:12:03 +00:00
Antony Dovgal 0b8839cd4a fix the fix for #47409
use correct comparison and add missing scope checks to trunk
2009-12-24 13:07:33 +00:00
Sriram Natarajan d55669c6ab - Update tests to reflect current behavior after fix for bug #50185 2009-12-24 02:08:23 +00:00
Stanislav Malyshev b9acd57000 fix flags handling in zend_parse_method_parameters_ex 2009-12-24 00:15:13 +00:00
Stanislav Malyshev 882a89fb22 cleanup some code, improve error handling 2009-12-23 21:41:05 +00:00
Jani Taskinen f0c1cd512f - ws 2009-12-23 21:06:26 +00:00
Jani Taskinen 34dd94b483 I really like the extra space. 2009-12-23 21:02:12 +00:00
Ilia Alshanetsky 12f82ee144 Fixed bug #47409 (extract() problem with array containing word "this"). 2009-12-23 16:33:58 +00:00
Andrey Hristov 01adfaee5f Unify. The typedef-ed structs in mysqlnd are always capitalized. 2009-12-23 11:58:45 +00:00
Antony Dovgal 6a9d78f102 fix minor leak in CGI sapi (happened once per child) 2009-12-23 09:40:28 +00:00
Johannes Schlüter 31deb65a9d Where using svn now, use svn paths
# This file doesn't exist in 5.2!?
2009-12-22 22:36:41 +00:00
Johannes Schlüter d046bf5d8e PHP 5.3.2RC1 2009-12-22 22:02:50 +00:00
Johannes Schlüter 5927cec714 Wrap at 80 chars 2009-12-22 21:17:58 +00:00
Johannes Schlüter c764995c8e install mysqlnd headers to allow shared build of extensions 2009-12-22 19:30:09 +00:00
Andrey Hristov c95fa280ed Fix double calls to free_contents if the connection cannot be
opened. mysqlnd have no probs, external code should not have too.
In any case, double call is not needed.
2009-12-22 17:44:42 +00:00
Andrey Hristov e1251edc16 move state setting to the right place, in mysqlnd_init, no more
in mysqlnd::connect
2009-12-22 17:31:31 +00:00
Pierre Joye 9309f2bf64 - fix build and warning (introduced by my last commit) 2009-12-22 14:57:57 +00:00
Jani Taskinen 294401cfa0 - Fixed bug #50517 (EXTRA_LDFLAGS polluted by wrong entries)
# Until someone shows me use case for LDFLAGS, this is gone.
# This was wrong place to import it anyway.
2009-12-22 09:57:19 +00:00
Moriyoshi Koizumi 7d9a7dbad6 - Fix bug #46478 (htmlentities() uses obsolete mapping table for character
entity references)
2009-12-22 05:50:34 +00:00
Ilia Alshanetsky 800519fcbb Fixed bug #45599 (strip_tags() truncates rest of string with invalid attribute). 2009-12-22 02:04:12 +00:00
Derick Rethans bfa1c91d9b - Updated to version 2009.20 (2009t) 2009-12-21 20:46:12 +00:00
Sriram Natarajan 20cd29d0a2 Fixed bug #50540 (Crash within ldap_first_reference function) 2009-12-21 20:39:48 +00:00
Stanislav Malyshev baaec77e78 clean up normalizer code 2009-12-21 20:12:46 +00:00
Andrey Hristov 41ac91aecf Move this function to MYSQLND_NET as it works on the
php stream
2009-12-21 16:52:10 +00:00
Andrey Hristov ce349e3540 magic numbers to macros 2009-12-21 16:17:31 +00:00
Andrey Hristov b4477669b4 Move compression and decompression code to separate functions
which can be overloaded on purpose.
2009-12-21 16:09:13 +00:00
Jani Taskinen 4bba459d8f - Sync (and KEEP it synced!) 2009-12-21 15:44:58 +00:00
Jani Taskinen d0a956c2b7 - Tune the fix for bug #50508 and make it work with MacOSX, bug #50541. 2009-12-21 15:22:40 +00:00
Felipe Pena e83e52eba1 - New tests 2009-12-20 22:04:55 +00:00
Stanislav Malyshev ae70213177 Fixed bug #50196 stream_copy_to_stream() produces warning when source is not file 2009-12-19 01:15:30 +00:00
Stanislav Malyshev 0401c6ca2d fix bug #50196 2009-12-19 01:13:33 +00:00
Stanislav Malyshev e665b0955a Fixed bug #50394 (Reference argument converted to value in __call) 2009-12-18 19:20:33 +00:00
Stanislav Malyshev fc1e17ee76 fix regression bug #50394: Reference argument converted to value in __call 2009-12-18 19:12:11 +00:00
Jani Taskinen b7608c91e4 touch 2009-12-18 12:48:59 +00:00
Jani Taskinen 52f83608d8 - Fixed bug #50508 (compile fails: Conflicting HEADER type declarations)
# NEVER ever include nameser_compat.h, it's included in various ways in different OSes by nameser.h if needed
2009-12-18 11:02:07 +00:00
Pierre Joye dea1d412e1 - [DOC] add INTERNALDATE to imap_append (will merge to trunk later) 2009-12-17 17:28:26 +00:00
Jani Taskinen 215dd9d02c - These are 2 separate sections.. 2009-12-17 16:10:53 +00:00
Ulf Wendel e2a2205a58 Test for what Andrey has found with 16M packets 2009-12-17 14:15:28 +00:00
Andrey Hristov 028bd4ba02 refactoring : move more network related functions to
mysqlnd_net.c . Now communication is split on two levels:
- logical (functions send and receive)
- physical (functions network_read and network_write)
2009-12-17 13:29:46 +00:00
Andrey Hristov 22528b14a4 During refactoring of the function mysqlnd_stream_write_w_header() it was
found that there is a bug in the way the data is sent, although a very rare
one which will only affect very large queries which have length 16777214. The
communication will hang. A way to test it is to execute the following:
./php -r '$c=mysqli_connect("127.0.0.1","root","root","test");
$q="insert into test.tblob values(\"".str_repeat("a",256*256*256-1-34)."\")";
$c->query($q);'
2009-12-17 12:30:58 +00:00
Sriram Natarajan 4e06ca007f - Fix NEWS for bug #50496
# Update NEWS to keep resolved bugs in decreasing order (Christopher Jones)
2009-12-16 21:33:20 +00:00
Sriram Natarajan cbc6619fe3 - Fixed bug #50496 (Use of <stdbool.h> is valid only in a c99 compilation environment.) 2009-12-16 20:49:08 +00:00
Andrey Hristov d233b0b2af call free_contents in every case, in case something is not freed
by the calling code
2009-12-16 14:38:30 +00:00
Andrey Hristov a1ef2d9fb3 Remove unneeded dereferences
(oops, committed the trunk changes from a wrong directory, which splitted
this commit).
2009-12-16 14:06:09 +00:00
Andrey Hristov b3546d1b5e move MYSQLND_NET code to a separate file.
mysqlnd_wireprotocol is about the protocol not the transport
layer
2009-12-16 12:59:38 +00:00
Pierre Joye 6ec6a9d62e - add a test case and update the skip clause 2009-12-16 10:09:34 +00:00
Andrey Hristov 5e1c95fda4 remove duplicated code 2009-12-15 17:39:30 +00:00
Andrey Hristov c101f7f542 Move code out of mysqlnd_conn::connect to mysqlnd_net::connect.
Thus mysqlnd_conn::connect() does less of what it should not do - think
about the transport level.
2009-12-15 17:33:06 +00:00
Andrey Hristov 70690e1163 remove C++ comments 2009-12-15 14:48:24 +00:00
Andrey Hristov 523471f7e8 export this function 2009-12-15 14:26:24 +00:00
Andrey Hristov 0371ef1070 refactor: move code that belongs to MYSQLND_NET out of MYSQLND 2009-12-15 13:13:51 +00:00
Ilia Alshanetsky d0f6848e66 Fixed bu #50392 (date_create_from_format() enforces 6 digits for 'u' format character) 2009-12-15 12:34:12 +00:00
Jani Taskinen 4e10081f8f - Make $sbindir be usable in C code as well (like $bindir and co.) 2009-12-15 11:17:47 +00:00
Jani Taskinen def4e7c0e6 - Allow using $sbindir as well 2009-12-15 10:55:27 +00:00
Felipe Pena c00a91a024 - Added SKIPIF 2009-12-15 00:37:43 +00:00
Felipe Pena 286f36e702 - Fixed memory leak when E_STRICT message is getted 2009-12-14 21:44:56 +00:00
Jani Taskinen 9f210d53cc - Fix test 2009-12-14 09:42:55 +00:00
Jani Taskinen 16dbf3060b - Fix test 2009-12-14 09:26:49 +00:00
Pierrick Charron c2fccc1606 - Fixed bug #50469 (Fixed typo in imagepsencodefont error string). 2009-12-14 04:09:18 +00:00
Pierrick Charron 7d4643193d - Fixed bug #50458 (PDO::FETCH_FUNC fails with Closures) 2009-12-14 03:44:33 +00:00
Felipe Pena 35ad330849 - Improved the bug#49174 entry summary 2009-12-13 20:51:15 +00:00
Felipe Pena 85f96a8132 - Completing the phrase 2009-12-13 20:04:44 +00:00
Felipe Pena 93a406ac9c - Fixed bug #49174 (crash on queryString set) 2009-12-13 19:53:44 +00:00
Felipe Pena 4411621217 - Fixed bug #50209 (Compiling with libedit cannot find readline.h)
(patch by tcallawa at redhat dot com)
2009-12-13 17:06:47 +00:00
Felipe Pena eb3eea2669 - Fixed tests for when running using libedit 2009-12-13 16:53:24 +00:00
Ilia Alshanetsky d56c1fdf14 Fixed bug #50451 (http wrapper breaks on 2048 char long headers)
# Improvement on the fix for bug #49851
2009-12-13 15:44:22 +00:00
Felipe Pena 81ad353ec2 - Fixed bug #50464 (declare encoding doesn't work with)
# The bug (BC) only happens in this branch.
2009-12-13 15:18:58 +00:00
Felipe Pena 5eae703705 - Fixed bug #50445 (PDO-ODBC stored procedure call from Solaris 64-bit causes seg fault).
(Original patch by davbrown4 at yahoo dot com)
2009-12-11 22:30:46 +00:00
Pierre Joye af206a90ae - fix build, come on, it is not that hard to test before commit, is it? 2009-12-11 16:35:42 +00:00
Pierre Joye a2cf15fcc6 - #50334, add sha support for VC6 too, not merged in trunk as we don't support vc6 there 2009-12-11 16:07:57 +00:00
Pierre Joye 560ed89bfb - #50334, use our own implementations of stpncpy and mempcy, avoiding weird behaviors on certain platforms like solaris 2009-12-11 15:57:01 +00:00
Jani Taskinen b9ac76c51c - Fix test 2009-12-11 15:38:15 +00:00
Jani Taskinen 70a2b56337 fix test 2009-12-11 15:06:50 +00:00
Andrey Hristov 13c8bba00a Make MYSQLND_NET dynamically allocated structure with allocator
and deallocator. More member functions will come.
2009-12-11 11:58:57 +00:00
Jani Taskinen 35a4d5831b Fix test 2009-12-11 10:55:56 +00:00
Andrey Hristov a9295f0343 remove stale comment 2009-12-11 10:21:34 +00:00
Andrey Hristov 0c7a9b8010 Move two functions which are used in the extension as methods of
the connection. Two functions less in the global namespace.
2009-12-11 10:18:00 +00:00
Jani Taskinen 03a47e9b03 - Fix problem with SKIPIF failing to skip in some cases (deprecated warnings f.e.) 2009-12-11 07:34:06 +00:00
Christopher Jones 1aebd220f8 Add new 'fetch' test and make several small test fixes 2009-12-10 19:07:08 +00:00
Christopher Jones e435285b39 Remove text recently merged to online doc 2009-12-10 17:28:19 +00:00
Pierre Joye f59f7a3f49 - #50334, add define on win as well 2009-12-10 14:08:19 +00:00
Andrey Hristov a633de0020 bump version number 2009-12-10 11:59:14 +00:00
Andrey Hristov 00d76a8445 Add plugin storage for MYSQLND_STMT too 2009-12-10 11:18:05 +00:00
Andrey Hristov c8c250df80 Fix pdo build, forgot to remove the zval caching from pdo-mysql 2009-12-10 09:35:10 +00:00
Jani Taskinen 01eae78ec3 - not needed anymore 2009-12-10 09:23:06 +00:00
Jani Taskinen 5e7fddab93 - Fix test mess (testing the deprecated ini option is pointless when using the func does same thing) 2009-12-10 09:22:54 +00:00
Ilia Alshanetsky 47b3371122 Fixed bug #49851 (http wrapper breaks on 1024 char long headers). 2009-12-10 03:23:05 +00:00
Pierre Joye 7179910573 - [DOC] expose MPIR version when mpir is used instead of gmp 2009-12-10 02:25:47 +00:00
Andrey Hristov 06a417b6a9 Remove stub code which never actually was used for anything.
Things like this can be built on top of the core.
2009-12-09 20:38:11 +00:00
Andrey Hristov 6f598e62ff Remove the zval caching from mysqlnd. It was disabled versions ago
due to problems on windows, which were not debugged. Better have 
code that is disabled not in the core.
2009-12-09 20:21:05 +00:00
Andrey Hristov d8a8d823ce Fix compilation warnings 2009-12-09 18:11:03 +00:00
Pierre Joye 8d58b31495 - #50334, fix build for platform without endian.h (like solaris) 2009-12-09 17:40:19 +00:00
Andrey Hristov 4d2735007d Remove disabled code - threaded fetching. This can be implemented
on a upper level and by offloading it we reduce the complexity of
the core.
2009-12-09 16:57:03 +00:00
Jani Taskinen 64fb1fca1f - Add one test from HEAD 2009-12-09 13:25:10 +00:00
Ulf Wendel 671ebe958a Adapting tests to accept actual behaviour found in 5.2, 5.3 and 6.0. The behaviour is wrong according to the documentation: mysqli_connect_error() should return an empty string (not NULL), if there is no error. However, changing this would break BC and most users will not notice the difference between NULL and empty string anyway. 2009-12-09 12:06:10 +00:00
Pierre Joye bf377f6aab - #50334, add missing file 2009-12-09 10:39:03 +00:00
Jani Taskinen 6dff9d7632 FIFO 2009-12-09 10:15:34 +00:00
Pierre Joye 77afccc28c - #50334, add CRYPT_SHA* constants and tests [DOC] 2009-12-09 01:43:23 +00:00
Pierre Joye 6a9f96f267 - update 2009-12-09 00:35:30 +00:00
Pierre Joye 2e6c08b289 - drop non used code and fix warning 2009-12-09 00:32:14 +00:00
Pierre Joye 9001b4036a - #50334, crypt ignores sha512 and add support for sha256/512 to php's crypt [DOC] 2009-12-09 00:20:14 +00:00
William Martin d06e06007a Backported 5.3 tests to 5.2 and added more RecursiveIteratorIterator tests 2009-12-08 19:51:56 +00:00
Jani Taskinen c4819e9ff3 MFH: static before const 2009-12-08 17:30:22 +00:00
Ilia Alshanetsky 752b9fde5a Upgraded to Sqlite 3.6.21 2009-12-08 13:24:27 +00:00
Dmitry Stogov 76c445dd73 - Forgotten patch for trunk
- Fixed stdin filename in error messages
2009-12-08 10:16:38 +00:00
Jani Taskinen 0e218d3512 FIFO 2009-12-08 06:19:56 +00:00
Felipe Pena a94558c855 - Added MAKE_COPY_ZVAL(ppzv, pzv) macro 2009-12-08 01:57:37 +00:00
Stanislav Malyshev a9044795da ouch, that ZTS 2009-12-08 01:57:16 +00:00
Stanislav Malyshev 327cf380e8 win32 should have different test 2009-12-08 01:52:57 +00:00
Felipe Pena da22aa9aad - Fixed ZTS build 2009-12-08 01:51:34 +00:00
Stanislav Malyshev 90df6f2ca2 add "no params" check 2009-12-08 01:44:15 +00:00
Stanislav Malyshev 7beb1af8de add realpath cache inspect functions 2009-12-08 01:35:08 +00:00
Moriyoshi Koizumi 413196c574 - Take account of surrogate pairs. 2009-12-07 15:41:43 +00:00
Ilia Alshanetsky 2be6de0a50 Added FILTER_FLAG_STRIP_BACKTICK option to the filter extension. 2009-12-07 13:43:44 +00:00
Dmitry Stogov 6ab5f53d52 Fixed bug #49866 (Making reference on string offsets crashes PHP) 2009-12-07 08:47:18 +00:00
Dmitry Stogov 7a96fdff4c Fixed bug #50351 (performance regression handling objects, ten times slower in 5.3 than in 5.2. foreach statement should not initiate GC) 2009-12-07 08:14:48 +00:00
Jani Taskinen 4963d99213 - Fix NEWS 2009-12-07 07:30:41 +00:00
Pierrick Charron 99ba48dc60 Fixed bug #50323 (Allow use of ; in values via ;; in PDO DSN even in the middle of a string). 2009-12-06 21:32:58 +00:00
Ilia Alshanetsky bf550fe8da Fixed bug #50323 (Allow use of ; in values via ;; in PDO DSN). 2009-12-06 19:34:12 +00:00
Felipe Pena 30188d3c58 - Fixed bug #50162 (Memory leak when fetching timestamp column from Oracle database)
- Fixed bug #34852 (Failure in odbc_exec() using oracle-supplied odbc driver) (patch by tim dot tassonis at trivadis dot com)
2009-12-06 18:53:16 +00:00
Sriram Natarajan 77895623dc BFN 2009-12-06 16:43:46 +00:00
Felipe Pena 8afad00a16 - Fixed tests 2009-12-04 11:32:39 +00:00
Dmitry Stogov 5ab649e65f Fixed compilation 2009-12-04 07:11:37 +00:00
Stanislav Malyshev 3e6ac4fb6b protect http_session_vars from interrupt corruption
improve save_path check
2009-12-04 01:21:32 +00:00
Jani Taskinen 1f8638b1f1 bfn 2009-12-03 22:24:04 +00:00
Rob Richards 3fa1ea9731 fix bug #47848 (importNode doesn't preserve attribute namespaces)
add tests
2009-12-03 20:19:38 +00:00
Pierrick Charron e2efe4bc7b Fixed bug #45120 (PDOStatement->execute() returns true then false for same statement). 2009-12-03 15:24:43 +00:00
Felipe Pena 7914d298b4 - Fixed bug #49472 (Constants defined in Interfaces can be overridden) 2009-12-03 12:34:50 +00:00
Kalle Sommer Nielsen 1063c8346b MFT: VC10 build support 2009-12-03 11:50:32 +00:00
Andrey Hristov 0f0f5f229b I svn-commit.2.tmp (Modified) Row 2 Col 28 11:45 Ctrl-K H for help
fix compilation on windows and with other compilers who
don't like void* arithmetic
2009-12-03 10:50:02 +00:00
Pierre Joye 2386938aea - disable this debug code until it is actually fixed 2009-12-03 10:41:20 +00:00
Andrey Hristov bfc0ec1891 fix segfault introduced by Pierre in a recent commit
old code was doing something like
conn + sizeof(MYSQLND) * MYSQLND + plugin * sizeof(void) * sizeof(MYSQLND)
because `conn` is not casted to void*. `conn` has to be casted to void * and
then the whole experession will be void * and the calculations will work.
2009-12-03 09:43:26 +00:00
Jani Taskinen 28d53f8752 the order 2009-12-03 08:21:28 +00:00
Ilia Alshanetsky 6f3532a266 BFN 2009-12-03 00:11:58 +00:00
Gwynne Raskind ea03ad31b7 One change in trying to update Autoconf was missed. This makes phpize work again. 2009-12-02 17:42:58 +00:00
1598 changed files with 71001 additions and 47622 deletions

No files matched your search

+6
View File
@@ -73,6 +73,12 @@ PRIMARY MAINTAINER: Edin Kadribasic <edink@php.net>
MAINTENANCE: Maintained
STATUS: Working
-------------------------------------------------------------------------------
EXTENSION: fpm
PRIMARY MAINTAINER: Antony Dovgal <tony2001@php.net>, Jerome Loyet <fat@php.net>
MAINTENANCE: Maintained
STATUS: Working
SINCE: 5.3.3
-------------------------------------------------------------------------------
EXTENSION: isapi
MAINTENANCE: Unknown
STATUS: Working
+4 -19
View File
@@ -5,24 +5,7 @@
lcov: lcov-html
lcov-test: all
@echo "Running test suite"
@find . -name \*.gcda -o -name \*.da -o -name \*.bbg? | xargs rm -f
-@if test ! -z "$(PHP_EXECUTABLE)" && test -x "$(PHP_EXECUTABLE)"; then \
NO_INTERACTION=1 \
TEST_PHP_EXECUTABLE=$(PHP_EXECUTABLE) \
TEST_PHP_SRCDIR=$(top_srcdir) \
CC="$(CC)" \
$(PHP_EXECUTABLE) -d 'open_basedir=' -d 'safe_mode=0' -d 'output_buffering=0' -d 'memory_limit=-1' $(top_srcdir)/run-tests.php -d 'extension_dir=modules/' -d `( . $(PHP_MODULES) ; echo extension=$$dlname)` tests/; \
elif test ! -z "$(SAPI_CLI_PATH)" && test -x "$(SAPI_CLI_PATH)"; then \
NO_INTERACTION=1 \
TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \
TEST_PHP_SRCDIR=$(top_srcdir) \
CC="$(CC)" \
$(top_builddir)/$(SAPI_CLI_PATH) -d 'open_basedir=' -d 'safe_mode=0' -d 'output_buffering=0' -d 'memory_limit=-1' $(top_srcdir)/run-tests.php $(TESTS); \
else \
echo "ERROR: Cannot run tests without CLI sapi."; \
fi
lcov-test: lcov-clean-data test
php_lcov.info: lcov-test
@echo "Generating data for $@"
@@ -61,7 +44,7 @@ php_lcov.info: lcov-test
test -f "$$x.bb" && cp $$x.bb lcov_data/$$y.bb ; \
test -f "$$x.bbg" && cp $$x.bbg lcov_data/$$y.bbg ; \
done
for dir in ext/bcmath/libbcmath ext/date/lib ext/fileinfo/libmagic ext/gd/libgd ext/mbstring/libmbfl ext/mbstring/oniguruma ext/pcre/pcrelib ext/pdo_sqlite/libsqlite ext/sqlite/libsqlite ext/sqlite3/libsqlite ext/xmlrpc/libxmlrpc ext/zip/lib; do \
for dir in ext/bcmath/libbcmath ext/fileinfo/libmagic ext/gd/libgd ext/mbstring/libmbfl ext/mbstring/oniguruma ext/pcre/pcrelib ext/pdo_sqlite/libsqlite ext/sqlite/libsqlite ext/sqlite3/libsqlite ext/xmlrpc/libxmlrpc ext/zip/lib; do \
test -d lcov_data/$$dir && rm -rf lcov_data/$$dir ; \
done
@echo
@@ -77,3 +60,5 @@ lcov-clean:
rm -rf lcov_data/
rm -rf lcov_html/
lcov-clean-data:
@find . -name \*.gcda -o -name \*.da -o -name \*.bbg? | xargs rm -f
+414 -3
View File
@@ -1,14 +1,308 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? 20??, PHP 5.3.2
- Upgraded bundled sqlite to version 3.6.20. (Ilia)
01 Jul 2010, PHP 5.3.3 RC2
- Fixed SplObjectStorage unserialization problems (CVE-2010-2225). (Stas)
- Implemented FR #51295 (SQLite3::busyTimeout not existing). (Mark)
- Fixed the mail.log ini setting when no filename was given. (Johannes)
- Fixed bug #52193 (converting closure to array yields empty array). (Felipe)
- Fixed bug #52183 (Reflectionfunction reports invalid number of arguments for
function aliases). (Felipe)
- Fixed bug #52162 (custom request header variables with numbers are removed).
(Sriram Natarajan)
- Fixed bug #52160 (Invalid E_STRICT redefined constructor error). (Felipe)
- Fixed bug #52138 (Constants are parsed into the ini file for section names).
(Felipe)
- Fixed bug #52115 (mysqli_result::fetch_all returns null, not an empty array).
(Andrey)
- Fixed bug #48930 (__COMPILER_HALT_OFFSET__ incorrect in PHP >= 5.3). (Felipe)
- Fixed bug #33210 (getimagesize() fails to detect width/height on certain
JPEGs). (Ilia)
17 Jun 2010, PHP 5.3.3 RC1
- Upgraded bundled sqlite to version 3.6.23.1. (Ilia)
- Upgraded bundled PCRE to version 8.02. (Ilia)
- Added support for JSON_NUMERIC_CHECK option in json_encode() that converts
numeric strings to integers. (Ilia)
- Added stream_set_read_buffer, allows to set the buffer for read operation.
(Pierre)
- Added stream filter support to mcrypt extension (ported from
mcrypt_filter). (Stas)
- Added full_special_chars filter to ext/filter. (Rasmus)
- Added backlog socket context option for stream_socket_server(). (Mike)
- Added fifth parameter to openssl_encrypt()/openssl_decrypt()
(string $iv) to use non-NULL IV.
Made implicit use of NULL IV a warning. (Sara)
- Added openssl_cipher_iv_length(). (Sara)
- Added FastCGI Process Manager (FPM) SAPI. (Tony)
- Added recent Windows versions to php_uname and fix undefined windows
version support. (Pierre)
- Added Berkeley DB 5 support to the DBA extension. (Johannes, Chris Jones)
- Added support for copy to/from array/file for pdo_pgsql extension.
(Denis Gasparin, Ilia)
- Added inTransaction() method to PDO, with specialized support for Postgres.
(Ilia, Denis Gasparin)
- Changed namespaced classes so that the ctor can only be named
__construct now. (Stas)
- Reset error state in PDO::beginTransaction() reset error state. (Ilia)
- Implemented FR#35638 (Adding udate to imap_fetch_overview results).
(Charles_Duffy at dell dot com )
- Fixed possible buffer overflows in mysqlnd_list_fields, mysqlnd_change_user.
(Andrey)
- Fixed possible buffer overflows when handling error packets in mysqlnd.
Reported by Stefan Esser. (Andrey)
- Fixed very rare memory leak in mysqlnd, when binding thousands of columns.
(Andrey)
- Fixed a crash when calling an inexistent method of a class that inherits
PDOStatement if instantiated directly instead of doing by the PDO methods.
(Felipe)
- Fixed memory leak on error in mcrypt_create_iv on Windows. (Pierre)
- Fixed a possible crash because of recursive GC invocation. (Dmitry)
- Fixed a possible resource destruction issues in shm_put_var().
Reported by Stefan Esser. (Dmitry)
- Fixed a possible information leak because of interruption of XOR operator.
Reported by Stefan Esser. (Dmitry)
- Fixed a possible memory corruption because of unexpected call-time pass by
refernce and following memory clobbering through callbacks.
Reported by Stefan Esser. (Dmitry)
- Fixed a possible memory corruption in ArrayObject::uasort(). Reported by
Stefan Esser. (Dmitry)
- Fixed a possible memory corruption in parse_str(). Reported by Stefan Esser.
(Dmitry)
- Fixed a possible memory corruption in pack(). Reported by Stefan Esser.
(Dmitry)
- Fixed a possible memory corruption in substr_replace(). Reported by Stefan
Esser. (Dmitry)
- Fixed a possible memory corruption in addcslashes(). Reported by Stefan
Esser. (Dmitry)
- Fixed a possible stack exhaustion inside fnmatch(). Reported by Stefan
Esser. (Ilia)
- Fixed a possible dechunking filter buffer overflow. Reported by Stefan Esser.
(Pierre)
- Fixed a possible arbitrary memory access inside sqlite extension. Reported
by Mateusz Kocielski. (Ilia)
- Fixed string format validation inside phar extension. Reported by Stefan
Esser. (Ilia)
- Fixed handling of session variable serialization on certain prefix
characters. Reported by Stefan Esser. (Ilia)
- Fixed a NULL pointer dereference when processing invalid XML-RPC
requests (Fixes CVE-2010-0397, bug #51288). (Raphael Geissert)
- Fixed 64-bit integer overflow in mhash_keygen_s2k(). (Clément LECIGNE, Stas)
- Fixed bug #45808 (stream_socket_enable_crypto() blocks and eats CPU).
(vincent at optilian dot com)
- Fixed bug #52101 (dns_get_record() garbage in 'ipv6' field on Windows).
(Pierre)
- Fixed bug #52082 (character_set_client & character_set_connection reset after
mysqli_change_user()). (Andrey)
- Fixed bug #52043 (GD doesn't recognize latest libJPEG versions).
(php at group dot apple dot com, Pierre)
- Fixed bug #52041 (Memory leak when writing on uninitialized variable returned
from function). (Dmitry)
- Fixed bug #52060 (Memory leak when passing a closure to method_exists()).
(Felipe)
- Fixed bug #52057 (ReflectionClass fails on Closure class). (Felipe)
- Fixed bug #52051 (handling of case sensitivity of old-style constructors
changed in 5.3+). (Felipe)
- Fixed bug #52019 (make lcov doesn't support TESTS variable anymore). (Patrick)
- Fixed bug #52010 (open_basedir restrictions mismatch on vacuum command).
(Ilia)
- Fixed bug #52001 (Memory allocation problems after using variable variables).
(Dmitry)
- Fixed bug #51991 (spl_autoload and *nix support with namespace). (Felipe)
- Fixed bug #51911 (ReflectionParameter::getDefaultValue() memory leaks with
constant array). (Felipe)
- Fixed bug #51905 (ReflectionParameter fails if default value is an array
with an access to self::). (Felipe)
- Fixed bug #51899 (Parse error in parse_ini_file() function when empy value
followed by no newline). (Felipe)
- Fixed bug #51844 (checkdnsrr does not support types other than MX). (Pierre)
- Fixed bug #51827 (Bad warning when register_shutdown_function called with
wrong num of parameters). (Felipe)
- Fixed bug #51822 (Segfault with strange __destruct() for static class
variables). (Dmitry)
- Fixed bug #51791 (constant() aborts execution when fail to check undefined
constant). (Felipe)
- Fixed bug #51732 (Fileinfo __construct or open does not work with NULL).
(Pierre)
- Fixed bug #51725 (xmlrpc_get_type() returns true on invalid dates). (Mike)
- Fixed bug #51723 (Content-length header is limited to 32bit integer with
Apache2 on Windows). (Pierre)
- Fixed bug #51721 (mark DOMNodeList and DOMNamedNodeMap as Traversable).
(David Zuelke)
- Fixed bug #51712 (Test mysql_mysqlnd_read_timeout_long must fail on MySQL4).
(Andrey)
- Fixed bug #51690 (Phar::setStub looks for case-sensitive
__HALT_COMPILER()). (Ilia)
- Fixed bug #51688 (ini per dir crashes when invalid document root are given).
(Pierre)
- Fixed bug #51671 (imagefill does not work correctly for small images).
(Pierre)
- Fixed bug #51670 (getColumnMeta causes segfault when re-executing query
after calling nextRowset). (Pierrick)
- Fixed bug #51647 Certificate file without private key (pk in another file)
doesn't work. (Andrey)
- Fixed bug #51629 (CURLOPT_FOLLOWLOCATION error message is misleading).
(Pierre)
- Fixed bug #51627 (script path not correctly evaluated).
(russell dot tempero at rightnow dot com)
- Fixed bug #51624 (Crash when calling mysqli_options()). (Felipe)
- Fixed bug #51615 (PHP crash with wrong HTML in SimpleXML). (Felipe)
- Fixed bug #51609 (pg_copy_to: Invalid results when using fourth parameter).
(Felipe)
- Fixed bug #51608 (pg_copy_to: WARNING: nonstandard use of \\ in a string
literal). (cbandy at jbandy dot com)
- Fixed bug #51607 (pg_copy_from does not allow schema in the tablename
argument). (cbandy at jbandy dot com)
- Fixed bug #51605 (Mysqli - zombie links). (Andrey)
- Fixed bug #51604 (newline in end of header is shown in start of message).
(Daniel Egeberg)
- Fixed bug #51590 (JSON_ERROR_UTF8 is undefined). (Felipe)
- Fixed bug #51582 (Don't assume UINT64_C it's ever available).
(reidrac at usebox dot net, Pierre)
- Fixed bug #51577 (Uninitialized memory reference with oci_bind_array_by_name)
(Oracle Corp.)
- Fixed bug #51562 (query timeout in mssql can not be changed per query).
(ejsmont dot artur at gmail dot com)
- Fixed bug #51552 (debug_backtrace() causes segmentation fault and/or memory
issues). (Dmitry)
- Fixed bug #51445 (var_dump() invalid/slow *RECURSION* detection). (Felipe)
- Fixed bug #51435 (Missing ifdefs / logic bug in crypt code cause compile
errors). (Felipe)
- Fixed bug #51424 (crypt() function hangs after 3rd call). (Pierre, Sriram)
- Fixed bug #51394 (Error line reported incorrectly if error handler throws an
exception). (Stas)
- Fixed bug #51393 (DateTime::createFromFormat() fails if format string contains
timezone). (Adam)
- Fixed bug #51347 (mysqli_close / connection memory leak). (Andrey, Johannes)
- Fixed bug #51338 (URL-Rewriter is still enabled if use_only_cookies is
on). (Ilia, j dot jeising at gmail dot com)
- Fixed bug #51291 (oci_error doesn't report last error when called two times)
(Oracle Corp.)
- Fixed bug #51276 (php_load_extension() is missing when HAVE_LIBDL is
undefined). (Tony)
- Fixed bug #51273 (Faultstring property does not exist when the faultstring is
empty) (Ilia, dennis at transip dot nl)
- Fixed bug #51269 (zlib.output_compression Overwrites Vary Header). (Adam)
- Fixed bug #51257 (CURL_VERSION_LARGEFILE incorrectly used after libcurl
version 7.10.1). (aron dot ujvari at microsec dot hu)
- Fixed bug #51242 (Empty mysql.default_port does not default to 3306 anymore,
but 0). (Adam)
- Fixed bug #51237 (milter SAPI crash on startup). (igmar at palsenberg dot com)
- Fixed bug #51213 (pdo_mssql is trimming value of the money column). (Ilia,
alexr at oplot dot com)
- Fixed bug #51190 (ftp_put() returns false when transfer was successful).
(Ilia)
- Fixed bug #51183 (ext/date/php_date.c fails to compile with Sun Studio).
(Sriram Natarajan)
- Fixed bug #51176 (Static calling in non-static method behaves like $this->).
(Felipe)
- Fixed bug #51171 (curl_setopt() doesn't output any errors or warnings when
an invalid option is provided). (Ilia)
- Fixed bug #51128 (imagefill() doesn't work with large images). (Pierre)
- Fixed bug #51096 ('last day' and 'first day' are handled incorrectly when
parsing date strings). (Derick)
- Fixed bug #51086 (DBA DB4 doesn't work with Berkeley DB 4.8). (Chris Jones)
- Fixed bug #51062 (DBA DB4 uses mismatched headers and libraries). (Chris
Jones)
- Fixed bug #51026 (mysqli_ssl_set not working). (Andrey)
- Fixed bug #51023 (filter doesn't detect int overflows with GCC 4.4).
(Raphael Geissert)
- Fixed bug #50999 (unaligned memory access in dba_fetch()). (Felipe)
- Fixed bug #50976 (Soap headers Authorization not allowed).
(Brain France, Dmitry)
- Fixed bug #50828 (DOMNotation is not subclass of DOMNode). (Rob)
- Fixed bug #50810 (property_exists does not work for private). (Felipe)
- Fixed bug #50762 (in WSDL mode Soap Header handler function only being called
if defined in WSDL). (mephius at gmail dot com)
- Fixed bug #50731 (Inconsistent namespaces sent to functions registered with
spl_autoload_register). (Felipe)
- Fixed bug #50563 (removing E_WARNING from parse_url). (ralph at smashlabs dot
com, Pierre)
- Fixed bug #50578 (incorrect shebang in phar.phar). (Fedora at FamilleCollet
dot com)
- Fixed bug #50555 (DateTime::sub() allows 'relative' time modifications).
(Derick)
- Fixed bug #50392 (date_create_from_format enforces 6 digits for 'u' format
character). (Derick)
- Fixed bug #50383 (Exceptions thrown in __call / __callStatic do not include
file and line in trace). (Felipe)
- Fixed bug #50358 (Compile failure compiling ext/phar/util.lo). (Felipe)
- Fixed bug #50101 (name clash between global and local variable).
(patch by yoarvi at gmail dot com)
- Fixed bug #51002 (fix possible memory corruption with very long names).
(Pierre)
- Fixed bug #49893 (Crash while creating an instance of Zend_Mail_Storage_Pop3).
(Dmitry)
- Fixed bug #49819 (STDOUT losing data with posix_isatty()). (Mike)
- Fixed bug #49778 (DateInterval::format("%a") is always zero when an interval
is created from an ISO string). (Derick)
- Fixed bug #49700 (memory leaks in php_date.c if garbage collector is
enabled). (Dmitry)
- Fixed bug #49576 (FILTER_VALIDATE_EMAIL filter needs updating) (Rasmus)
- Fixed bug #49490 (XPath namespace prefix conflict). (Rob)
- Fixed bug #49429 (odbc_autocommit doesn't work). (Felipe)
- Fixed bug #49320 (PDO returns null when SQLite connection fails). (Felipe)
- Fixed bug #49234 (mysqli_ssl_set not found). (Andrey)
- Fixed bug #49192 (PHP crashes when GC invoked on COM object). (Stas)
- Fixed bug #49081 (DateTime::diff() mistake if start in January and interval >
28 days). (Derick)
- Fixed bug #49059 (DateTime::diff() repeats previous sub() operation).
(yoarvi@gmail.com, Derick)
- Fixed bug #48983 (DomDocument : saveHTMLFile wrong charset). (Rob)
- Fixed bug #48902 (Timezone database fallback map is outdated). (Derick)
- Fixed bug #48781 (Cyclical garbage collector memory leak). (Dmitry)
- Fixed bug #48601 (xpath() returns FALSE for legitimate query). (Rob)
- Fixed bug #48361 (SplFileInfo::getPathInfo should return the
parent dir). (Etienne)
- Fixed bug #48289 (iconv_mime_encode() quoted-printable scheme is broken).
(Adam, patch from hiroaki dot kawai at gmail dot com).
- Fixed bug #47842 (sscanf() does not support 64-bit values). (Mike)
- Fixed bug #46111 (Some timezone identifiers can not be parsed). (Derick)
- Fixed bug #43233 (sasl support for ldap on Windows). (Pierre)
- Fixed bug #35673 (formatOutput does not work with saveHTML). (Rob)
04 Mar 2010, PHP 5.3.2
- Upgraded bundled sqlite to version 3.6.22. (Ilia)
- Upgraded bundled libmagic to version 5.03. (Mikko)
- Upgraded bundled PCRE to version 8.00. (Scott)
- Updated timezone database to version 2010.3. (Derick)
- Improved LCG entropy. (Rasmus, Samy Kamkar)
- Improved crypt support for edge cases (UFC compatibility). (Solar Designer,
Joey, Pierre)
- Reverted fix for bug #49521 (PDO fetchObject sets values before calling
constructor). (Pierrick, Johannes)
- Changed gmp_strval() to use full range from 2 to 62, and -2 to -36. FR #50283
(David Soria Parra)
- Changed "post_max_size" php.ini directive to allow unlimited post size by
setting it to 0. (Rasmus)
- Changed tidyNode class to disallow manual node creation. (Pierrick)
- Removed automatic file descriptor unlocking happening on shutdown and/or
stream close (on all OSes). (Tony, Ilia)
- Added libpng 1.4.0 support. (Pierre)
- Added support for DISABLE_AUTHENTICATOR for imap_open. (Pierre)
- Added missing host validation for HTTP urls inside FILTER_VALIDATE_URL.
(Ilia)
- Added stream_resolve_include_path(). (Mikko)
- Added INTERNALDATE support to imap_append. (nick at mailtrust dot com)
- Added support for SHA-256 and SHA-512 to php's crypt. (Pierre)
- Added realpath_cache_size() and realpath_cache_get() functions. (Stas)
- Added FILTER_FLAG_STRIP_BACKTICK option to the filter extension. (Ilia)
- Added protection for $_SESSION from interrupt corruption and improved
"session.save_path" check. (Stas)
- Added LIBXML_PARSEHUGE constant to override the maximum text size of a
single text node when using libxml2.7.3+. (Kalle)
- Added ReflectionMethod::setAccessible() for invoking non-public methods
@@ -19,16 +313,95 @@ PHP NEWS
(Linus Nielsen Feltzing <linus@haxx.se>)
- Added client-side server name indication support in openssl. (Arnaud)
- Improved fix for bug #50006 (Segfault caused by uksort()). (Stas)
- Fixed mysqlnd hang when queries exactly 16777214 bytes long are sent. (Andrey)
- Fixed incorrect decoding of 5-byte BIT sequences in mysqlnd. (Andrey)
- Fixed error_log() to be binary safe when using message_type 3. (Jani)
- Fixed unnecessary invocation of setitimer when timeouts have been disabled.
(Arvind Srinivasan)
- Fixed memory leak in extension loading when an error occurs on Windows.
(Pierre)
- Fixed safe_mode validation inside tempnam() when the directory path does
not end with a /). (Martin Jansen)
- Fixed a possible open_basedir/safe_mode bypass in session extension
identified by Grzegorz Stachowiak. (Ilia)
- Fixed possible crash when a error/warning is raised during php startup.
(Pierre)
- Fixed possible bad behavior of rename on windows when used with symbolic
links or invalid paths. (Pierre)
- Fixed error output to stderr on Windows. (Pierre)
- Fixed memory leaks in is_writable/readable/etc on Windows. (Pierre)
- Fixed memory leaks in the ACL function on Windows. (Pierre)
- Fixed memory leak in the realpath cache on Windows. (Pierre)
- Fixed memory leak in zip_close. (Pierre)
- Fixed crypt's blowfish sanity check of the "setting" string, to reject
iteration counts encoded as 36 through 39. (Solar Designer, Joey, Pierre)
- Fixed bug #51059 (crypt crashes when invalid salt are given). (Pierre)
- Fixed bug #50952 (allow underscore _ in constants parsed in php.ini files).
(Jani)
- Fixed bug #50940 (Custom content-length set incorrectly in Apache SAPIs).
(Brian France, Rasmus)
- Fixed bug #50930 (Wrong date by php_date.c patch with ancient gcc/glibc
versions). (Derick)
- Fixed bug #50907 (X-PHP-Originating-Script adding two new lines in *NIX).
(Ilia)
- Fixed bug #50859 (build fails with openssl 1.0 due to md2 deprecation).
(Ilia, hanno at hboeck dot de)
- Fixed bug #50847 (strip_tags() removes all tags greater then 1023 bytes
long). (Ilia)
- Fixed bug #50829 (php.ini directive pdo_mysql.default_socket is ignored).
(Ilia)
- Fixed bug #50832 (HTTP fopen wrapper does not support passwordless HTTP
authentication). (Jani)
- Fixed bug #50787 (stream_set_write_buffer() has no effect on socket streams).
(vnegrier at optilian dot com, Ilia)
- Fixed bug #50761 (system.multiCall crashes in xmlrpc extension).
(hiroaki dot kawai at gmail dot com, Ilia)
- Fixed bug #50756 (CURLOPT_FTP_SKIP_PASV_IP does not exist). (Sriram)
- Fixed bug #50732 (exec() adds single byte twice to $output array). (Ilia)
- Fixed bug #50728 (All PDOExceptions hardcode 'code' property to 0).
(Joey, Ilia)
- Fixed bug #50723 (Bug in garbage collector causes crash). (Dmitry)
- Fixed bug #50690 (putenv does not set ENV when the value is only one char).
(Pierre)
- Fixed bug #50680 (strtotime() does not support eighth ordinal number). (Ilia)
- Fixed bug #50661 (DOMDocument::loadXML does not allow UTF-16). (Rob)
- Fixed bug #50657 (copy() with an empty (zero-byte) HTTP source succeeds but
returns false). (Ilia)
- Fixed bug #50636 (MySQLi_Result sets values before calling constructor).
(Pierrick)
- Fixed bug #50632 (filter_input() does not return default value if the
variable does not exist). (Ilia)
- Fixed bug #50576 (XML_OPTION_SKIP_TAGSTART option has no effect). (Pierrick)
- Fixed bug #50558 (Broken object model when extending tidy). (Pierrick)
- Fixed bug #50540 (Crash while running ldap_next_reference test cases).
(Sriram)
- Fixed bug #50519 (segfault in garbage collection when using set_error_handler
and DomDocument). (Dmitry)
- Fixed bug #50508 (compile failure: Conflicting HEADER type declarations).
(Jani)
- Fixed bug #50496 (Use of <stdbool.h> is valid only in a c99 compilation
environment. (Sriram)
- Fixed bug #50464 (declare encoding doesn't work within an included file).
(Felipe)
- Fixed bug #50458 (PDO::FETCH_FUNC fails with Closures). (Felipe, Pierrick)
- Fixed bug #50445 (PDO-ODBC stored procedure call from Solaris 64-bit causes
seg fault). (davbrown4 at yahoo dot com, Felipe)
- Fixed bug #50416 (PROCEDURE db.myproc can't return a result set in the given
context). (Andrey)
- Fixed bug #50394 (Reference argument converted to value in __call). (Stas)
- Fixed bug #50351 (performance regression handling objects, ten times slower
in 5.3 than in 5.2). (Dmitry)
- Fixed bug #50392 (date_create_from_format() enforces 6 digits for 'u'
format character). (Ilia)
- Fixed bug #50345 (nanosleep not detected properly on some solaris versions).
(Jani)
- Fixed bug #50340 (php.ini parser does not allow spaces in ini keys). (Jani)
- Fixed bug #50334 (crypt ignores sha512 prefix). (Pierre)
- Fixed bug #50323 (Allow use of ; in values via ;; in PDO DSN).
(Ilia, Pierrick)
- Fixed bug #50285 (xmlrpc does not preserve keys in encoded indexed arrays).
(Felipe)
- Fixed bug #50282 (xmlrpc_encode_request() changes object into array in
@@ -47,14 +420,20 @@ PHP NEWS
(Pierrick)
- Fixed bug #50212 (crash by ldap_get_option() with LDAP_OPT_NETWORK_TIMEOUT).
(Ilia, shigeru_kitazaki at cybozu dot co dot jp)
- Fixed bug #50209 (Compiling with libedit cannot find readline.h).
(tcallawa at redhat dot com)
- Fixed bug #50207 (segmentation fault when concatenating very large strings on
64bit linux). (Ilia)
- Fixed bug #50196 (stream_copy_to_stream() produces warning when source is
not file). (Stas)
- Fixed bug #50195 (pg_copy_to() fails when table name contains schema. (Ilia)
- Fixed bug #50185 (ldap_get_entries() return false instead of an empty array
when there is no error). (Jani)
- Fixed bug #50174 (Incorrectly matched docComment). (Felipe)
- Fixed bug #50168 (FastCGI fails with wrong error on HEAD request to
non-existant file). (Dmitry)
- Fixed bug #50162 (Memory leak when fetching timestamp column from Oracle
database). (Felipe)
- Fixed bug #50159 (wrong working directory in symlinked files). (Dmitry)
- Fixed bug #50158 (FILTER_VALIDATE_EMAIL fails with valid addresses
containing = or ?). (Pierrick)
@@ -78,8 +457,11 @@ PHP NEWS
- Fixed bug #49936 (crash with ftp stream in php_stream_context_get_option()).
(Pierrick)
- Fixed bug #49921 (Curl post upload functions changed). (Ilia)
- Fixed bug #49866 (Making reference on string offsets crashes PHP). (Dmitry)
- Fixed bug #49855 (import_request_variables() always returns NULL). (Ilia,
sjoerd at php dot net)
- Fixed bug #49851, #50451 (http wrapper breaks on 1024 char long headers).
(Ilia)
- Fixed bug #49800 (SimpleXML allow (un)serialize() calls without warning).
(Ilia, wmeler at wp-sa dot pl)
- Fixed bug #49719 (ReflectionClass::hasProperty returns true for a private
@@ -88,12 +470,41 @@ PHP NEWS
ini variables). (Jani)
- Fixed bug #49660 (libxml 2.7.3+ limits text nodes to 10MB). (Felipe)
- Fixed bug #49647 (DOMUserData does not exist). (Rob)
- Fixed bug #49600 (imageTTFText text shifted right). (Takeshi Abe)
- Fixed bug #49585 (date_format buffer not long enough for >4 digit years).
(Derick, Adam)
- Fixed bug #49560 (oci8: using LOBs causes slow PHP shutdown). (Oracle Corp.)
- Fixed bug #49521 (PDO fetchObject sets values before calling constructor).
(Pierrick)
- Fixed bug #49472 (Constants defined in Interfaces can be overridden).
(Felipe)
- Fixed bug #49463 (setAttributeNS fails setting default namespace). (Rob)
- Fixed bug #49244 (Floating point NaN cause garbage characters). (Sjoerd)
- Fixed bug #49224 (Compile error due to old DNS functions on AIX systems).
(Scott)
- Fixed bug #49174 (crash when extending PDOStatement and trying to set
queryString property). (Felipe)
- Fixed bug #48811 (Directives in PATH section do not get applied to
subdirectories). (Patch by: ct at swin dot edu dot au)
- Fixed bug #48590 (SoapClient does not honor max_redirects). (Sriram)
- Fixed bug #48190 (Content-type parameter "boundary" is not case-insensitive
in HTTP uploads). (Ilia)
- Fixed bug #47848 (importNode doesn't preserve attribute namespaces). (Rob)
- Fixed bug #47409 (extract() problem with array containing word "this").
(Ilia, chrisstocktonaz at gmail dot com)
- Fixed bug #47281 ($php_errormsg is limited in size of characters)
(Oracle Corp.)
- Fixed bug #46478 (htmlentities() uses obsolete mapping table for character
entity references). (Moriyoshi)
- Fixed bug #45599 (strip_tags() truncates rest of string with invalid
attribute). (Ilia, hradtke)
- Fixed bug #45120 (PDOStatement->execute() returns true then false for same
statement). (Pierrick)
- Fixed bug #44827 (define() allows :: in constant names). (Ilia)
- Fixed bug #44098 (imap_utf8() returns only capital letters).
(steffen at dislabs dot de, Pierre)
- Fixed bug #34852 (Failure in odbc_exec() using oracle-supplied odbc
driver). (tim dot tassonis at trivadis dot com)
19 Nov 2009, PHP 5.3.1
- Upgraded bundled sqlite to version 3.6.19. (Scott)
-57
View File
@@ -1,57 +0,0 @@
QNX4 Installation Notes
-----------------------
NOTE: General installation instructions are in the INSTALL file
1. To compile and test PHP3 you have to grab, compile and install:
- GNU dbm library or another db library;
- GNU bison (1.25 or later; 1.25 tested);
- GNU flex (any version supporting -o and -P options; 2.5.4 tested);
- GNU diffutils (any version supporting -w option; 2.7 tested);
2. To use CVS version you may need also:
- GNU CVS (1.9 tested);
- GNU autoconf (2.12 tested);
- GNU m4 (1.3 or later preferable; 1.4 tested);
3. To run configure define -lunix in command line:
LDFLAGS=-lunix ./configure
4. To use Sybase SQL Anywhere define ODBC_QNX and CUSTOM_ODBC_LIBS in
command line and run configure with --with-custom-odbc:
CFLAGS=-DODBC_QNX LDFLAGS=-lunix CUSTOM_ODBC_LIBS="-ldblib -lodbc" ./configure --with-custom-odbc=/usr/lib/sqlany50
If you have SQL Anywhere version 5.5.00, then you have to add
CFLAGS=-DSQLANY_BUG
to workaround its SQLFreeEnv() bug. Other versions has not been tested,
so try without this flag first.
5. To build the Apache module, you may have to hardcode an include path for
alloc.h in your Apache base directory:
- APACHE_DIRECTORY/src/httpd.h:
change #include "alloc.h"
to #include "APACHE_DIRECTORY/src/alloc.h"
Unless you want to use system regex library, you have to hardcode also
a path to regex.h:
- APACHE_DIRECTORY/src/conf.h:
change #include <regex.h>
to #include "APACHE_DIRECTORY/src/regex/regex.h"
I don't know so far why this required for QNX, may be it is Watcom
compiler problem.
If you building Apache module with SQL Anywhere support, you'll get
symbol conflict with BOOL. It is defined in Apache (httpd.h) and in
SQL Anywhere (odbc.h). This has nothing to do with PHP, so you have to
fix it yourself someway.
6. With above precautions, it should compile as is and pass regression
tests completely:
make
make check
make install
Don't bother me unless you really sure you made that all but it
still doesn't work.
June 28, 1998
Igor Kovalenko -- owl@infomarket.ru
+3 -3
View File
@@ -100,9 +100,9 @@ Derick) run the following commands for you:
``sudo -u ezmlm ezmlm-sub ~ezmlm/primary-qa-tester/mod moderator-email-address``
3. Update the MD5 sums in ``qaweb/include/rc-md5sums.txt`` (no empty lines).
3. Update the MD5 sums in ``web/qa/trunk/include/rc-md5sums.txt`` (no empty lines).
4. Update in ``qaweb/include/release-qa.php`` constants with the new RC and
4. Update in ``web/qa/trunk/include/release-qa.php`` constants with the new RC and
commit this.
a. ``$BUILD_TEST_RELEASES`` = array("4.4.7RC1", "5.2.2RC1")
@@ -111,7 +111,7 @@ commit this.
c. ``$RELEASE_PROCESS`` = array(4 => true, 5 => true)
1. Update in ``php-bugs-web/include/functions.inc`` the ``show_version_option``
1. Update in ``php-bugs/trunk/include/functions.inc`` the ``show_version_option``
function to include the new RC and commit.
2. Update ``phpweb/include/version.inc`` (x=major version number)
+130 -84
View File
@@ -1,61 +1,134 @@
Submitting Patches to PHP
=========================
Submitting Enhancements and Patches to PHP
==========================================
This document describes how to submit a patch for PHP. Creating a
patch for PHP is easy!
This document describes how to submit an enhancement or patch for PHP.
It's easy!
You don't need any login accounts or special access to download,
build, debug and begin submitting PHP code, tests or documentation for
inclusion in PHP. Once you've followed this README and had several
patches accepted, PHP commit privileges are often quickly granted.
build, debug and begin submitting PHP, PECL or PEAR code, tests or
documentation. Once you've followed this README and had several
patches accepted, commit privileges are often quickly granted.
An excellent article to read first is:
http://phpadvent.org/2008/less-whining-more-coding-by-elizabeth-smith
Prework
-------
If you are fixing broken functionality then create a bug or identify
an existing bug at http://bugs.php.net/. This can be used to track
the patch progress and prevent your changes getting lost in the PHP
mail archives.
Online Forums
-------------
There are several IRC channels where PHP developers are often
available to discuss questions. They include #php.pecl, #php.doc and
#pear on the EFNet network and #php-dev-win on FreeNode.
If your code change is large then first discuss it with the extension
maintainer and/or a development mail list. Extension maintainers can
be found in the EXTENSIONS file in the PHP source. Use the
internals@lists.php.net mail list to discuss changes to the base PHP
code. Use pecl-dev@lists.php.net for changes to code that is only
available from PECL (http://pecl.php.net/). Use pear-dev@lists.php.net
for PEAR modules (http://pear.php.net/). Mail list subscription is
explained on http://www.php.net/mailing-lists.php.
If a PHP or PECL patch affects user-functionality or makes significant
internal changes then create a simple RFC on http://wiki.php.net/rfc
before starting discussion. This RFC can be used for initial
discussion and later for documentation. Wiki accounts can be requested
PHP Patches
-----------
If you are fixing broken functionality in PHP C source code first
create a bug or identify an existing bug at http://bugs.php.net/. A
bug can be used to track the patch progress and prevent your changes
getting lost in the PHP mail archives.
If your change is large then create a Request For Comment (RFC) page
on http://wiki.php.net/rfc, discuss it with the extension maintainer,
and discuss it on the development mail list internals@lists.php.net.
RFC Wiki accounts can be requested on
http://wiki.php.net/start?do=register. PHP extension maintainers can
be found in the EXTENSIONS file in the PHP source. Mail list
subscription is explained on http://www.php.net/mailing-lists.php.
Information on PHP internal C functions is at
http://www.php.net/internals, though this is considered incomplete.
Various external resources can be found on the web. A standard
printed reference is the book "Extending and Embedding PHP" by Sara
Golemon.
Attach the patch to the PHP bug and consider sending a notification
email about the change to internals@lists.php.net. Also CC the
extension maintainer. Explain what has been changed by your patch.
Test scripts should be included.
Please make the mail subject prefix "[PATCH]". If attaching a patch,
ensure it has a file extension of ".txt". This is because only MIME
attachments of type 'text/*' are accepted.
PHP Documentation Patches
-------------------------
If you are fixing incorrect PHP documentation first create a bug or
identify an existing bug at http://bugs.php.net/. A bug can be used
to track the patch progress and prevent your changes getting lost in
the PHP mail archives.
If your change is large, then first discuss it with the mail list
phpdoc@lists.php.net. Subscription is explained on
http://www.php.net/mailing-lists.php.
Information on contributing to PHP documentation is at
http://php.net/dochowto and http://wiki.php.net/doc/howto
Attach the patch to the PHP bug and consider sending a notification
email about the change to phpdoc@lists.php.net. Explain what has been
fixed/added/changed by your patch.
Please make the mail subject prefix "[PATCH]". Include the bug id(s)
which can be closed by your patch. If attaching a patch, ensure it
has a file extension of ".txt". This is because only MIME attachments
of type 'text/*' are accepted.
PECL Extension Patches: http://pecl.php.net/
--------------------------------------------
If you are fixing broken functionality in a PECL extension then create
a bug or identify an existing bug at http://pecl.php.net/bugs/. A bug
can be used to track the patch progress and prevent your changes
getting lost in the PHP mail archives.
If your change is large then create a Request For Comment (RFC) page
on http://wiki.php.net/rfc, discuss it with the extension maintainer,
and discuss it on the development mail list pecl-dev@lists.php.net.
PECL mail list subscription is explained on
http://pecl.php.net/support.php. RFC Wiki accounts can be requested
on http://wiki.php.net/start?do=register
There are several IRC channels where PHP developers are often
available to discuss questions. They include #php.pecl on the EFNet
network and #php-dev-win on FreeNode.
Information on PHP internal C functions is at
http://www.php.net/internals, though this is considered incomplete.
Various external resources can be found on the web. A standard
printed reference is the book "Extending and Embedding PHP" by Sara
Golemon.
Update any open bugs and add a link to the source of your patch. Send
the patch or pointer to the bug to pecl-dev@lists.php.net. Also CC
the extension maintainer. Explain what has been changed by your
patch. Test scripts should be included.
Please make the mail subject prefix "[PATCH] ...". Include the patch
as an attachment with a file extension of ".txt". This is because
only MIME attachments of type 'text/*' are accepted.
How to create your patch
------------------------
PHP uses Subversion (SVN) for revision control. Read
PEAR Package Patches: http://pear.php.net/
------------------------------------------
Information on contributing to PEAR is available at
http://pear.php.net/manual/en/developers-newmaint.php and
http://pear.php.net/manual/en/guide-developers.php
How to create your PHP, PHP Documentation or PECL patch
-------------------------------------------------------
PHP and PECL use Subversion (SVN) for revision control. Read
http://www.php.net/svn.php for help on using SVN to get and build PHP
source code. We recommend using a Sparse Directory checkout described
in http://wiki.php.net/vcs/svnfaq. If you are new to SVN, read
source code. We recommend using a Sparse Directory checkout described
in http://wiki.php.net/vcs/svnfaq. If you are new to SVN, read
http://svnbook.red-bean.com.
Generally we ask that patches work on the current stable PHP
development branch and on "trunk".
Generally we ask that bug fix patches work on the current stable PHP
development branches and on "trunk". New PHP features only need to
work on "trunk".
Read CODING_STANDARDS before you start working.
After modifying the source see README.TESTING and
http://qa.php.net/write-test.php for how to test. Submitting test
scripts helps us to understand what functionality has changed. It is
http://qa.php.net/write-test.php for how to test. Submitting test
scripts helps us to understand what functionality has changed. It is
important for the stability and maintainability of PHP that tests are
comprehensive.
@@ -67,70 +140,43 @@ For ease of review and later troubleshooting, submit individual
patches for each bug or feature.
Checklist for submitting your patch
-----------------------------------
Checklist for submitting your PHP or PECL code patch
----------------------------------------------------
- Update SVN source just before running your final 'diff' and
before testing.
- Add in-line comments and/or have external documentation ready.
Use only "/* */" style comments, not "//".
- Create test scripts for use with "make test".
- Run "make test" to check your patch doesn't break other features.
- Rebuild PHP with --enable-debug (which will show some kinds of
memory errors) and check the PHP and web server error logs after
running the PHP tests.
- Rebuild PHP with --enable-maintainer-zts to check your patch compiles
on multi-threaded web servers.
- Create test scripts for use with "make test".
- Add in-line comments and/or have external documentation ready.
running your PHP tests.
- Rebuild PHP with --enable-maintainer-zts to check your patch
compiles on multi-threaded web servers.
- Review the patch once more just before submitting it.
Where to send your patch
------------------------
If you are patching PHP C source then email the patch to
internals@lists.php.net
If you patching a PECL extension then send the patch to
pecl-dev@lists.php.net
If you are patching PEAR then send the patch to
pear-dev@lists.php.net
The mail can be CC'd to the extension maintainer (see EXTENSIONS).
Please make the subject prefix "[PATCH]".
Include the patch as an attachment. Note: only MIME attachments of
type 'text/*' are accepted. The easiest way to accomplish this is to
make the file extension '.txt'.
Explain what has been fixed/added/changed by your patch. Test scripts
should be included in the email.
Include the bug id(s) which can be closed by your patch.
Finally, update any open bugs and add a link to the source of your
patch.
What happens after you submit your patch
----------------------------------------
What happens after submitting your PHP, PHP Documentation or PECL patch
-----------------------------------------------------------------------
If your patch is easy to review and obviously has no side-effects,
it might be committed relatively quickly.
Because PHP is a volunteer-driven effort more complex patches will
require patience on your side. If you do not receive feedback in a few
days, consider resubmitting the patch. Before doing this think about
these questions:
require patience on your side. If you do not receive feedback in a
few days, consider resubmitting the patch. Before doing this think
about these questions:
- Did I send the patch to the right mail list?
- Did I review the mail list archives to see if these kind of
changes had been discussed before?
- Did I explain my patch clearly?
- Is my patch too hard to review? Because of which factors?
- Are there any unwanted white space changes?
- Is my patch too hard to review? Because of what factors?
What happens when your patch is applied
---------------------------------------
Your name will be included together with your email address in the SVN
commit log. If your patch affects end users, a brief description
and your name might be added to the NEWS file.
What happens when your PHP or PECL patch is applied
---------------------------------------------------
Your name will likely be included in the SVN commit log. If your
patch affects end users, a brief description and your name might be
added to the NEWS file.
Thank you for patching PHP!
+1 -169
View File
@@ -1,174 +1,6 @@
The Win32 Build System.
$Id$
Wez Furlong <wez@thebrainroom.com>
If you need help with the build system, send mail to
internals@lists.php.net; please don't email me directly.
===========================================================
Contents:
1. How to build PHP under windows
a. Requirements
b. Opening a command prompt
c. Generating configure.js
d. Configuring
e. Building
f. Cleaning up
g. Running the test suite
h. snapshot building
2. How to write config.w32 files
x. to be written.
===========================================================
1. How to build PHP under windows
a. Requirements
You need:
- Windows Scripting Host (cscript.exe)
- Microsoft Build Tools from:
Microsoft Visual Studio (VC6) or later
You also need:
- bindlib_w32 [http://www.php.net/extra/bindlib_w32.zip]
- win32build [http://www.php.net/extra/win32build.zip]
b. Opening the Build Environment Command Prompt:
- Using Visual Studio (VC6)
1. Install it
2. If you have a VC++ Command Prompt icon on your start menu,
click on it to get a Command Prompt with the env vars
set up correctly.
If not, create a new shortcut and set the Target to:
%comspec% /k "C:\Program Files\Microsoft Visual Studio\VC98\Bin\vcvars32.bat"
You might also want to set the prompt to start in
a convenient location (such as the root of your
PHP source checkout).
- Using Visual Studio .Net
1. Install it.
2. Under the Visual Studio .Net Tools sub menu of your start
menu, you should have a Visual Studio .Net Command Prompt
icon. If not, create a new shortcut and set the Target to:
%comspec% /k "C:\Program Files\Microsoft Visual Studio .NET 2003\Common7\Tools\vsvars32.bat"
You might also want to set the prompt to start in
a convenient location (such as the root of your
PHP source checkout).
- Using the Platform SDK tools
1. Download the Platform SDK:
http://www.microsoft.com/msdownload/platformsdk/sdkupdate/
- You need the Core SDK, which is approx 200MB to download
and requires approx 500MB of disk space.
- The other components of the SDK are not required by PHP
- You might be able to reduce the download size by downloading
the installer control component first and then selecting
only the Build Environment (around 30MB), but I haven't
tried this.
** Note: it seems that MS don't include the 32 bit
build tools in the platform SDK any longer, so
you will probably have very limited luck if you
don't also have VC++ or VS.Net already installed.
2. Once installed, you will have an icon on your start menu
that will launch the build environment; the latest SDK's
install a number of different versions of this; you probably
want to choose the Windows 2000 Retail build environment.
Clicking on this will open a command prompt with its Path,
Include and Lib env vars set to point to the build tools
and win32 headers.
c. Generating configure
Change directory to where you have your PHP 5 sources.
Run buildconf.bat.
d. Configuring
cscript /nologo configure.js --help
Will give you a list of configuration options; these will
have the form:
--enable-foo or --disable-foo or --with-foo or --without-foo.
--enable-foo will turn something on, and is equivalent to
specifying --enable-foo=yes
--disable-foo will turn something off, and is equivalent to
specifying --enable-foo=no
--enable-foo=shared will attempt to build that feature as
a shared, dynamically loadable module.
Sometimes a configure option needs additional information
about where to find headers and libraries; quite often
you can specify --enable-foo=option where option could be
the path to where to find those files. If you want to
specify a parameter and build it as shared, you can use
this syntax instead: --enable-foo=shared,option
The same rules all apply to --with-foo and --without-foo;
the only difference is the way the options are named;
the convention is that --enable-foo means that you are
switching on something that comes with PHP, whereas
--with-foo means that you want to build in something
external to PHP.
e. Building
Once you have successfully configured your build (make
sure you read the output from the command to make sure
it worked correctly), you can build the code; simply type
"nmake" at the command prompt, and it will build everthing
you asked for.
Once the build has completed, you will find your binaries
in the build dir determined by configure; this is typically
Release_TS for release builds or Debug_TS for debug builds.
If you build a non-thread-safe build, it will use Release
or Debug to store the files. Also in this build dir you
will find sub directories for each module that went into
your PHP build. The files you'll want to keep are the
.exe and .dll files directly in your build dir.
f. Cleaning Up
You can automatically delete everything that was built
by running "nmake clean". This will delete everything
that was put there when you ran nmake, including the
.exe and .dll files.
g. Running the test suite
You can verify that your build is working well by running
the regression test suite. You do this by typing
"nmake test". You can specify the tests you want to run
by defing the TESTS variable - if you wanted to run the
sqlite test suite only, you would type
"nmake /D TESTS=ext/sqlite/tests test"
h. Snapshot Building
If you want to set up an automated build that will tolerate
breakages in some of the modules, you can use the
--enable-snapshot-build configure option to generate a
makefile optimized for that purpose. A snapshot build will
switch the argument parser so that the default option for
configure switches that your don't specify will be set
to "shared". The effect of this is to turn on all options
unless you explicitly disable them. When you have configured
your snapshot build, you can use "nmake build-snap" to build
everything, ignoring build errors in individual extensions
or SAPI.
See http://wiki.php.net/internals/windows/stepbystepbuild
vim:tw=78:sw=1:ts=1:et
+1 -1
View File
@@ -2,7 +2,7 @@
+----------------------------------------------------------------------+
| Thread Safe Resource Manager |
+----------------------------------------------------------------------+
| Copyright (c) 1999-2009, Andi Gutmans, Sascha Schumann, Zeev Suraski |
| Copyright (c) 1999-2010, Andi Gutmans, Sascha Schumann, Zeev Suraski |
| This source file is subject to the TSRM license, that is bundled |
| with this package in the file LICENSE |
+----------------------------------------------------------------------+
+1 -1
View File
@@ -2,7 +2,7 @@
+----------------------------------------------------------------------+
| Thread Safe Resource Manager |
+----------------------------------------------------------------------+
| Copyright (c) 1999-2009, Andi Gutmans, Sascha Schumann, Zeev Suraski |
| Copyright (c) 1999-2010, Andi Gutmans, Sascha Schumann, Zeev Suraski |
| This source file is subject to the TSRM license, that is bundled |
| with this package in the file LICENSE |
+----------------------------------------------------------------------+
-5
View File
@@ -1,10 +1,5 @@
// vim:ft=javascript
// $Id$
if (CHECK_HEADER_ADD_INCLUDE("NewAPIs.h", "CFLAGS_PHP", php_usual_include_suspects)) {
// Need to add the flag directly, since TSRM doesn't include the config
// header
ADD_FLAG("CFLAGS_PHP", "/DHAVE_NEWAPIS_H=1");
}
ADD_SOURCES("TSRM", "TSRM.c tsrm_strtok_r.c tsrm_virtual_cwd.c tsrm_win32.c");
+1 -1
View File
@@ -2,7 +2,7 @@
+----------------------------------------------------------------------+
| PHP Version 5 |
+----------------------------------------------------------------------+
| Copyright (c) 1997-2009 The PHP Group |
| Copyright (c) 1997-2010 The PHP Group |
+----------------------------------------------------------------------+
| This source file is subject to version 3.01 of the PHP license, |
| that is bundled with this package in the file LICENSE, and is |
+1 -1
View File
@@ -2,7 +2,7 @@
+----------------------------------------------------------------------+
| PHP Version 5 |
+----------------------------------------------------------------------+
| Copyright (c) 1997-2009 The PHP Group |
| Copyright (c) 1997-2010 The PHP Group |
+----------------------------------------------------------------------+
| This source file is subject to version 3.01 of the PHP license, |
| that is bundled with this package in the file LICENSE, and is |
+41 -17
View File
@@ -2,7 +2,7 @@
+----------------------------------------------------------------------+
| PHP Version 5 |
+----------------------------------------------------------------------+
| Copyright (c) 1997-2009 The PHP Group |
| Copyright (c) 1997-2010 The PHP Group |
+----------------------------------------------------------------------+
| This source file is subject to version 3.01 of the PHP license, |
| that is bundled with this package in the file LICENSE, and is |
@@ -298,19 +298,19 @@ static int php_is_file_ok(const cwd_state *state) /* {{{ */
}
/* }}} */
static void cwd_globals_ctor(virtual_cwd_globals *cwd_globals TSRMLS_DC) /* {{{ */
static void cwd_globals_ctor(virtual_cwd_globals *cwd_g TSRMLS_DC) /* {{{ */
{
CWD_STATE_COPY(&cwd_globals->cwd, &main_cwd_state);
cwd_globals->realpath_cache_size = 0;
cwd_globals->realpath_cache_size_limit = REALPATH_CACHE_SIZE;
cwd_globals->realpath_cache_ttl = REALPATH_CACHE_TTL;
memset(cwd_globals->realpath_cache, 0, sizeof(cwd_globals->realpath_cache));
CWD_STATE_COPY(&cwd_g->cwd, &main_cwd_state);
cwd_g->realpath_cache_size = 0;
cwd_g->realpath_cache_size_limit = REALPATH_CACHE_SIZE;
cwd_g->realpath_cache_ttl = REALPATH_CACHE_TTL;
memset(cwd_g->realpath_cache, 0, sizeof(cwd_g->realpath_cache));
}
/* }}} */
static void cwd_globals_dtor(virtual_cwd_globals *cwd_globals TSRMLS_DC) /* {{{ */
static void cwd_globals_dtor(virtual_cwd_globals *cwd_g TSRMLS_DC) /* {{{ */
{
CWD_STATE_FREE(&cwd_globals->cwd);
CWD_STATE_FREE(&cwd_g->cwd);
realpath_cache_clean(TSRMLS_C);
}
/* }}} */
@@ -432,8 +432,8 @@ CWD_API char *virtual_getcwd(char *buf, size_t size TSRMLS_DC) /* {{{ */
static inline unsigned long realpath_cache_key(const char *path, int path_len TSRMLS_DC) /* {{{ */
{
register unsigned long h;
char *bucket_key = tsrm_win32_get_path_sid_key(path TSRMLS_CC);
char *bucket_key_start = (char *)bucket_key;
char *bucket_key_start = tsrm_win32_get_path_sid_key(path TSRMLS_CC);
char *bucket_key = (char *)bucket_key_start;
const char *e = bucket_key + strlen(bucket_key);
if (!bucket_key) {
@@ -444,11 +444,7 @@ static inline unsigned long realpath_cache_key(const char *path, int path_len TS
h *= 16777619;
h ^= *bucket_key++;
}
/* if no SID were present the path is returned. Otherwise a Heap
allocated string is returned. */
if (bucket_key_start != path) {
LocalFree(bucket_key_start);
}
HeapFree(GetProcessHeap(), 0, (LPVOID)bucket_key_start);
return h;
}
/* }}} */
@@ -590,6 +586,22 @@ CWD_API realpath_cache_bucket* realpath_cache_lookup(const char *path, int path_
}
/* }}} */
CWD_API int realpath_cache_size(TSRMLS_D)
{
return CWDG(realpath_cache_size);
}
CWD_API int realpath_cache_max_buckets(TSRMLS_D)
{
return (sizeof(CWDG(realpath_cache)) / sizeof(CWDG(realpath_cache)[0]));
}
CWD_API realpath_cache_bucket** realpath_cache_get_buckets(TSRMLS_D)
{
return CWDG(realpath_cache);
}
#undef LINK_MAX
#define LINK_MAX 32
@@ -702,7 +714,9 @@ static int tsrm_realpath_r(char *path, int start, int len, int *ll, time_t *t, i
tmp = tsrm_do_alloca(len+1, use_heap);
memcpy(tmp, path, len+1);
if(save && (data.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT)) {
if(save &&
!(IS_UNC_PATH(path, len) && len >= 3 && path[2] != '?') &&
(data.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT)) {
/* File is a reparse point. Get the target */
HANDLE hLink = NULL;
REPARSE_DATA_BUFFER * pbuffer;
@@ -987,6 +1001,15 @@ CWD_API int virtual_file_ex(cwd_state *state, const char *path, verify_path_func
TSRMLS_FETCH();
if (path_length == 0 || path_length >= MAXPATHLEN-1) {
#ifdef TSRM_WIN32
# if _MSC_VER < 1300
errno = EINVAL;
# else
_set_errno(EINVAL);
# endif
#else
errno = EINVAL;
#endif
return 1;
}
@@ -1502,6 +1525,7 @@ CWD_API int virtual_rename(char *oldname, char *newname TSRMLS_DC) /* {{{ */
/* rename on windows will fail if newname already exists.
MoveFileEx has to be used */
#ifdef TSRM_WIN32
/* MoveFileEx returns 0 on failure, other way 'round for this function */
retval = (MoveFileEx(oldname, newname, MOVEFILE_REPLACE_EXISTING|MOVEFILE_COPY_ALLOWED) == 0) ? -1 : 0;
#else
retval = rename(oldname, newname);
+4 -1
View File
@@ -2,7 +2,7 @@
+----------------------------------------------------------------------+
| PHP Version 5 |
+----------------------------------------------------------------------+
| Copyright (c) 1997-2009 The PHP Group |
| Copyright (c) 1997-2010 The PHP Group |
+----------------------------------------------------------------------+
| This source file is subject to version 3.01 of the PHP license, |
| that is bundled with this package in the file LICENSE, and is |
@@ -238,6 +238,9 @@ extern virtual_cwd_globals cwd_globals;
CWD_API void realpath_cache_clean(TSRMLS_D);
CWD_API void realpath_cache_del(const char *path, int path_len TSRMLS_DC);
CWD_API realpath_cache_bucket* realpath_cache_lookup(const char *path, int path_len, time_t t TSRMLS_DC);
CWD_API int realpath_cache_size(TSRMLS_D);
CWD_API int realpath_cache_max_buckets(TSRMLS_D);
CWD_API realpath_cache_bucket** realpath_cache_get_buckets(TSRMLS_D);
/* The actual macros to be used in programs using TSRM
* If the program defines VIRTUAL_DIR it will use the
+14 -3
View File
@@ -2,7 +2,7 @@
+----------------------------------------------------------------------+
| PHP Version 5 |
+----------------------------------------------------------------------+
| Copyright (c) 1997-2009 The PHP Group |
| Copyright (c) 1997-2010 The PHP Group |
+----------------------------------------------------------------------+
| This source file is subject to version 3.01 of the PHP license, |
| that is bundled with this package in the file LICENSE, and is |
@@ -146,7 +146,7 @@ PSID tsrm_win32_get_token_sid(HANDLE hToken)
PSID *ppsid = &sid;
DWORD sid_len;
PSID pResultSid = NULL;
/* Get the actual size of the TokenUser structure */
if (!GetTokenInformation(
hToken, TokenUser, (LPVOID) pTokenUser, 0, &dwLength)) {
@@ -176,6 +176,7 @@ PSID tsrm_win32_get_token_sid(HANDLE hToken)
if (!CopySid(sid_len, pResultSid, pTokenUser->User.Sid)) {
goto Finished;
}
HeapFree(GetProcessHeap(), 0, (LPVOID)pTokenUser);
return pResultSid;
Finished:
@@ -222,11 +223,13 @@ TSRM_API int tsrm_win32_access(const char *pathname, int mode)
}
if(access(pathname, mode)) {
free(real_path);
return errno;
}
/* If only existence check is made, return now */
if (mode == 0) {
free(real_path);
return 0;
}
@@ -271,6 +274,9 @@ TSRM_API int tsrm_win32_access(const char *pathname, int mode)
if (!DuplicateToken(thread_token, SecurityImpersonation, &TWG(impersonation_token))) {
goto Finished;
}
} else {
/* we already have it, free it then */
free(token_sid);
}
if (CWDG(realpath_cache_size_limit)) {
@@ -299,7 +305,7 @@ TSRM_API int tsrm_win32_access(const char *pathname, int mode)
fAccess = bucket->is_writable;
goto Finished;
}
desired_access = FILE_GENERIC_READ | FILE_GENERIC_WRITE;
desired_access = FILE_GENERIC_WRITE;
} else if(mode <= 4) {
if(bucket != NULL && bucket->is_rvalid) {
fAccess = bucket->is_readable;
@@ -344,6 +350,11 @@ TSRM_API int tsrm_win32_access(const char *pathname, int mode)
else if(desired_access == FILE_GENERIC_WRITE) {
bucket->is_wvalid = 1;
bucket->is_writable = fAccess;
} else if (desired_access == (FILE_GENERIC_READ | FILE_GENERIC_WRITE)) {
bucket->is_rvalid = 1;
bucket->is_readable = fAccess;
bucket->is_wvalid = 1;
bucket->is_writable = fAccess;
}
}
+1 -1
View File
@@ -2,7 +2,7 @@
+----------------------------------------------------------------------+
| PHP Version 5 |
+----------------------------------------------------------------------+
| Copyright (c) 1997-2009 The PHP Group |
| Copyright (c) 1997-2010 The PHP Group |
+----------------------------------------------------------------------+
| This source file is subject to version 3.01 of the PHP license, |
| that is bundled with this package in the file LICENSE, and is |
+1 -1
View File
@@ -2,7 +2,7 @@
+----------------------------------------------------------------------+
| Zend Engine |
+----------------------------------------------------------------------+
| Copyright (c) 1998-2009 Zend Technologies Ltd. (http://www.zend.com) |
| Copyright (c) 1998-2010 Zend Technologies Ltd. (http://www.zend.com) |
+----------------------------------------------------------------------+
| This source file is subject to version 2.00 of the Zend license, |
| that is bundled with this package in the file LICENSE, and is |
+1 -1
View File
@@ -4,7 +4,7 @@ dnl This file contains local autoconf functions.
AC_DEFUN([LIBZEND_BISON_CHECK],[
# we only support certain bison versions
bison_version_list="1.28 1.35 1.75 1.875 2.0 2.1 2.2 2.3 2.4 2.4.1"
bison_version_list="1.28 1.35 1.75 1.875 2.0 2.1 2.2 2.3 2.4 2.4.1 2.4.2"
# for standalone build of Zend Engine
test -z "$SED" && SED=sed
+1 -1
View File
@@ -2,7 +2,7 @@
+----------------------------------------------------------------------+
| Zend Engine |
+----------------------------------------------------------------------+
| Copyright (c) 1998-2009 Zend Technologies Ltd. (http://www.zend.com) |
| Copyright (c) 1998-2010 Zend Technologies Ltd. (http://www.zend.com) |
+----------------------------------------------------------------------+
| This source file is subject to version 2.00 of the Zend license, |
| that is bundled with this package in the file LICENSE, and is |
+2 -16
View File
@@ -17,22 +17,8 @@ array(1) {
[0]=>
int(2)
[1]=>
&array(3) {
[0]=>
int(2)
[1]=>
*RECURSION*
[2]=>
*RECURSION*
}
*RECURSION*
[2]=>
&array(3) {
[0]=>
int(2)
[1]=>
*RECURSION*
[2]=>
*RECURSION*
}
*RECURSION*
}
}
+4 -33
View File
@@ -20,46 +20,17 @@ array(3) {
[0]=>
int(2)
[1]=>
&array(3) {
[0]=>
int(2)
[1]=>
*RECURSION*
[2]=>
*RECURSION*
}
*RECURSION*
[2]=>
&array(3) {
[0]=>
int(2)
[1]=>
*RECURSION*
[2]=>
*RECURSION*
}
*RECURSION*
}
[2]=>
&array(3) {
[0]=>
int(2)
[1]=>
&array(3) {
[0]=>
int(2)
[1]=>
*RECURSION*
[2]=>
*RECURSION*
}
*RECURSION*
[2]=>
&array(3) {
[0]=>
int(2)
[1]=>
*RECURSION*
[2]=>
*RECURSION*
}
*RECURSION*
}
}
+4 -18
View File
@@ -11,29 +11,15 @@ var_dump($a);
$a->b = null;
$a = null;
?>
--EXPECT--
object(stdClass)#1 (1) {
--EXPECTF--
object(stdClass)#%d (1) {
["b"]=>
&array(3) {
[0]=>
int(2)
[1]=>
&array(3) {
[0]=>
int(2)
[1]=>
*RECURSION*
[2]=>
*RECURSION*
}
*RECURSION*
[2]=>
&array(3) {
[0]=>
int(2)
[1]=>
*RECURSION*
[2]=>
*RECURSION*
}
*RECURSION*
}
}
+5 -19
View File
@@ -12,30 +12,16 @@ var_dump($a);
$a->x0->y1 = "ok\n";
echo $a->x0;
?>
--EXPECT--
object(stdClass)#1 (1) {
--EXPECTF--
object(stdClass)#%d (1) {
["x0"]=>
&object(stdClass)#2 (3) {
&object(stdClass)#%d (3) {
["y0"]=>
string(1) "b"
["y1"]=>
&object(stdClass)#2 (3) {
["y0"]=>
string(1) "b"
["y1"]=>
*RECURSION*
["y2"]=>
*RECURSION*
}
*RECURSION*
["y2"]=>
&object(stdClass)#2 (3) {
["y0"]=>
string(1) "b"
["y1"]=>
*RECURSION*
["y2"]=>
*RECURSION*
}
*RECURSION*
}
}
ok
+4 -2
View File
@@ -30,7 +30,9 @@ if (defined("pass3")) {
set_error_handler('errorHandler');
define("pass2", 1);
include(__FILE__);
print "ok\n";
}
?>
--EXPECTF--
Error: Redefining already defined constructor for class TestClass (%sbug35634.php:12)
--EXPECT--
ok
+11
View File
@@ -0,0 +1,11 @@
--TEST--
Bug #44827 (define() allows :: in constant names)
--FILE--
<?php
define('foo::bar', 1);
define('::', 1);
?>
--EXPECTF--
Warning: Class constants cannot be defined or redefined in %sbug44827.php on line %d
Warning: Class constants cannot be defined or redefined in %sbug44827.php on line %d
+3 -3
View File
@@ -43,11 +43,11 @@ __call:
string(3) "ABC"
__call:
string(3) "ABC"
__call:
__callstatic:
string(3) "XYZ"
__call:
__callstatic:
string(3) "WWW"
__call:
__callstatic:
string(3) "ABC"
__callstatic:
string(1) "A"
+4 -4
View File
@@ -35,17 +35,17 @@ call_user_func('self::y');
?>
--EXPECTF--
__call:
__callstatic:
string(3) "ABC"
__call:
__callstatic:
string(3) "ABC"
__call:
string(3) "xyz"
__call:
__callstatic:
string(3) "www"
__call:
string(1) "y"
__call:
__callstatic:
string(1) "y"
ok
__callstatic:
+2 -2
View File
@@ -1,7 +1,7 @@
--TEST--
Bug #45877 (Array key '2147483647' left as string)
--INI--
precision=20
precision=16
--FILE--
<?php
$keys = array(PHP_INT_MAX,
@@ -18,6 +18,6 @@ array(3) {
int(1)
[-%d8]=>
int(1)
["%d8"]=>
["%s"]=>
int(1)
}
+1 -1
View File
@@ -12,4 +12,4 @@ function __autoload($class) {
?>
--EXPECTF--
%string|unicode%(12) "\Foo\Bar\Baz"
%string|unicode%(11) "Foo\Bar\Baz"
-2
View File
@@ -29,8 +29,6 @@ $b->A();
?>
===DONE===
--EXPECTF--
Strict Standards: Redefining already defined constructor for class A in %s on line %d
B::__construct
A::__construct
B::A
-3
View File
@@ -16,7 +16,4 @@ $c = new c();
?>
===DONE===
--EXPECTF--
Strict Standards: Redefining already defined constructor for class a in %s on line %d
Fatal error: Call to undefined method b::b() in %s on line %d
+10
View File
@@ -0,0 +1,10 @@
--TEST--
Bug #48667 (Implementing both iterator and iteratoraggregate)
--FILE--
<?php
abstract class A implements Iterator, IteratorAggregate { }
?>
--EXPECTF--
Fatal error: Class A cannot implement both IteratorAggregate and Iterator at the same time in %s on line %d
+10
View File
@@ -0,0 +1,10 @@
--TEST--
Bug #48667 (Implementing both iterator and iteratoraggregate)
--FILE--
<?php
abstract class A implements IteratorAggregate, Iterator { }
?>
--EXPECTF--
Fatal error: Class A cannot implement both Iterator and IteratorAggregate at the same time in %s on line %d
+16
View File
@@ -0,0 +1,16 @@
--TEST--
Bug #48930 (__COMPILER_HALT_OFFSET__ incorrect in PHP>=5.3)
--FILE--
#!php
<?php
/*
* Test
*/
printf("__COMPILER_HALT_OFFSET__ is %d\n",__COMPILER_HALT_OFFSET__);
__halt_compiler();
?>
--EXPECT--
__COMPILER_HALT_OFFSET__ is 116
+27
View File
@@ -0,0 +1,27 @@
--TEST--
Bug #49472 (Constants defined in Interfaces can be overridden)
--FILE--
<?php
interface ia {
const c = 'Sea';
const y = 2;
}
class Foo implements ia {
}
class FooBar extends Foo implements ia {
const x = 1;
const c = 'Ocean';
public function show() {
return ia::c;
}
}
new FooBar;
?>
--EXPECTF--
Fatal error: Cannot inherit previously-inherited or override constant c from interface ia in %s on line %d
+10
View File
@@ -0,0 +1,10 @@
--TEST--
Bug #49866 (Making reference on string offsets crashes PHP)
--FILE--
<?php
$a = "string";
$b = &$a[1];
$b = "f";
echo $a;
--EXPECTF--
Fatal error: Cannot create references to/from string offsets nor overloaded objects in %sbug49866.php on line 3
+28
View File
@@ -0,0 +1,28 @@
--TEST--
Bug #49893 (Crash while creating an instance of Zend_Mail_Storage_Pop3)
--FILE--
<?php
class A {
function __destruct() {
try {
throw new Exception("2");
} catch (Exception $e) {
echo $e->getMessage() . "\n";
}
}
}
class B {
function __construct() {
$this->a = new A();
throw new Exception("1");
}
}
try {
$b = new B();
} catch(Exception $e) {
echo $e->getMessage() . "\n";;
}
?>
--EXPECT--
2
1
+130
View File
@@ -0,0 +1,130 @@
--TEST--
Bug #50383 (Exceptions thrown in __call / __callStatic do not include file and line in trace)
--FILE--
<?php
class myClass {
public static function __callStatic($method, $args) {
throw new Exception("Missing static method '$method'\n");
}
public function __call($method, $args) {
throw new Exception("Missing method '$method'\n");
}
}
function thrower() {
myClass::ThrowException();
}
function thrower2() {
$x = new myClass;
$x->foo();
}
try {
thrower();
} catch(Exception $e) {
print $e->getMessage();
print_r($e->getTrace());
}
try {
thrower2();
} catch (Exception $e) {
print $e->getMessage();
print_r($e->getTrace());
}
?>
--EXPECTF--
Missing static method 'ThrowException'
Array
(
[0] => Array
(
[file] => %s
[line] => 13
[function] => __callStatic
[class] => myClass
[type] => ::
[args] => Array
(
[0] => ThrowException
[1] => Array
(
)
)
)
[1] => Array
(
[file] => %s
[line] => 13
[function] => ThrowException
[class] => myClass
[type] => ::
[args] => Array
(
)
)
[2] => Array
(
[file] => %s
[line] => 21
[function] => thrower
[args] => Array
(
)
)
)
Missing method 'foo'
Array
(
[0] => Array
(
[file] => %s
[line] => 17
[function] => __call
[class] => myClass
[type] => ->
[args] => Array
(
[0] => foo
[1] => Array
(
)
)
)
[1] => Array
(
[file] => %s
[line] => 17
[function] => foo
[class] => myClass
[type] => ->
[args] => Array
(
)
)
[2] => Array
(
[file] => %s
[line] => 28
[function] => thrower2
[args] => Array
(
)
)
)
+24
View File
@@ -0,0 +1,24 @@
--TEST--
Bug #50394: Reference argument converted to value in __call
--FILE--
<?php
function inc( &$x ) { $x++; }
class Proxy {
function __call( $name, $args ) {
echo "$name called!\n";
call_user_func_array( 'inc', $args );
}
}
$arg = 1;
$args = array( &$arg );
$proxy = new Proxy;
call_user_func_array( array( $proxy, 'bar' ), $args );
call_user_func_array( array( $proxy, 'bar' ), array(&$arg) );
var_dump($arg);
--EXPECT--
bar called!
bar called!
int(3)
+46
View File
@@ -0,0 +1,46 @@
--TEST--
Bug #50810 (property_exists does not work for private)
--FILE--
<?php
class ExampleSuperClass
{
private $foo;
static protected $bar;
private function foo()
{
}
public function propertyFooExists()
{
return property_exists($this, 'foo');
}
}
class ExampleSubClass extends ExampleSuperClass
{
public function methodExists()
{
return method_exists($this, 'foo');
}
public function propertyBarExists()
{
return property_exists($this, 'bar');
}
}
$example = new ExampleSubClass();
var_dump($example->methodExists());
var_dump(method_exists($example, 'propertyFooExists'));
var_dump($example->propertyFooExists());
var_dump($example->propertyBarExists());
?>
--EXPECT--
bool(true)
bool(true)
bool(true)
bool(true)
+32
View File
@@ -0,0 +1,32 @@
--TEST--
Bug #51176 (Static calling in non-static method behaves like $this->)
--FILE--
<?php
class Foo
{
public function start()
{
self::bar();
static::bar();
Foo::bar();
}
public function __call($n, $a)
{
echo "instance\n";
}
public static function __callStatic($n, $a)
{
echo "static\n";
}
}
$foo = new Foo();
$foo->start();
?>
--EXPECT--
static
static
static
+16
View File
@@ -0,0 +1,16 @@
--TEST--
Bug #51394 (Error line reported incorrectly if error handler throws an exception)
--INI--
error_reporting=-1
--FILE--
<?php
function eh()
{
throw new Exception("error!");
return false;
}
set_error_handler("eh");
$a = $empty($b);
--EXPECTF--
Fatal error: Function name must be a string in %sbug51394.php on line 9
+14
View File
@@ -0,0 +1,14 @@
--TEST--
Bug #51791 (constant() failed to check undefined constant and php interpreter stoped)
--FILE--
<?php
class A {
const B = 1;
}
var_dump(constant('A::B1'));
?>
--EXPECTF--
Warning: constant(): Couldn't find constant A::B1 in %s on line %d
NULL
+40
View File
@@ -0,0 +1,40 @@
--TEST--
Bug #51822 (Segfault with strange __destruct() for static class variables)
--FILE--
<?php
class DestructableObject
{
public function __destruct()
{
echo "2\n";
}
}
class DestructorCreator
{
public function __destruct()
{
$this->test = new DestructableObject;
echo "1\n";
}
}
class Test
{
public static $mystatic;
}
// Uncomment this to avoid segfault
//Test::$mystatic = new DestructorCreator();
$x = new Test();
if (!isset(Test::$mystatic))
Test::$mystatic = new DestructorCreator();
echo "bla\n";
?>
--EXPECT--
bla
1
2
+19
View File
@@ -0,0 +1,19 @@
--TEST--
Bug #51827 (Bad warning when register_shutdown_function called with wrong num of parameters)
--FILE--
<?php
function abc() {
var_dump(1);
}
register_shutdown_function('timE');
register_shutdown_function('ABC');
register_shutdown_function('exploDe');
?>
--EXPECTF--
int(1)
Warning: explode() expects at least 2 parameters, 0 given in Unknown on line %d
+17
View File
@@ -0,0 +1,17 @@
--TEST--
Bug #52001 (Memory allocation problems after using variable variables)
--FILE--
<?php
a(0,$$var);
$temp1=1;
$temp2=2;
var_dump($temp1);
function a($b,$c) {}
?>
--EXPECTF--
Notice: Undefined variable: var in %sbug52001.php on line 2
Notice: Undefined variable: in %sbug52001.php on line 2
int(1)
+50
View File
@@ -0,0 +1,50 @@
--TEST--
Bug #52041 (Memory leak when writing on uninitialized variable returned from function)
--FILE--
<?php
function foo() {
return $x;
}
foo()->a = 1;
foo()->a->b = 2;
foo()->a++;
foo()->a->b++;
foo()->a += 2;
foo()->a->b += 2;
//foo()[0] = 1;
//foo()[0][0] = 2;
//foo()[0]++;
//foo()[0][0]++;
//foo()[0] += 2;
//foo()[0][0] += 2;
var_dump(foo());
?>
--EXPECTF--
Notice: Undefined variable: x in %sbug52041.php on line 3
Strict Standards: Creating default object from empty value in %sbug52041.php on line 6
Notice: Undefined variable: x in %sbug52041.php on line 3
Strict Standards: Creating default object from empty value in %sbug52041.php on line 7
Notice: Undefined variable: x in %sbug52041.php on line 3
Strict Standards: Creating default object from empty value in %sbug52041.php on line 8
Notice: Undefined variable: x in %sbug52041.php on line 3
Strict Standards: Creating default object from empty value in %sbug52041.php on line 9
Notice: Undefined variable: x in %sbug52041.php on line 3
Strict Standards: Creating default object from empty value in %sbug52041.php on line 10
Notice: Undefined variable: x in %sbug52041.php on line 3
Strict Standards: Creating default object from empty value in %sbug52041.php on line 11
Notice: Undefined variable: x in %sbug52041.php on line 3
NULL
+27
View File
@@ -0,0 +1,27 @@
--TEST--
Bug #52051 (handling of case sensitivity of old-style constructors changed in 5.3+)
--FILE--
<?php
class AA {
function AA() { echo "foo\n"; }
}
class bb extends AA {}
class CC extends bb {
function CC() { parent::bb(); }
}
new CC();
class A {
function A() { echo "bar\n"; }
}
class B extends A {}
class C extends B {
function C() { parent::B(); }
}
new C();
?>
--EXPECT--
foo
bar
+12
View File
@@ -0,0 +1,12 @@
--TEST--
Bug #52060 (Memory leak when passing a closure to method_exists())
--FILE--
<?php
$closure = function($a) { echo $a; };
var_dump(method_exists($closure, '__invoke')); // true
?>
--EXPECT--
bool(true)
+34
View File
@@ -0,0 +1,34 @@
--TEST--
Bug #52160 (Invalid E_STRICT redefined constructor error)
--FILE--
<?php
class bar {
function __construct() { }
static function bar() {
var_dump(1);
}
}
bar::bar();
class foo {
static function foo() {
var_dump(2);
}
function __construct() { }
}
foo::foo();
class baz {
static function baz() {
var_dump(3);
}
}
?>
--EXPECTF--
Strict Standards: Redefining already defined constructor for class foo in %s on line %d
Fatal error: Constructor baz::baz() cannot be static in %s on line %d
+78
View File
@@ -0,0 +1,78 @@
--TEST--
Bug #52193 (converting closure to array yields empty array)
--FILE--
<?php
var_dump((array) 1);
var_dump((array) NULL);
var_dump((array) new stdclass);
var_dump($h = (array) function () { return 2; });
var_dump($h[0]());
$i = function () use (&$h) {
return $h;
};
var_dump($x = (array)$i);
var_dump($y = $x[0]);
var_dump($y());
$items = range(1, 5);
$func = function(){ return 'just a test'; };
array_splice($items, 0 , 4, $func);
var_dump($items);
?>
--EXPECTF--
array(1) {
[0]=>
int(1)
}
array(0) {
}
array(0) {
}
array(1) {
[0]=>
object(Closure)#%d (0) {
}
}
int(2)
array(1) {
[0]=>
object(Closure)#%d (1) {
["static"]=>
array(1) {
["h"]=>
&array(1) {
[0]=>
object(Closure)#%d (0) {
}
}
}
}
}
object(Closure)#%d (1) {
["static"]=>
array(1) {
["h"]=>
&array(1) {
[0]=>
object(Closure)#%d (0) {
}
}
}
}
array(1) {
[0]=>
object(Closure)#%d (0) {
}
}
array(2) {
[0]=>
object(Closure)#%d (0) {
}
[1]=>
int(5)
}
+2 -2
View File
@@ -28,9 +28,9 @@ foo::BAZ();
--EXPECT--
nonstatic
string(6) "fOoBaR"
nonstatic
static
string(6) "foOBAr"
nonstatic
static
string(6) "fOOBAr"
static
string(3) "bAr"
+1 -1
View File
@@ -30,5 +30,5 @@ a::Foo();
--EXPECT--
__callstatic: Test
__call: Test
__call: Bar
__callstatic: Bar
__callstatic: Foo
+18
View File
@@ -0,0 +1,18 @@
--TEST--
Calling non-static method with call_user_func()
--FILE--
<?php
class foo {
public function teste() {
$this->a = 1;
}
}
call_user_func(array('foo', 'teste'));
?>
--EXPECTF--
Strict Standards: call_user_func() expects parameter 1 to be a valid callback, non-static method foo::teste() should not be called statically in %s on line %d
Fatal error: Using $this when not in object context in %s on line %d
+35
View File
@@ -0,0 +1,35 @@
--TEST--
Passing Closure as parameter to an non-existent function
--FILE--
<?php
class foo {
public static function __callstatic($x, $y) {
var_dump($x,$y);
return 1;
}
public function teste() {
return foo::x(function &($a=1,$b) { });
}
}
var_dump(call_user_func(array('foo', 'teste')));
?>
--EXPECTF--
Strict Standards: call_user_func() expects parameter 1 to be a valid callback, non-static method foo::teste() should not be called statically in %s on line %d
%string|unicode%(1) "x"
array(1) {
[0]=>
object(Closure)#%d (1) {
["parameter"]=>
array(2) {
["$a"]=>
string(10) "<required>"
["$b"]=>
string(10) "<required>"
}
}
}
int(1)
+18
View File
@@ -0,0 +1,18 @@
--TEST--
Check call to non-ref function with call-time refs
--FILE--
<?php
function my_errorhandler($errno,$errormsg) {
global $my_var;
$my_var=0x12345;
echo $errormsg."\n";
return true;
}
$oldhandler = set_error_handler("my_errorhandler");
$my_var = str_repeat("A",64);
$data = call_user_func_array("substr_replace",array(&$my_var, new StdClass(),1));
echo "OK!";
--EXPECT--
Object of class stdClass could not be converted to string
Object of class stdClass to string conversion
OK!
+1 -12
View File
@@ -31,18 +31,7 @@ object(foo)#%d (%d) {
["static"]=>
array(1) {
["a"]=>
&object(foo)#%d (2) {
["test":"foo":private]=>
int(3)
["a"]=>
object(Closure)#%d (1) {
["static"]=>
array(1) {
["a"]=>
*RECURSION*
}
}
}
*RECURSION*
}
}
}
+2 -8
View File
@@ -9,17 +9,11 @@ var_dump($a);
?>
===DONE===
--EXPECTF--
object(Closure)#1 (1) {
object(Closure)#%d (1) {
["static"]=>
array(1) {
["a"]=>
&object(Closure)#1 (1) {
["static"]=>
array(1) {
["a"]=>
*RECURSION*
}
}
*RECURSION*
}
}
===DONE===
+25
View File
@@ -0,0 +1,25 @@
--TEST--
Testing recursion detection with Closures
--FILE--
<?php
$x = function () use (&$x) {
$h = function () use ($x) {
var_dump($x);
return 1;
};
return $h();
};
var_dump($x());
?>
--EXPECTF--
object(Closure)#%d (1) {
["static"]=>
array(1) {
["x"]=>
*RECURSION*
}
}
int(1)
+2 -2
View File
@@ -16,5 +16,5 @@ class test implements test1, test2 {
echo "Done\n";
?>
--EXPECTF--
Fatal error: Cannot inherit previously-inherited constant FOO from interface test2 in %s on line %d
--EXPECTF--
Fatal error: Cannot inherit previously-inherited or override constant FOO from interface test2 in %s on line %d
+1 -4
View File
@@ -15,9 +15,6 @@ array(1) {
["a"]=>
&array(1) {
["a"]=>
&array(1) {
["a"]=>
*RECURSION*
}
*RECURSION*
}
}
+3 -4
View File
@@ -1,5 +1,7 @@
--TEST--
GC 004: Simple array cycle
--INI--
zend.enable_gc=1
--FILE--
<?php
$a = array();
@@ -14,10 +16,7 @@ array(1) {
[0]=>
&array(1) {
[0]=>
&array(1) {
[0]=>
*RECURSION*
}
*RECURSION*
}
}
int(1)
+5 -6
View File
@@ -1,5 +1,7 @@
--TEST--
GC 005: Simple object cycle
--INI--
zend.enable_gc=1
--FILE--
<?php
$a = new stdClass();
@@ -9,13 +11,10 @@ unset($a);
var_dump(gc_collect_cycles());
echo "ok\n"
?>
--EXPECT--
object(stdClass)#1 (1) {
--EXPECTF--
object(stdClass)#%d (1) {
["a"]=>
object(stdClass)#1 (1) {
["a"]=>
*RECURSION*
}
*RECURSION*
}
int(1)
ok
+5 -9
View File
@@ -1,5 +1,7 @@
--TEST--
GC 006: Simple array-object cycle
--INI--
zend.enable_gc=1
--FILE--
<?php
$a = new stdClass();
@@ -10,18 +12,12 @@ unset($a);
var_dump(gc_collect_cycles());
echo "ok\n"
?>
--EXPECT--
object(stdClass)#1 (1) {
--EXPECTF--
object(stdClass)#%d (1) {
["a"]=>
array(1) {
[0]=>
&object(stdClass)#1 (1) {
["a"]=>
array(1) {
[0]=>
*RECURSION*
}
}
*RECURSION*
}
}
int(2)
+3 -4
View File
@@ -1,5 +1,7 @@
--TEST--
GC 007: Unreferensed array cycle
--INI--
zend.enable_gc=1
--FILE--
<?php
$a = array(array());
@@ -15,10 +17,7 @@ array(1) {
[0]=>
&array(1) {
[0]=>
&array(1) {
[0]=>
*RECURSION*
}
*RECURSION*
}
}
int(0)
+5 -6
View File
@@ -1,5 +1,7 @@
--TEST--
GC 008: Unreferensed object cycle
--INI--
zend.enable_gc=1
--FILE--
<?php
$a = new stdClass();
@@ -11,13 +13,10 @@ unset($a);
var_dump(gc_collect_cycles());
echo "ok\n"
?>
--EXPECT--
object(stdClass)#2 (1) {
--EXPECTF--
object(stdClass)#%d (1) {
["a"]=>
object(stdClass)#2 (1) {
["a"]=>
*RECURSION*
}
*RECURSION*
}
int(0)
int(1)
+5 -9
View File
@@ -1,5 +1,7 @@
--TEST--
GC 009: Unreferensed array-object cycle
--INI--
zend.enable_gc=1
--FILE--
<?php
$a = array();
@@ -12,18 +14,12 @@ unset($a);
var_dump(gc_collect_cycles());
echo "ok\n"
?>
--EXPECT--
object(stdClass)#1 (1) {
--EXPECTF--
object(stdClass)#%d (1) {
["a"]=>
array(1) {
[0]=>
&object(stdClass)#1 (1) {
["a"]=>
array(1) {
[0]=>
*RECURSION*
}
}
*RECURSION*
}
}
int(0)
+3 -4
View File
@@ -1,5 +1,7 @@
--TEST--
GC 010: Cycle with reference to $GLOBALS
--INI--
zend.enable_gc=1
--FILE--
<?php
$a = array();
@@ -15,10 +17,7 @@ array(1) {
[0]=>
&array(1) {
[0]=>
&array(1) {
[0]=>
*RECURSION*
}
*RECURSION*
}
}
int(1)
+5 -6
View File
@@ -1,5 +1,7 @@
--TEST--
GC 011: GC and destructors
--INI--
zend.enable_gc=1
--FILE--
<?php
class Foo {
@@ -15,13 +17,10 @@ unset($a);
var_dump(gc_collect_cycles());
echo "ok\n"
?>
--EXPECT--
object(Foo)#1 (1) {
--EXPECTF--
object(Foo)#%d (1) {
["a"]=>
object(Foo)#1 (1) {
["a"]=>
*RECURSION*
}
*RECURSION*
}
__destruct
int(1)
+2
View File
@@ -1,5 +1,7 @@
--TEST--
GC 012: collection of many loops at once
--INI--
zend.enable_gc=1
--FILE--
<?php
$a=array();
+2
View File
@@ -1,5 +1,7 @@
--TEST--
GC 013: Too many cycles in one array
--INI--
zend.enable_gc=1
--FILE--
<?php
$a = array();
+2
View File
@@ -1,5 +1,7 @@
--TEST--
GC 014: Too many cycles in one object
--INI--
zend.enable_gc=1
--FILE--
<?php
$a = new stdClass();
+2
View File
@@ -1,5 +1,7 @@
--TEST--
GC 015: Object as root of cycle
--INI--
zend.enable_gc=1
--FILE--
<?php
$a = new stdClass();
+2
View File
@@ -1,5 +1,7 @@
--TEST--
GC 016: nested GC calls
--INI--
zend.enable_gc=1
--FILE--
<?php
class Foo {
+2
View File
@@ -1,5 +1,7 @@
--TEST--
GC 017: GC and destructors with unset
--INI--
zend.enable_gc=1
--FILE--
<?php
class Node {
+2
View File
@@ -1,5 +1,7 @@
--TEST--
GC 018: GC detach with assign
--INI--
zend.enable_gc=1
--FILE--
<?php
$a = array(array());
+2
View File
@@ -1,5 +1,7 @@
--TEST--
GC 019: GC detach with assign by reference
--INI--
zend.enable_gc=1
--FILE--
<?php
$a = array(array());
+2
View File
@@ -1,5 +1,7 @@
--TEST--
GC 020: GC detach reference with assign
--INI--
zend.enable_gc=1
--FILE--
<?php
$a = array();
+2
View File
@@ -1,5 +1,7 @@
--TEST--
GC 021: GC detach reference with assign by reference
--INI--
zend.enable_gc=1
--FILE--
<?php
$a = array();
+1
View File
@@ -2,6 +2,7 @@
GC 022: GC detach reference in executor's PZVAL_UNLOCK()
--INI--
error_reporting=0
zend.enable_gc=1
--FILE--
<?php
$a = array(array());
+2
View File
@@ -1,5 +1,7 @@
--TEST--
GC 023: Root buffer overflow (automatic collection)
--INI--
zend.enable_gc=1
--FILE--
<?php
$a=array();
+2
View File
@@ -1,5 +1,7 @@
--TEST--
GC 024: GC and objects with non-standard handlers
--INI--
zend.enable_gc=1
--SKIPIF--
<?php if (!extension_loaded("spl")) print "skip"; ?>
--FILE--
+2
View File
@@ -1,5 +1,7 @@
--TEST--
GC 025: Automatic GC on request shutdown
--INI--
zend.enable_gc=1
--FILE--
<?php
$a = array(array());
+2
View File
@@ -1,5 +1,7 @@
--TEST--
GC 027: GC and properties of internal classes
--INI--
zend.enable_gc=1
--FILE--
<?php
try {
+2
View File
@@ -1,5 +1,7 @@
--TEST--
GC 028: GC and destructors
--INI--
zend.enable_gc=1
--FILE--
<?php
class Foo {
+2
View File
@@ -1,5 +1,7 @@
--TEST--
GC 029: GC and destructors
--INI--
zend.enable_gc=1
--FILE--
<?php
class Foo {
+3 -1
View File
@@ -1,5 +1,7 @@
--TEST--
GC 030: GC and exceptions in destructors
--INI--
zend.enable_gc=1
--FILE--
<?php
class foo {
@@ -28,4 +30,4 @@ Next exception 'Exception' with message 'foobar' in %sgc_030.php:%d
Stack trace:
#0 %sgc_030.php(%d): foo->__destruct()
#1 {main}
thrown in %sgc_030.php on line %d
thrown in %sgc_030.php on line %d
+1 -1
View File
@@ -15,4 +15,4 @@ class foobar implements foo {
}
?>
--EXPECTF--
Fatal error: Cannot inherit previously-inherited constant foo from interface foo in %s on line %d
Fatal error: Cannot inherit previously-inherited or override constant foo from interface foo in %s on line %d
+2 -1
View File
@@ -1,5 +1,5 @@
--TEST--
063: Support for old-style constructors in namesapces
063: Old-style constructors in namesapces (not supported!)
--FILE--
<?php
namespace Foo;
@@ -9,5 +9,6 @@ class Bar {
}
}
new Bar();
echo "ok\n";
--EXPECT--
ok
+1 -2
View File
@@ -14,6 +14,5 @@ class test {
echo "Done\n";
?>
--EXPECTF--
Strict Standards: Redefining already defined constructor for class test in %s on line %d
--EXPECT--
Done
+3 -11
View File
@@ -13,18 +13,10 @@ $$test->a->b[] = 2;
var_dump($$test);
?>
--EXPECT--
object(stdClass)#1 (2) {
--EXPECTF--
object(stdClass)#%d (2) {
["a"]=>
&object(stdClass)#1 (2) {
["a"]=>
*RECURSION*
["b"]=>
array(1) {
[0]=>
int(2)
}
}
*RECURSION*
["b"]=>
array(1) {
[0]=>
+2 -2
View File
@@ -2,7 +2,7 @@
+----------------------------------------------------------------------+
| Zend Engine |
+----------------------------------------------------------------------+
| Copyright (c) 1998-2009 Zend Technologies Ltd. (http://www.zend.com) |
| Copyright (c) 1998-2010 Zend Technologies Ltd. (http://www.zend.com) |
+----------------------------------------------------------------------+
| This source file is subject to version 2.00 of the Zend license, |
| that is bundled with this package in the file LICENSE, and is |
@@ -114,7 +114,7 @@ ZEND_API zval zval_used_for_init; /* True global variable */
/* version information */
static char *zend_version_info;
static uint zend_version_info_length;
#define ZEND_CORE_VERSION_INFO "Zend Engine v" ZEND_VERSION ", Copyright (c) 1998-2009 Zend Technologies\n"
#define ZEND_CORE_VERSION_INFO "Zend Engine v" ZEND_VERSION ", Copyright (c) 1998-2010 Zend Technologies\n"
#define PRINT_ZVAL_INDENT 4
static void print_hash(zend_write_func_t write_func, HashTable *ht, int indent, zend_bool is_object TSRMLS_DC) /* {{{ */
+8 -3
View File
@@ -2,7 +2,7 @@
+----------------------------------------------------------------------+
| Zend Engine |
+----------------------------------------------------------------------+
| Copyright (c) 1998-2009 Zend Technologies Ltd. (http://www.zend.com) |
| Copyright (c) 1998-2010 Zend Technologies Ltd. (http://www.zend.com) |
+----------------------------------------------------------------------+
| This source file is subject to version 2.00 of the Zend license, |
| that is bundled with this package in the file LICENSE, and is |
@@ -166,7 +166,7 @@ char *alloca ();
# define ZEND_ATTRIBUTE_DEPRECATED
#endif
#if defined(__GNUC__) && ZEND_GCC_VERSION >= 3400 && defined(__i386__)
#if defined(__GNUC__) && ZEND_GCC_VERSION >= 3004 && defined(__i386__)
# define ZEND_FASTCALL __attribute__((fastcall))
#elif defined(_MSC_VER) && defined(_M_IX86)
# define ZEND_FASTCALL __fastcall
@@ -174,7 +174,7 @@ char *alloca ();
# define ZEND_FASTCALL
#endif
#if defined(__GNUC__) && ZEND_GCC_VERSION >= 3400
#if defined(__GNUC__) && ZEND_GCC_VERSION >= 3004
#else
# define __restrict__
#endif
@@ -710,6 +710,11 @@ END_EXTERN_C()
FREE_ZVAL(pzv); \
} \
INIT_PZVAL(&(zv));
#define MAKE_COPY_ZVAL(ppzv, pzv) \
*(pzv) = **(ppzv); \
zval_copy_ctor((pzv)); \
INIT_PZVAL((pzv));
#define REPLACE_ZVAL_VALUE(ppzv_dest, pzv_src, copy) { \
int is_ref, refcount; \
+24 -24
View File
@@ -2,7 +2,7 @@
+----------------------------------------------------------------------+
| Zend Engine |
+----------------------------------------------------------------------+
| Copyright (c) 1998-2009 Zend Technologies Ltd. (http://www.zend.com) |
| Copyright (c) 1998-2010 Zend Technologies Ltd. (http://www.zend.com) |
+----------------------------------------------------------------------+
| This source file is subject to version 2.00 of the Zend license, |
| that is bundled with this package in the file LICENSE, and is |
@@ -251,22 +251,18 @@ ZEND_API int zend_get_object_classname(const zval *object, char **class_name, ze
}
/* }}} */
static int parse_arg_object_to_string(zval **arg, char **p, int *pl, int type TSRMLS_DC) /* {{{ */
static int parse_arg_object_to_string(zval **arg TSRMLS_DC) /* {{{ */
{
if (Z_OBJ_HANDLER_PP(arg, cast_object)) {
SEPARATE_ZVAL_IF_NOT_REF(arg);
if (Z_OBJ_HANDLER_PP(arg, cast_object)(*arg, *arg, type TSRMLS_CC) == SUCCESS) {
*pl = Z_STRLEN_PP(arg);
*p = Z_STRVAL_PP(arg);
if (Z_OBJ_HANDLER_PP(arg, cast_object)(*arg, *arg, IS_STRING TSRMLS_CC) == SUCCESS) {
return SUCCESS;
}
}
/* Standard PHP objects */
if (Z_OBJ_HT_PP(arg) == &std_object_handlers || !Z_OBJ_HANDLER_PP(arg, cast_object)) {
SEPARATE_ZVAL_IF_NOT_REF(arg);
if (zend_std_cast_object_tostring(*arg, *arg, type TSRMLS_CC) == SUCCESS) {
*pl = Z_STRLEN_PP(arg);
*p = Z_STRVAL_PP(arg);
if (zend_std_cast_object_tostring(*arg, *arg, IS_STRING TSRMLS_CC) == SUCCESS) {
return SUCCESS;
}
}
@@ -281,8 +277,6 @@ static int parse_arg_object_to_string(zval **arg, char **p, int *pl, int type TS
if (!use_copy) {
ZVAL_ZVAL(*arg, z, 1, 1);
}
*pl = Z_STRLEN_PP(arg);
*p = Z_STRVAL_PP(arg);
return SUCCESS;
}
zval_ptr_dtor(&z);
@@ -418,15 +412,17 @@ static char *zend_parse_arg_impl(int arg_num, zval **arg, va_list *va, char **sp
case IS_DOUBLE:
case IS_BOOL:
convert_to_string_ex(arg);
if (UNEXPECTED(Z_ISREF_PP(arg) != 0)) {
/* it's dangerous to return pointers to string
buffer of referenced variable, because it can
be clobbered throug magic callbacks */
SEPARATE_ZVAL(arg);
}
*p = Z_STRVAL_PP(arg);
*pl = Z_STRLEN_PP(arg);
break;
case IS_OBJECT:
if (parse_arg_object_to_string(arg, p, pl, IS_STRING TSRMLS_CC) == SUCCESS) {
break;
}
case IS_ARRAY:
case IS_RESOURCE:
default:
@@ -680,7 +676,7 @@ static int zend_parse_va_args(int num_args, char *type_spec, va_list *va, int fl
int max_num_args = 0;
int post_varargs = 0;
zval **arg;
int arg_count;
int arg_count = (int)(zend_uintptr_t) *(zend_vm_stack_top(TSRMLS_C) - 1);
int quiet = flags & ZEND_PARSE_PARAMS_QUIET;
zend_bool have_varargs = 0;
zval ****varargs = NULL;
@@ -689,14 +685,21 @@ static int zend_parse_va_args(int num_args, char *type_spec, va_list *va, int fl
for (spec_walk = type_spec; *spec_walk; spec_walk++) {
c = *spec_walk;
switch (c) {
case 's':
if (max_num_args < arg_count) {
arg = (zval **) (zend_vm_stack_top(TSRMLS_C) - 1 - (arg_count - max_num_args));
if (Z_TYPE_PP(arg) == IS_OBJECT) {
parse_arg_object_to_string(arg TSRMLS_CC);
}
}
/* break missing intentionally */
case 'l': case 'd':
case 's': case 'b':
case 'H': case 'b':
case 'r': case 'a':
case 'o': case 'O':
case 'z': case 'Z':
case 'C': case 'h':
case 'f': case 'A':
case 'H':
max_num_args++;
break;
@@ -718,7 +721,7 @@ static int zend_parse_va_args(int num_args, char *type_spec, va_list *va, int fl
zend_error(E_WARNING, "%s%s%s(): only one varargs specifier (* or +) is permitted",
class_name,
class_name[0] ? "::" : "",
get_active_function_name(TSRMLS_C));
active_function->common.function_name);
}
return FAILURE;
}
@@ -738,7 +741,7 @@ static int zend_parse_va_args(int num_args, char *type_spec, va_list *va, int fl
zend_error(E_WARNING, "%s%s%s(): bad type specifier while parsing parameters",
class_name,
class_name[0] ? "::" : "",
get_active_function_name(TSRMLS_C));
active_function->common.function_name);
}
return FAILURE;
}
@@ -761,7 +764,7 @@ static int zend_parse_va_args(int num_args, char *type_spec, va_list *va, int fl
zend_error(E_WARNING, "%s%s%s() expects %s %d parameter%s, %d given",
class_name,
class_name[0] ? "::" : "",
get_active_function_name(TSRMLS_C),
active_function->common.function_name,
min_num_args == max_num_args ? "exactly" : num_args < min_num_args ? "at least" : "at most",
num_args < min_num_args ? min_num_args : max_num_args,
(num_args < min_num_args ? min_num_args : max_num_args) == 1 ? "" : "s",
@@ -770,8 +773,6 @@ static int zend_parse_va_args(int num_args, char *type_spec, va_list *va, int fl
return FAILURE;
}
arg_count = (int)(zend_uintptr_t) *(zend_vm_stack_top(TSRMLS_C) - 1);
if (num_args > arg_count) {
zend_error(E_WARNING, "%s(): could not obtain parameters for parsing",
get_active_function_name(TSRMLS_C));
@@ -923,7 +924,7 @@ ZEND_API int zend_parse_method_parameters_ex(int flags, int num_args TSRMLS_DC,
RETURN_IF_ZERO_ARGS(num_args, p, quiet);
va_start(va, type_spec);
retval = zend_parse_va_args(num_args, type_spec, &va, 0 TSRMLS_CC);
retval = zend_parse_va_args(num_args, type_spec, &va, flags TSRMLS_CC);
va_end(va);
} else {
p++;
@@ -1607,7 +1608,6 @@ ZEND_API int zend_startup_module_ex(zend_module_entry *module TSRMLS_DC) /* {{{
}
#endif
}
if (module->module_startup_func) {
EG(current_module) = module;
if (module->module_startup_func(module->type, module->module_number TSRMLS_CC)==FAILURE) {
+1 -1
View File
@@ -2,7 +2,7 @@
+----------------------------------------------------------------------+
| Zend Engine |
+----------------------------------------------------------------------+
| Copyright (c) 1998-2009 Zend Technologies Ltd. (http://www.zend.com) |
| Copyright (c) 1998-2010 Zend Technologies Ltd. (http://www.zend.com) |
+----------------------------------------------------------------------+
| This source file is subject to version 2.00 of the Zend license, |
| that is bundled with this package in the file LICENSE, and is |
+49 -4
View File
@@ -2,7 +2,7 @@
+----------------------------------------------------------------------+
| Zend Engine |
+----------------------------------------------------------------------+
| Copyright (c) 1998-2009 Zend Technologies Ltd. (http://www.zend.com) |
| Copyright (c) 1998-2010 Zend Technologies Ltd. (http://www.zend.com) |
+----------------------------------------------------------------------+
| This source file is subject to version 2.00 of the Zend license, |
| that is bundled with this package in the file LICENSE, and is |
@@ -84,6 +84,10 @@ static void zend_mm_panic(const char *message) __attribute__ ((noreturn));
static void zend_mm_panic(const char *message)
{
fprintf(stderr, "%s\n", message);
/* See http://support.microsoft.com/kb/190351 */
#ifdef PHP_WIN32
fflush(stderr);
#endif
#if ZEND_DEBUG && defined(HAVE_KILL) && defined(HAVE_GETPID)
kill(getpid(), SIGSEGV);
#endif
@@ -940,15 +944,27 @@ static void zend_mm_free_cache(zend_mm_heap *heap)
#endif
#if ZEND_MM_HEAP_PROTECTION || ZEND_MM_COOKIES
static void zend_mm_random(unsigned char *buf, size_t size)
static void zend_mm_random(unsigned char *buf, size_t size) /* {{{ */
{
size_t i = 0;
unsigned char t;
#ifdef ZEND_WIN32
HCRYPTPROV hCryptProv;
int has_context = 0;
if (CryptAcquireContext(&hCryptProv, NULL, NULL, PROV_RSA_FULL, 0)) {
if (!CryptAcquireContext(&hCryptProv, NULL, NULL, PROV_RSA_FULL, 0)) {
/* Could mean that the key container does not exist, let try
again by asking for a new one */
if (GetLastError() == NTE_BAD_KEYSET) {
if (CryptAcquireContext(&hCryptProv, NULL, NULL, PROV_RSA_FULL, CRYPT_NEWKEYSET)) {
has_context = 1;
}
}
} else {
has_context = 1;
}
if (has_context) {
do {
BOOL ret = CryptGenRandom(hCryptProv, size, buf);
CryptReleaseContext(hCryptProv, 0);
@@ -957,7 +973,7 @@ static void zend_mm_random(unsigned char *buf, size_t size)
i++;
}
if (i == size) {
return;
return;
}
}
} while (0);
@@ -986,6 +1002,7 @@ static void zend_mm_random(unsigned char *buf, size_t size)
t = buf[i++] << 1;
}
}
/* }}} */
#endif
/* Notes:
@@ -1031,11 +1048,19 @@ ZEND_API zend_mm_heap *zend_mm_startup_ex(const zend_mm_mem_handlers *handlers,
if (zend_mm_low_bit(block_size) != zend_mm_high_bit(block_size)) {
fprintf(stderr, "'block_size' must be a power of two\n");
/* See http://support.microsoft.com/kb/190351 */
#ifdef PHP_WIN32
fflush(stderr);
#endif
exit(255);
}
storage = handlers->init(params);
if (!storage) {
fprintf(stderr, "Cannot initialize zend_mm storage [%s]\n", handlers->name);
/* See http://support.microsoft.com/kb/190351 */
#ifdef PHP_WIN32
fflush(stderr);
#endif
exit(255);
}
storage->handlers = handlers;
@@ -1118,9 +1143,17 @@ ZEND_API zend_mm_heap *zend_mm_startup(void)
if (!mem_handlers[i].name) {
fprintf(stderr, "Wrong or unsupported zend_mm storage type '%s'\n", mem_type);
fprintf(stderr, " supported types:\n");
/* See http://support.microsoft.com/kb/190351 */
#ifdef PHP_WIN32
fflush(stderr);
#endif
for (i = 0; mem_handlers[i].name; i++) {
fprintf(stderr, " '%s'\n", mem_handlers[i].name);
}
/* See http://support.microsoft.com/kb/190351 */
#ifdef PHP_WIN32
fflush(stderr);
#endif
exit(255);
}
}
@@ -1131,9 +1164,17 @@ ZEND_API zend_mm_heap *zend_mm_startup(void)
seg_size = zend_atoi(tmp, 0);
if (zend_mm_low_bit(seg_size) != zend_mm_high_bit(seg_size)) {
fprintf(stderr, "ZEND_MM_SEG_SIZE must be a power of two\n");
/* See http://support.microsoft.com/kb/190351 */
#ifdef PHP_WIN32
fflush(stderr);
#endif
exit(255);
} else if (seg_size < ZEND_MM_ALIGNED_SEGMENT_SIZE + ZEND_MM_ALIGNED_HEADER_SIZE) {
fprintf(stderr, "ZEND_MM_SEG_SIZE is too small\n");
/* See http://support.microsoft.com/kb/190351 */
#ifdef PHP_WIN32
fflush(stderr);
#endif
exit(255);
}
} else {
@@ -1672,6 +1713,10 @@ static void zend_mm_safe_error(zend_mm_heap *heap,
size);
fprintf(stderr, " in %s on line %d\n", error_filename, error_lineno);
}
/* See http://support.microsoft.com/kb/190351 */
#ifdef PHP_WIN32
fflush(stderr);
#endif
} zend_end_try();
} else {
heap->overflow = 2;
+1 -1
View File
@@ -2,7 +2,7 @@
+----------------------------------------------------------------------+
| Zend Engine |
+----------------------------------------------------------------------+
| Copyright (c) 1998-2009 Zend Technologies Ltd. (http://www.zend.com) |
| Copyright (c) 1998-2010 Zend Technologies Ltd. (http://www.zend.com) |
+----------------------------------------------------------------------+
| This source file is subject to version 2.00 of the Zend license, |
| that is bundled with this package in the file LICENSE, and is |
+1 -1
View File
@@ -2,7 +2,7 @@
+----------------------------------------------------------------------+
| Zend Engine |
+----------------------------------------------------------------------+
| Copyright (c) 1998-2009 Zend Technologies Ltd. (http://www.zend.com) |
| Copyright (c) 1998-2010 Zend Technologies Ltd. (http://www.zend.com) |
+----------------------------------------------------------------------+
| This source file is subject to version 2.00 of the Zend license, |
| that is bundled with this package in the file LICENSE, and is |
+22 -37
View File
@@ -2,7 +2,7 @@
+----------------------------------------------------------------------+
| Zend Engine |
+----------------------------------------------------------------------+
| Copyright (c) 1998-2009 Zend Technologies Ltd. (http://www.zend.com) |
| Copyright (c) 1998-2010 Zend Technologies Ltd. (http://www.zend.com) |
+----------------------------------------------------------------------+
| This source file is subject to version 2.00 of the Zend license, |
| that is bundled with this package in the file LICENSE, and is |
@@ -26,6 +26,7 @@
#include "zend_ini.h"
#include "zend_exceptions.h"
#include "zend_extensions.h"
#include "zend_closures.h"
#undef ZEND_TEST_EXCEPTIONS
@@ -179,7 +180,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_alias, 0, 0, 2)
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO_EX(arginfo_trigger_error, 0, 0, 1)
ZEND_ARG_INFO(0, messsage)
ZEND_ARG_INFO(0, message)
ZEND_ARG_INFO(0, error_type)
ZEND_END_ARG_INFO()
@@ -629,7 +630,6 @@ ZEND_FUNCTION(define)
zend_bool non_cs = 0;
int case_sensitive = CONST_CS;
zend_constant c;
char *p;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sz|b", &name, &name_len, &val, &non_cs) == FAILURE) {
return;
@@ -640,31 +640,9 @@ ZEND_FUNCTION(define)
}
/* class constant, check if there is name and make sure class is valid & exists */
if ((p = zend_memnstr(name, "::", sizeof("::") - 1, name + name_len))) {
char *class_name;
int found;
zend_class_entry **ce;
ALLOCA_FLAG(use_heap)
if (p == (name + name_len - sizeof("::") + 1)) {
zend_error(E_WARNING, "Class constant must have a name");
RETURN_FALSE;
} else if (p == name) {
zend_error(E_WARNING, "Missing class name");
RETURN_FALSE;
}
class_name = do_alloca((p - name + 1), use_heap);
zend_str_tolower_copy(class_name, name, (p - name));
found = zend_hash_find(EG(class_table), class_name, p - name + 1, (void **) &ce);
if (found != SUCCESS) {
zend_error(E_WARNING, "Class '%s' does not exist", class_name);
free_alloca(class_name, use_heap);
RETURN_FALSE;
}
free_alloca(class_name, use_heap);
if (zend_memnstr(name, "::", sizeof("::") - 1, name + name_len)) {
zend_error(E_WARNING, "Class constants cannot be defined or redefined");
RETURN_FALSE;
}
repeat:
@@ -1121,22 +1099,29 @@ ZEND_FUNCTION(method_exists)
RETURN_TRUE;
} else {
union _zend_function *func = NULL;
efree(lcname);
if (Z_TYPE_P(klass) == IS_OBJECT
&& Z_OBJ_HT_P(klass)->get_method != NULL
&& (func = Z_OBJ_HT_P(klass)->get_method(&klass, method_name, method_len TSRMLS_CC)) != NULL
) {
if (func->type == ZEND_INTERNAL_FUNCTION
&& ((zend_internal_function*)func)->handler == zend_std_call_user_call
&& (func->common.fn_flags & ZEND_ACC_CALL_VIA_HANDLER) != 0
) {
/* Returns true to the fake Closure's __invoke */
RETVAL_BOOL((func->common.scope == zend_ce_closure
&& (method_len == sizeof(ZEND_INVOKE_FUNC_NAME)-1)
&& memcmp(lcname, ZEND_INVOKE_FUNC_NAME, sizeof(ZEND_INVOKE_FUNC_NAME)-1) == 0) ? 1 : 0);
efree(lcname);
efree(((zend_internal_function*)func)->function_name);
efree(func);
RETURN_FALSE;
return;
}
efree(lcname);
RETURN_TRUE;
}
}
efree(lcname);
RETURN_FALSE;
}
/* }}} */
@@ -1174,10 +1159,8 @@ ZEND_FUNCTION(property_exists)
}
h = zend_get_hash_value(property, property_len+1);
if (zend_hash_quick_find(&ce->properties_info, property, property_len+1, h, (void **) &property_info) == SUCCESS) {
if (property_info->flags & ZEND_ACC_SHADOW) {
RETURN_FALSE;
}
if (zend_hash_quick_find(&ce->properties_info, property, property_len+1, h, (void **) &property_info) == SUCCESS
&& (property_info->flags & ZEND_ACC_SHADOW) == 0) {
RETURN_TRUE;
}
@@ -1409,7 +1392,7 @@ ZEND_FUNCTION(get_included_files)
/* }}} */
/* {{{ proto void trigger_error(string messsage [, int error_type])
/* {{{ proto void trigger_error(string message [, int error_type])
Generates a user-level error/warning/notice message */
ZEND_FUNCTION(trigger_error)
{
@@ -2173,7 +2156,9 @@ ZEND_API void zend_fetch_debug_backtrace(zval *return_value, int skip_last, int
while (prev) {
if (prev->function_state.function &&
prev->function_state.function->common.type != ZEND_USER_FUNCTION) {
prev->function_state.function->common.type != ZEND_USER_FUNCTION &&
!(prev->function_state.function->common.type == ZEND_INTERNAL_FUNCTION &&
(prev->function_state.function->common.fn_flags & ZEND_ACC_CALL_VIA_HANDLER))) {
break;
}
if (prev->op_array) {
+1 -1
View File
@@ -2,7 +2,7 @@
+----------------------------------------------------------------------+
| Zend Engine |
+----------------------------------------------------------------------+
| Copyright (c) 1998-2009 Zend Technologies Ltd. (http://www.zend.com) |
| Copyright (c) 1998-2010 Zend Technologies Ltd. (http://www.zend.com) |
+----------------------------------------------------------------------+
| This source file is subject to version 2.00 of the Zend license, |
| that is bundled with this package in the file LICENSE, and is |
Loaded 100 of 1598 files, more files were not shown because too many files have changed in this diff. Show more