Compare commits

...
1134 Commits
Author SHA1 Message Date
Johannes Schlüter 0463aa400a 5.3.1RC4
# hope even with this fixes we can be fast with testing this ...
2009-11-12 18:01:21 +00:00
Johannes Schlüter dd8b782bc8 Merge 290606 (fixes the skipif) (David C) 2009-11-12 17:59:18 +00:00
Johannes Schlüter b1997d6557 Merge 290570 (Fix bug #49098). (Rasmus) 2009-11-12 17:48:36 +00:00
Johannes Schlüter 368e8230de Merge 290527 (fix PHP Bug #49910: no support for ././@LongLink for long
filenames in phar tar support) (Greg)
2009-11-12 17:43:23 +00:00
Johannes Schlüter b3ba19db6b merge 290306 (Make sure that max_file_uploads is set to 20 by-default in all places), Ilia 2009-11-12 17:20:01 +00:00
Johannes Schlüter a47410d68e PHP 5.3.1RC4 2009-11-12 15:20:34 +00:00
Johannes Schlüter bd92b11df6 Merge: Updated to version 2009.18 (2009r) (Derick) 2009-11-12 15:19:43 +00:00
Johannes Schlüter 5def5aba03 5.3.1RC4 2009-11-12 15:12:16 +00:00
Johannes Schlüter 5aaebd65a4 5.3.1RC4 2009-11-12 15:09:20 +00:00
Johannes Schlüter b8635add77 Fix #50063 (safe_mode_include_dir fails) 2009-11-12 15:05:03 +00:00
Johannes Schlüter 0915cc1302 Back to -dev 2009-11-03 19:16:27 +00:00
Johannes Schlüter bc2f6df355 PHP 5.3.0RC3 2009-11-03 15:36:55 +00:00
Pierre Joye 4fd26968bc - fix lenght for alloc and cpy (Kanwal) 2009-11-03 10:48:12 +00:00
Pierre Joye 915560bb93 - Fixed #50052, Different Hashes on Windows and Linux on wrong Salt size 2009-11-02 20:46:52 +00:00
Pierre Joye df2e5b8d25 - Merge 290129, Fixed bug #49908 (throwing exception in __autoload crashes when interface is not defined) 2009-11-02 18:11:33 +00:00
Pierre Joye e2d2290c0b - Merge 290147, Updated to version 2009.17 (2009q) 2009-11-02 17:56:20 +00:00
Pierre Joye 4f674c6ee4 - Merge 290029, Lower the max upload default to 20 2009-10-28 15:19:32 +00:00
Pierre Joye 5122938742 - Merge revision 289987, Fixed bug #49142 (crash when exception thrown from __tostring()) 2009-10-28 11:08:33 +00:00
Pierre Joye d3c66d56fa - Merge revision 289990, introduce new INI setting max_file_uploads [DOC] added to 5.2 as well 2009-10-28 11:03:36 +00:00
Pierre Joye eb1db15ac3 - Fixed crash in com_print_typeinfo when an invalid typelib is given 2009-10-27 19:16:55 +00:00
Pierre Joye 178a023ce2 - Updated to version 2009.16 (2009p) 2009-10-27 10:50:06 +00:00
Pierre Joye 0234cbb6f8 - #48752 2009-10-27 10:44:11 +00:00
Pierre Joye b13b1c94a6 - #48752, crash during date parsing with invalid date 2009-10-27 10:41:45 +00:00
Pierre Joye ff348d64ee - #49986, fix ICU DLLs path 2009-10-24 19:52:23 +00:00
Johannes Schlüter 70e4bdbbba Back to -dev 2009-10-20 22:02:58 +00:00
Johannes Schlüter b5c273c916 5.3.1RC2 2009-10-20 18:17:22 +00:00
Antony Dovgal cdcfd12108 fix crash on empty doc_root 2009-10-20 12:57:44 +00:00
Pierre Joye 432f0d1380 - Merge: Fix ACL support and add support for ACL for TS SAPI. Be sure to get the impersonated token when the impersonation has been done. Add the SID as part of the key for the cache (so each SID gets its cache and not previous requests run under other SID) 2009-10-19 23:38:55 +00:00
Johannes Schlüter 9fea178a1b Merge 289776: Fix test 2009-10-19 21:51:59 +00:00
Johannes Schlüter 7b06c28ea2 Merge #289581 (Fixed PDORow and PDOStatement crashes when instantiating throught
Reflection (Felipe)
2009-10-19 21:43:34 +00:00
Johannes Schlüter 122d4aee9c Merge NEWS for merged stuff from PHP_5_3 to PHP_5_3_1 2009-10-19 21:16:07 +00:00
Pierre Joye c3cc057418 - Merge: we don't distribute the crt9 dll, don't try to add it 2009-10-19 20:02:05 +00:00
Pierre Joye e9c850b1a3 - Merge: add custom DLL to the package and fix the path to the deps bin (needs absolute path in some cases) 2009-10-19 19:05:58 +00:00
Pierre Joye 6dba114cfd - Merge: Update libsqlite to 3.6.19 2009-10-19 17:11:05 +00:00
Pierre Joye f9333d925c - Merge: improve fix for #49767 and #47627 - make PHP report 'no script' on 404 again 2009-10-19 17:04:44 +00:00
Pierre Joye 2b94eccbd2 - Merge: Updated to version 2009.15 (2009o) 2009-10-19 16:59:40 +00:00
Pierre Joye f937a5ac8d - Merge: Upgraded bundled sqlite to versio 3.6.18 2009-10-15 21:40:36 +00:00
Pierre Joye 60926976a1 - Merge: #49847 2009-10-15 21:36:42 +00:00
Pierre Joye 1a95b4a034 - Merge: fix crash for bug #47627 2009-10-15 21:32:24 +00:00
Pierre Joye c6126625e0 - Merge: Updated to version 2009.14 (2009n) 2009-10-15 21:29:00 +00:00
Pierre Joye c631df654b - Merge: #49809 (time_sleep_until is not available on solaris) 2009-10-15 21:06:51 +00:00
Pierre Joye b62a6be2ac - Merge: - #49855 ^# ^author ^date ^msg ^merge^ 2009-10-15 14:10:03 +00:00
Pierre Joye b40451bb33 - Merge: - #48779, fix another use case where / usage may differ 2009-10-15 13:28:55 +00:00
Johannes Schlüter 0f74febfad svn merge mysql-related fixes
# I hope svn adds some more info in the history/commit mail
2009-10-14 13:51:25 +00:00
Pierre Joye fdd16ecd9b - Merge: Fixed possible crash when calling SQLiteDatabase::{ArrayQuery, SingleQuery} methods using Reflection 2009-10-12 22:37:52 +00:00
Pierre Joye 78cf3608a6 - Merge: fix dictionnary path issues, add functions to define their path [DOC] (approved by RM) 2009-10-12 22:35:36 +00:00
Pierre Joye f7a4997e48 - Merge: fix possible issue in TS environment and fix handle leak (we don't have to do that anymore anyway in 5.3+) 2009-10-12 14:55:50 +00:00
Pierre Joye 25819c72da - Merge: #48779 2009-10-12 14:51:24 +00:00
Pierre Joye 692e2b7d8b - Merge: Updated to version 2009.13 (2009m) 2009-10-12 14:26:47 +00:00
Pierre Joye 22c6c9ac87 - Merge: fix test 2009-10-12 14:23:29 +00:00
Pierre Joye 419ad36db8 - check max colors while loading gd2 palette image (patch by Tomas Hoger) 2009-10-12 10:01:37 +00:00
Felipe Pena 35381b7f40 - Fix compiler warning 2009-10-11 15:39:48 +00:00
Pierre Joye 6425b074be - Merge: Fixed bug #48805 (IPv6 socket transport is not working) 2009-10-10 12:21:08 +00:00
Pierre Joye 3897a8a32a - Merge: Fixed bug #49517 (cURL's CURLOPT_FILE prevents file from being deleted after fclose) 2009-10-10 09:29:34 +00:00
Pierre Joye 957f2e9e5e - Merge: Fixed bug #49517 (cURL's CURLOPT_FILE prevents file from being deleted after fclose) 2009-10-10 09:24:59 +00:00
Pierre Joye 03042693bc - Merge: Fixed bug #49531 (CURLOPT_INFILESIZE sometimes causes warning “CURLPROTO_FILE cannot be set …) 2009-10-10 09:17:01 +00:00
Pierre Joye fc0f16cb5c - Merge: Fixed memleak in tests/lang/engine_assignExecutionOrder_001.phpt 2009-10-10 09:12:58 +00:00
Pierre Joye 36a817b592 - Merge: fix leak 2009-10-09 19:13:33 +00:00
Pierre Joye 04d802a79e - Merge: Fixed certificate validation inside php_openssl_apply_verification_policy 2009-10-09 19:08:56 +00:00
Pierre Joye 362b334456 - Merge: Fixed bug #49627 (error_log to specified file does not log time according to date.timezone) 2009-10-09 19:06:10 +00:00
Pierre Joye a2e7c6d2f0 - Merege: Fix bug #49558 And as Colin mentioned in the bug report, this means date_sunrise() and date_sunset() have been off by 26 seconds in most cases until now 2009-10-09 18:59:14 +00:00
Pierre Joye 1ed8a4d6d6 - Possible fix for bug #49344 on Windows (pdo_mssql fails to connect,throws PDOException SQLSTATE[] (null) (severity 0)) 2009-10-09 18:56:19 +00:00
Pierre Joye 9058ae8ef0 - Merge: fix mem leak 2009-10-09 18:52:59 +00:00
Pierre Joye 1a57cb01e6 - Merge: Fixed bug #49470 (FILTER_SANITIZE_EMAIL allows disallowed characters) 2009-10-09 17:50:17 +00:00
Pierre Joye 883aa84f8a - Merge: Fixed bug #49572 (use of C++ style comments causes build failure) 2009-10-09 17:45:03 +00:00
Pierre Joye 2fc07dcac4 - Merge: long2ip() can return wrong value in a multi-threaded applications 2009-10-09 17:41:29 +00:00
Pierre Joye 1aa6a85609 - Merge: Fixed bug #49630 (imap_listscan function missing) 2009-10-09 17:38:19 +00:00
Pierre Joye e1855006a0 - Merge: fix #49274, filter_var does not accept object without a toString implementation 2009-10-09 17:32:53 +00:00
Pierre Joye 8263990a67 - Merge: Fixed bug #49738 (calling mcrypt after mcrypt_generic_deinit crashes) 2009-10-09 17:28:52 +00:00
Pierre Joye 23dfb5f6f7 - Merge: don't hide early declaration 2009-10-09 17:23:01 +00:00
Pierre Joye 94655dc8d2 - Merge: don't hide early declaration 2009-10-09 17:21:20 +00:00
Pierre Joye 6392009183 - Merge: fix #40013, php_uname() doesnt return nodename (MFH) 2009-10-09 17:15:46 +00:00
Pierre Joye 49873a87aa - Merge: Fixed bug #49182 (PHP CGI always outputs the shebang line), kill unused var 2009-10-09 17:03:56 +00:00
Pierre Joye 65eb7558ba - Merge: Fix #49732, Crashes in fileinfo when corrupted files are given (timestamp fails) 2009-10-09 14:51:25 +00:00
Pierre Joye 6cba66fa78 - Merge: Add missing open_basedir check in posix_mkfifo 2009-10-09 14:46:48 +00:00
Pierre Joye 7772923062 - Merge: Pecl #16842 2009-10-09 14:44:43 +00:00
Pierre Joye 78f24c74c0 - Merge: Make tempnam() return FALSE on error as documented 2009-10-09 14:37:45 +00:00
Pierre Joye 83d52ff5e9 - Merge: Fixed a safe_mode bypass in tempnam() identified by Grzegorz Stachowiak 2009-10-09 14:37:09 +00:00
Pierre Joye d8f010ee63 - Merge: throw some credit around 2009-10-09 14:34:18 +00:00
Pierre Joye b00125dd99 - Merge: Fix for bug #49698 2009-10-09 14:33:38 +00:00
Pierre Joye e7590db152 - Merge: Fixed bug #49483 (preg_replace 'subject' parameter listed as optional) 2009-10-09 14:25:51 +00:00
Pierre Joye cdee41505c - merge: #49464, fix build 2009-10-09 14:22:29 +00:00
Pierre Joye 7e262e737d - Merge: Fixed bug #49447 php engine need to correctly check for socket API 2009-10-09 14:20:17 +00:00
Pierre Joye d12e89e730 - Merge revision 288028, use of the user token by default, and fix for touch and directory on windows 2009-10-09 14:06:35 +00:00
Pierre Joye a0a40fa408 - Merge Fix for #48746, improve fix for junctions/symlink/etc. 2009-10-09 14:05:13 +00:00
Johannes Schlüter 1613a7561c Back to -dev 2009-09-03 23:27:53 +00:00
Johannes Schlüter 4d593727a2 Create a 5.3.1 release branch
# details on process will follow on internals
2009-09-03 21:30:56 +00:00
Pierre Joye 511c923785 - #27051, improve fix on xp/2k3 2009-09-03 19:16:50 +00:00
Dmitry Stogov 4016bfcd71 Fixed bug #46074 (Bus error during running PHP CLI under IRIX 6.5.30) 2009-09-03 14:33:11 +00:00
Sebastian Bergmann 853c6de65b Make invokeArgs() error messages consistent with invoke(). 2009-09-03 14:02:51 +00:00
Pierre Joye 8f8220917e - Fix sanity check for the color index in imagecolortransparent 2009-09-03 09:45:56 +00:00
Pierre Joye a8c40d5b3a - #48746, len includes null already 2009-09-02 22:59:58 +00:00
Pierre Joye 4417646d72 - be sure to get all crt dbg errors in stderr 2009-09-02 20:02:17 +00:00
Ilia Alshanetsky 556dde6a34 Fixed return value to comply with tests 2009-09-02 13:07:44 +00:00
Pierre Joye da9aee9703 - #27051, we need the thread token here, not the process 2009-09-02 01:59:17 +00:00
Ilia Alshanetsky bfd9f29773 Fixed typo 2009-09-02 00:14:46 +00:00
Pierre Joye ddab8be51e - #27051, create process as impersonated user 2009-09-01 22:51:31 +00:00
Pierre Joye ad2bb4bcb1 - fix TS build 2009-09-01 19:41:51 +00:00
Pierre Joye 39178112fc - readdir/scandir entry 2009-09-01 17:53:00 +00:00
Pierre Joye b6882eddf6 - #48746, revert previous about volume. Fix volume support to allow all mounted points (with or without drives) 2009-09-01 17:50:59 +00:00
Pierre Joye 12a7305e21 - #48746, fix regression in readdir/scandir and mounted points or junctions on windows 2009-09-01 17:46:17 +00:00
Antony Dovgal 580c51215f add -g along with -O0 2009-09-01 15:13:02 +00:00
Patrick Allaert 74560ac75e Merging last tests made in HEAD 2009-09-01 13:41:18 +00:00
Jani Taskinen b3a23c7d88 fix typo 2009-08-31 21:19:29 +00:00
Jani Taskinen 6bb0603c4f - Fixed zlib.deflate compress filter to actually accpet level parameter. 2009-08-31 21:18:55 +00:00
Zoe Slattery b964306fd7 add missing skipifs 2009-08-31 19:22:29 +00:00
Antony Dovgal 66990d357c nuke duplicated tests 2009-08-31 15:32:39 +00:00
Ilia Alshanetsky 6a73387877 Fixed bug #49361 (wordwrap() wraps incorrectly on end of line boundaries). 2009-08-31 12:28:46 +00:00
Antony Dovgal fe7e08432e export le_socket from ext/sockets 2009-08-31 08:41:03 +00:00
Zoe Slattery 4cc35aeaaf The last of the 2009 testfest tests 2009-08-30 18:18:50 +00:00
Pierre Joye ceb607af13 - Fixed leak on error in popen/exec (and related functions) 2009-08-30 17:13:45 +00:00
Ilia Alshanetsky 30b7102746 Bug #49391 ldap.c utilizing deprecated ldap_modify_s 2009-08-30 15:33:59 +00:00
Zoe Slattery b08e82a736 More tests from 2009 testfest 2009-08-30 12:19:50 +00:00
Zoe Slattery d84163c639 bc math tests from testfest 2009 2009-08-30 11:10:20 +00:00
Zoe Slattery c0c141d0cf server for ftp tests 2009-08-30 09:31:54 +00:00
Zoe Slattery 6a22ec3eda More tests from 2009 testfest 2009-08-30 09:30:13 +00:00
Zoe Slattery 94039c35b9 Fixed to allow for http etc 2009-08-30 08:18:53 +00:00
Antony Dovgal f97132fe1a fix tests 2009-08-29 19:18:27 +00:00
Pierre Joye 45c58fc449 - Fix #48746, mounted volume support & resolution 2009-08-29 12:21:47 +00:00
Jani Taskinen 99d3fe5a0c - Fix news 2009-08-29 01:16:30 +00:00
andy wharmby 037f617a60 New basic network function tests. Tested on Windows, Linux and Linux 64 bit 2009-08-28 22:46:43 +00:00
Zoe Slattery 0e4ce3bcca More tests from 2009 testfest 2009-08-28 14:31:19 +00:00
Andrey Hristov 9bf747605d Fix for bug#48745
mysqlnd: mysql_num_fields returns wrong column count for mysql_list_fields
2009-08-28 09:30:16 +00:00
Pierre Joye 5b39f5ca24 - fix VC6 build 2009-08-27 14:45:41 +00:00
Andrey Hristov 955a611211 Forgot to save the file. Here comes the entry 2009-08-27 13:26:46 +00:00
Andrey Hristov 67c7a37d9b Fixed bug #49027 (mysqli_options() doesn't work when using mysqlnd) 2009-08-27 13:16:39 +00:00
Andrey Hristov 43d33e8a99 Fix for bug#46614 Extended MySQLi class gives incorrect empty() result 2009-08-27 12:41:14 +00:00
andy wharmby 39fd3a2b3c Fix tests. Add missing SKIPIF sections so test do not run when POSIX extension not available. 2009-08-27 12:21:19 +00:00
Pierre Joye 17a4191575 - Fix for #48746, fix mounted volume and junctions when used from vista or later, they are actually prepended with \??\ 2009-08-27 09:39:01 +00:00
Rasmus Lerdorf b73fe4a9b6 This needs to be larger to avoid an overflow on the bit-shifting in this function 2009-08-27 05:05:42 +00:00
Pierre Joye 137b9210f2 - fix #49372, segfault in php_curl_option_url 2009-08-26 22:24:10 +00:00
Pierre Joye 5d017c3e2d - silent warning (fix for #28038) 2009-08-26 21:59:54 +00:00
Pierre Joye 43b4d73dc2 - update 2009-08-26 20:58:06 +00:00
Pierre Joye 0c366503a6 - fix #48746, regression with file operaiton on path with junctions 2009-08-26 20:44:05 +00:00
Pierre Joye 46ba563fe1 - update 2009-08-26 20:03:49 +00:00
Pierre Joye bae3df7505 - fix #44683, popen crashes when an invalid mode is passed (works on 2k8/vista/win7) 2009-08-26 19:57:01 +00:00
Pierre Joye 48d031aa6e - fix build 2009-08-26 19:17:32 +00:00
Zoe Slattery 1c98e49afd Test from 2009 testfest 2009-08-26 17:17:58 +00:00
Pierre Joye c7167ced0b - fix test and use __DIR__ as usual 2009-08-26 16:07:05 +00:00
Ilia Alshanetsky 19f11e401d Fixed variable clobbering 2009-08-26 15:29:06 +00:00
Pierre Joye b4b9615c0b - add win32 version 2009-08-26 14:09:45 +00:00
Dmitry Stogov 60ef4a1ef6 Fixed bug #47273 (Encoding bug in SoapServer->fault) 2009-08-26 14:05:48 +00:00
Pierre Joye 9fe6294cdf - fix test 2009-08-26 09:59:20 +00:00
Pierre Joye bea1685a21 Improved readlink, supress \??\ and use the drive syntax only 2009-08-25 23:51:04 +00:00
Pierre Joye ef582b5397 - update news for my last TSRM fixes 2009-08-25 23:22:52 +00:00
Andrey Hristov 2dcfcf7387 MFH: fix of the fix 2009-08-25 14:32:10 +00:00
Andrey Hristov 27cbcc6078 MFH:
Fix bug#48198 error: 'MYSQLND_LLU_SPEC' undeclared
Possibly fix also :
Bug #48780      mysqlnd compile failure
Bug #46952      mysqlnd compile failure with suncc
2009-08-25 14:25:01 +00:00
Ilia Alshanetsky cc8cacd80e Fixed a compiler warning (variable clobbering) 2009-08-25 12:47:28 +00:00
Pierre Joye eeb9429de5 - be sure that the directory flag is set when we save a path in the cache 2009-08-25 09:32:31 +00:00
Pierre Joye 056f0aea30 - fix #49047, touch may fail on directory 2009-08-25 09:16:53 +00:00
Pierre Joye 4c85f48c89 - fix test when part of the path is a symlink 2009-08-25 00:22:11 +00:00
Pierre Joye 3db4fe36a4 - fix test 2009-08-25 00:14:23 +00:00
Pierre Joye ebd24fc10f - sigh. that too (separate fix). 2009-08-24 20:33:36 +00:00
Pierre Joye 063196c8aa - that part was for a separate fix 2009-08-24 20:32:11 +00:00
Pierre Joye 55d26cab56 - split atime and mtime 2009-08-24 20:27:52 +00:00
Pierre Joye 39ba13c3ad - fix test 2009-08-24 19:19:43 +00:00
Pierre Joye 64918d5168 - fix test 2009-08-24 18:44:59 +00:00
Pierre Joye 30c4b8ff29 - fix test 2009-08-24 18:43:21 +00:00
Ilia Alshanetsky 64b3f7d45b Don't clober variables 2009-08-24 18:40:13 +00:00
Pierre Joye e877e1280c - fix object dir usage (ie: relative path called from a symlinked dir), also fix nmake test for similar cases 2009-08-24 14:18:19 +00:00
Rafael Machado Dohms 609a573b23 Adding tests for imagecolorallocatealpha 2009-08-24 02:50:19 +00:00
Mikko Koppanen e4c11010f1 Fixes a memory leak in ssl streams. The context was not properly freed 2009-08-22 02:31:23 +00:00
Antony Dovgal 193bbbbd59 fix build broken by the fix for bug #49306 2009-08-21 07:46:43 +00:00
Jani Taskinen 767abb9b66 - Fixed bug #49286 (php://input (php_stream_input_read) is broken) 2009-08-20 12:40:15 +00:00
Jani Taskinen 5e733571b3 - WS + CS + sync 2009-08-20 12:17:32 +00:00
Ilia Alshanetsky 019f4f2c22 Fixed bug #49306 (inside pdo_mysql default socket settings are ignored). 2009-08-20 12:13:38 +00:00
Jani Taskinen e1f42c3bbb - Fixed bug #49289 (bcmath module does not compile with phpize configure). 2009-08-20 11:19:20 +00:00
Pierre Joye 05f86b6edb - revert fix for #43327, it breaks system&co functions 2009-08-20 09:03:19 +00:00
Pierre Joye 897083659e - fix NEWS 2009-08-19 18:45:13 +00:00
Pierre Joye b64e5e6bd0 - fixed #43327, wrong return value from mail(), if sendmail_path is wrong 2009-08-19 18:43:46 +00:00
andy wharmby e90f0eda2d New basic test for md5(). Tested on Windows, Linux and Linux 64 bit 2009-08-19 08:39:33 +00:00
Stanislav Malyshev d6ba6c69fb fix crash when unexpectedly passed by-ref parameter is modified 2009-08-18 20:51:49 +00:00
Garrett Serack 827469c94e - Fixed bug #28038 (Sent incorrect RCPT TO commands to SMTP server) 2009-08-18 18:58:33 +00:00
Pierre Joye 26f27ad7a8 - fix NEWS 2009-08-18 15:18:50 +00:00
Garrett Serack ad3f197c55 added missing NEWS entry for bug #49223 2009-08-18 14:38:41 +00:00
Ilia Alshanetsky e6fd4c1fc0 NULL the value after free 2009-08-18 12:44:32 +00:00
Dmitry Stogov f1ab855cfe Fixed ability to call user functions from user opcodes without recursion 2009-08-18 10:12:32 +00:00
Stanislav Malyshev a515259047 cleanup parameter parsing 2009-08-18 00:41:43 +00:00
andy wharmby e9a960bba6 New str_replace() tests. All tested on Windows, Linux and Linux 64 2009-08-17 22:41:30 +00:00
Stanislav Malyshev fa2310b177 fix parameter parsing for SNMP 2009-08-17 22:15:18 +00:00
Garrett Serack 6cec8d8ed3 - Fix for bug #49223 Inconsistency using get_defined_constants(true) 2009-08-17 21:28:22 +00:00
Jani Taskinen 918dea038b - Fix news 2009-08-17 20:14:25 +00:00
Dmitry Stogov b06436f171 Fixed bug #49144 (import of schema from different host transmits original authentication details) 2009-08-17 18:23:48 +00:00
Jani Taskinen 5ae549c8fd - Fixed bug #49236 (Missing PHP_SUBST(PDO_MYSQL_SHARED_LIBADD)). 2009-08-17 17:57:40 +00:00
Jani Taskinen db53d49623 - Fixed bug #49248 by fixing bug #48994 properly 2009-08-17 17:30:32 +00:00
Jani Taskinen 46bd9ed597 - Try disabling zlib.output_compression always for images. (zlib extension might be compiled as shared and not same time as the main PHP binary) 2009-08-17 16:54:39 +00:00
Ilia Alshanetsky 229212c5ca Fixed typo 2009-08-17 14:50:34 +00:00
Derick Rethans 718b7d160d - Updated to version 2009.12 (2009l) 2009-08-17 14:46:58 +00:00
andy wharmby 6c56fd6898 New basic tests for uniqid(). Tested on Windows, Linux and Linux 64 bit 2009-08-17 14:22:02 +00:00
andy wharmby 1cfc27bb8c New basic string tests - includes back-porting a few existing tests back to 5.2. All tested on Windows, Linux and Linux 64 2009-08-17 10:37:30 +00:00
Dmitry Stogov f694c09a35 Fixed bug #49269 (Ternary operator fails on Iterator object when used inside foreach declaration). (Etienne, Dmitry) 2009-08-17 07:40:43 +00:00
Ilia Alshanetsky 4687f6e0ba MFB: Added missing sanity checks around exif processing. 2009-08-16 14:32:32 +00:00
Felipe Pena 88056c6bac - Improved param. parsing for ldap_read(), ldap_search() and ldap_list() 2009-08-15 00:52:31 +00:00
Gwynne Raskind c336c2e5d0 fix broken test (spurious tab characters caused run-tests to spaz) 2009-08-14 09:44:45 +00:00
Dmitry Stogov 85560842c2 Fixed crash in usort() and uasort() in case user comparison function modifyes th
e array.
2009-08-14 06:20:21 +00:00
Rasmus Lerdorf 5ca166b1d2 FIx test after Stas' explode() fix 2009-08-14 01:42:11 +00:00
Etienne Kneuss 6e164aa35a Fix several recursion problems when var_dump'ing self-referencing objects 2009-08-13 22:07:05 +00:00
Felipe Pena a8604e2c20 - Fix ZTS build 2009-08-13 20:10:18 +00:00
Stanislav Malyshev e52517d610 standardise and clean up string functions parameter parsing 2009-08-13 06:44:50 +00:00
Christopher Jones de65a02f1c refactor & WS for local test config change 2009-08-12 14:54:16 +00:00
Scott MacVicar ce24f04694 Fix build on platforms where crypt isn't always available 2009-08-12 09:18:41 +00:00
Scott MacVicar fbcfcfd8e6 Use the correct tense for the NEWS entries 2009-08-12 08:40:05 +00:00
Sriram Natarajan c35177b6a4 - Simplify default flags for Sun C compiler. 2009-08-11 23:45:35 +00:00
Scott MacVicar a090cd733a Fix BC break in mime_content_type() 2009-08-11 23:05:13 +00:00
Stanislav Malyshev b73ac1a57a fix potential memory issue on serialization
# When internal class uses zend_mangle_property_name it's malloc()
# so it should be freed with free()
2009-08-11 22:46:07 +00:00
Scott MacVicar 777fb4f911 Update NEWS entry with some stuff I missed. 2009-08-11 22:45:21 +00:00
Scott MacVicar f8d8723ff1 Update libsqlite to 3.6.17. 2009-08-11 22:22:21 +00:00
Scott MacVicar 050653466f Merge chanes from head to improve DNS on OSX and allow usage of bind9 stuff with the bind8 compatibility layer. 2009-08-11 22:07:35 +00:00
Scott MacVicar 6ffe4b2eff We should check /usr/local/include last 2009-08-11 21:40:15 +00:00
Pierre Joye 73fbaa9ee0 - remove double include 2009-08-11 17:08:23 +00:00
Pierre Joye f578a07128 - fix news 2009-08-11 15:12:38 +00:00
Pierre Joye 33a93474df - fixed bug #49072, feof never returns true for damaged file in zip 2009-08-11 15:12:00 +00:00
Scott MacVicar 94976f4694 Search /usr/include too for those wanting to use a system PCRE. 2009-08-11 12:03:29 +00:00
David Soria Parra 495a5ab005 Add actions for the gitclean target. 2009-08-11 02:21:09 +00:00
Rasmus Lerdorf 5f962f0e38 Oops, didn't mean to remove the -0 here 2009-08-10 23:18:07 +00:00
Kalle Sommer Nielsen 4f3d67ea89 Don't build sqlite as threadsafe if we are doing an NTS build 2009-08-10 16:58:53 +00:00
Etienne Kneuss 4881a9cff4 Fix endless recursion of var_dump() over self-referencing closures 2009-08-10 15:18:13 +00:00
Pierre Joye 80696a6f77 - fix and improve dns' AAAA support on windows 2009-08-10 08:05:11 +00:00
Rasmus Lerdorf 4a607c147d Tweak a few tests that failed on OSX 2009-08-10 06:53:49 +00:00
Ilia Alshanetsky ecfe3ae047 BFN 2009-08-09 15:36:17 +00:00
Rasmus Lerdorf a2c564b9e6 Make these socket tests less Linux-specific 2009-08-09 14:50:51 +00:00
Rasmus Lerdorf ecb9a94472 The system error here may not be "Filename too long". On OSX, for example,
it is "Invalid ioctl" in this case.
2009-08-09 14:20:54 +00:00
Ilia Alshanetsky 3189707681 Fixed bug #49193 (gdJpegGetVersionString() inside gd_compact identifies wrong type in declaration) 2009-08-09 13:15:45 +00:00
Rasmus Lerdorf d02332b43f Skip this test on osx because ceil(-0.5) doesn't return -0 like
everywhere else because of weird optimizations.
2009-08-09 05:16:17 +00:00
Andi Gutmans 4f34f5b0e3 - MFH 2009-08-09 04:46:30 +00:00
Rasmus Lerdorf 53349c7769 Doing a strnatcasecmp(chr(128),chr(255)) is completely non-sensical.
Logically one might think that chr(128) would collate before chr(255) except
this is a case-insensitive comparison and internally we toupper() both args.
toupper(chr(128)) is 128.  There is no upper-case equivalent of this char.
toupper(chr(255)) is 120 so chr(255) collates before chr(128) in this
case-insensitive comparison.  And these are rather bogus characters to feed
to a natsort test anyway.
2009-08-08 14:48:47 +00:00
Rasmus Lerdorf 124a0a5a69 Restore intra-string whitespace collapsing broken in the previous change. 2009-08-08 14:39:34 +00:00
Pierre Joye 4668ca80b5 - [DOC] Fixed #49183 patch for VC6, NAPTR is only available in VC9+ build 2009-08-08 13:01:13 +00:00
Rasmus Lerdorf 2ee8b65e4e Oops, true/false are not defined on Linux. They are on OSX. 2009-08-07 17:32:31 +00:00
Rasmus Lerdorf 934a9037c8 Only skip leading 0's - fixes a test I broke a while ago 2009-08-07 17:14:19 +00:00
Jani Taskinen d5fd4ecc48 - Generated files 2009-08-07 15:45:56 +00:00
Jani Taskinen 6e18b9718d - Fixed bug #48719 parse_ini_*(): scanner mode is not checked for sanity) 2009-08-07 15:44:37 +00:00
Jani Taskinen 7af570b685 - Generated files.. 2009-08-07 14:22:49 +00:00
Jani Taskinen 46505193b2 - Fixed bug #48660 (parse_ini_*(): dollar sign as last character of value fails) 2009-08-07 14:21:38 +00:00
Pierre Joye 35ad8e6c46 - Fixed #49183, dns_get_record does not return NAPTR records 2009-08-07 13:31:09 +00:00
Jani Taskinen 46a94ebaa6 - Fix test 2009-08-06 13:54:21 +00:00
Rasmus Lerdorf 6704038c73 More eol crap 2009-08-06 13:31:03 +00:00
Rasmus Lerdorf 97b1247f2f Fix more tests messed up by svn 2009-08-06 13:26:43 +00:00
Rasmus Lerdorf 50957fe3a5 Fix test 2009-08-06 13:08:13 +00:00
Jani Taskinen d35dc78dd3 - Remove duplicate section 2009-08-06 12:40:36 +00:00
Ilia Alshanetsky 92cb2b634f Make test more generic 2009-08-06 12:23:35 +00:00
Jani Taskinen a93fef41c2 - Fix CS and remove extra strlen() call 2009-08-06 11:11:15 +00:00
Jani Taskinen b124f39010 - Missing svn:ignore 2009-08-06 11:05:07 +00:00
Jani Taskinen dc74c5136e - Restore PHP-5.2 behaviour when passing null inside object scope to get_class() 2009-08-06 11:02:25 +00:00
Rasmus Lerdorf 889e8990a2 The user argument cannot be NULL here - fixes 2 tests 2009-08-06 10:56:00 +00:00
Scott MacVicar c54f6df978 Fix bug #48575 - Use dlopen() just like all the other *nixes instead of OSX specific code. 2009-08-06 01:33:54 +00:00
Scott MacVicar af5df4c813 Change dns.h to php_dns.h, part of my dns cleanup 2009-08-05 23:20:17 +00:00
Kalle Sommer Nielsen d46ca6d3b5 MFH: Fixed compiler warnings in ext/date 2009-08-05 21:25:39 +00:00
Scott MacVicar f1521e18c0 res_search is already checked within ext/standard/config.m4
also check for arpa/nameser_compat.h, OSX puts some old defines in there (not used yet)
2009-08-05 20:01:33 +00:00
Ilia Alshanetsky 5a40aa7217 Minor tweak 2009-08-05 19:45:13 +00:00
andy wharmby 8275f0d254 Basic test for is_resource() and isset() functions. tested on Windows, Linux and Linux 64 2009-08-05 16:10:46 +00:00
andy wharmby e0b0c49ae3 Add new use-case to parse_str() test. Tested on Windows, Linux and Linux 64 2009-08-05 08:54:27 +00:00
andy wharmby 3eaa521ed9 Fix tests 2009-08-04 23:16:25 +00:00
Jani Taskinen b312b3af2e - Revert bad fix for bug #49122 and only enable this when mysqlnd is used 2009-08-04 14:49:33 +00:00
Jani Taskinen b053fb5af6 - Add test (yes, it fails still :) 2009-08-04 12:16:40 +00:00
Jani Taskinen 5d757fddf5 - Fixed bug #48608 (Invalid libreadline version not detected during configure) 2009-08-04 11:20:49 +00:00
Jani Taskinen ca8a41215f - Retouch without my path in the #line directives 2009-08-04 11:15:37 +00:00
Antony Dovgal bb8d9fa656 cosmetic fix 2009-08-04 09:27:15 +00:00
Antony Dovgal 307a2259e9 fix memleak and possible segfault in HTTP fopen wrapper 2009-08-04 09:24:48 +00:00
Jani Taskinen 35f0411352 - Generated files 2009-08-04 02:58:29 +00:00
Jani Taskinen d03720480f - Fixed bug #48768 (parse_ini_*() crash with INI_SCANNER_RAW) 2009-08-04 02:56:26 +00:00
Jani Taskinen a845f681bb - Fix title 2009-08-04 02:55:24 +00:00
Jani Taskinen 206cc46aab - Generated files 2009-08-04 02:35:38 +00:00
Jani Taskinen 1c2b8b6abb - cosmetics 2009-08-04 02:34:32 +00:00
Jani Taskinen ea98d7a72e - Fixed bug #49056 (parse_ini_file() regression in 5.3.0 when using non-ASCII strings as option keys) 2009-08-04 02:34:04 +00:00
andy wharmby 4d8d8d73db New basic tests for get_defined_constants(), get_loaded_extensions() and get_resource_type() functions. Tested on Windows, Linux and Linux 64 bit 2009-08-03 23:12:43 +00:00
andy wharmby cfc417af37 Add missing SKIPIF sections to tests 2009-08-03 22:40:58 +00:00
Felipe Pena 6bebbf1086 - Fixed bug #49095 (proc_get_status['exitcode'] fails on win32) 2009-08-03 19:05:56 +00:00
Jani Taskinen 08f8621a9f - Fixed bug #48994 (zlib.output_compression does not ouput HTTP headers when set to a string value)
# also fixes bug #35936 (ini.zlib.output-compression Documentation :)
2009-08-03 18:15:30 +00:00
Felipe Pena d744463d33 - CS 2009-08-03 15:58:18 +00:00
Andrey Hristov cac5325aac test 2 2009-08-03 14:50:10 +00:00
Andrey Hristov af22257ba4 test 2009-08-03 14:46:11 +00:00
Felipe Pena 80ec45861a - Improved. No ugly copy. (Tony) 2009-08-03 13:26:15 +00:00
Felipe Pena 1648ab5750 - Re-fix stream_is_local() memory leaks 2009-08-03 13:16:24 +00:00
Jani Taskinen 952a193f94 - Fixed bug #48400 (imap crashes when closing stream opened with OP_PROTOTYPE flag) 2009-08-03 13:02:53 +00:00
Jani Taskinen e3d23b959f - Fixed bBug #48873 (Using both --with-libedit and --with-readline cause unknown option warning)
# This isn't worth of NEWS entry, it's just cosmetic
2009-08-03 11:21:44 +00:00
Jani Taskinen 96498c468c - These tests fail if mbstring is enabled, not because of bad libc.. 2009-08-03 10:23:23 +00:00
Uwe Schindler 847f637497 MFH: Fix bug #46020: With Sun Java System Web Server 7.0 on HPUX, #define HPUX 2009-08-03 10:13:49 +00:00
Antony Dovgal 24086c42b6 revert bogus memleak fix causing Valgrind to scream 2009-08-03 08:45:28 +00:00
Rasmus Lerdorf 12bad6796f Fix a few more tests 2009-08-03 05:17:53 +00:00
Rasmus Lerdorf f42081c6a2 Given that we have a DB connection by the time we get here,
mysql_affected_rows() cannot return false.
2009-08-03 04:57:31 +00:00
Rasmus Lerdorf 8af64e6f34 Fix broken json tests in all branches 2009-08-03 04:01:57 +00:00
Rasmus Lerdorf 7e32cc59f7 Give this test more headroom since it needs to allocate a 90M block 2009-08-02 23:08:21 +00:00
Rasmus Lerdorf 1a6cda905a Fix test on 32-bit 2009-08-02 22:37:07 +00:00
Etienne Kneuss 8fd8c65df6 Addref on clone as well 2009-08-02 21:21:46 +00:00
Antony Dovgal 9a7bf0436a fix test 2009-08-02 20:49:20 +00:00
Greg Beaver d6a608f7e1 fix Bug #43857 2009-08-02 19:11:15 +00:00
Jani Taskinen 4397aa9881 - More and more missing svn:ignore entries. 2009-08-02 01:48:27 +00:00
Jani Taskinen 8c88903798 - More missing svn:ignore entries 2009-08-02 01:16:41 +00:00
Jani Taskinen fb61eaf34a - Missing svn:ignore 2009-08-02 01:10:26 +00:00
Jani Taskinen 7b411d7cdf - Fixed bug #49122 (undefined reference to mysqlnd_stmt_next_result on compile with --with-mysqli and MySQL 6.0) 2009-08-02 01:07:38 +00:00
Jani Taskinen 938c1230df - Add missing svn:ignore 2009-08-02 00:27:51 +00:00
Felipe Pena 96d24a59e5 - Fixed paths 2009-08-01 23:26:02 +00:00
Felipe Pena 085067a9aa - Fixed bug #49125 (Error in dba_exists C code)
patch by: jdornan at stanford dot edu
2009-08-01 23:10:11 +00:00
Felipe Pena c75f162165 - Fixed ReflectionClass::getStaticProperties() to do not return the private properties from parent class;
behavior already adopted in ReflectionClass::getDefaultProperties() and ReflectionClass::getProperties().
2009-08-01 20:44:00 +00:00
Felipe Pena ade24c7e35 - Fixed bug #49132 (posix_times returns false without error)
patch by: phpbugs at gunnu dot us
2009-08-01 18:22:31 +00:00
Felipe Pena 8ad9bd1930 - Fixed tests 2009-08-01 15:46:50 +00:00
Derick Rethans e4e7e2b8ee - Added a function to print all CVs from the local scope. 2009-08-01 12:55:36 +00:00
Jani Taskinen be6338014a - Fixed bug #43510 (stream_get_meta_data() does not return same mode as used in fopen) 2009-08-01 03:17:31 +00:00
Jani Taskinen adf8f72f14 - Fixed bug #49092 (ReflectionFunction fails to work with functions in fully qualified namespaces) 2009-08-01 01:45:22 +00:00
Jani Taskinen 0b03346bf8 - Added test for bug #49074 2009-08-01 01:01:43 +00:00
Jani Taskinen edbf332cea - Fixed bug #49074 (private class static fields can be modified by using reflection) 2009-08-01 00:48:04 +00:00
Rasmus Lerdorf 8608857c1a Fix bug #48880
The ini entry was being corrupted because it wasn't being set
on the ACTIVATE and DEACTIVATE stages.
2009-07-31 21:09:45 +00:00
Garrett Serack f56d6b67b5 - Updated fix for bug #48911 (embed sapi misses SAPI_API)
#- Windows didn't need SAPI_API
2009-07-30 20:20:56 +00:00
Felipe Pena f8ee7db001 - Fixed bug #49108 (2nd scan_dir produces seg fault) 2009-07-30 12:06:40 +00:00
Jani Taskinen 96a053288f - Fixed compile failure with older openssl libs (< 0.9.8), fixes bug #49012 2009-07-30 11:32:08 +00:00
Jani Taskinen 10a7066591 - Fix test 2009-07-30 10:53:04 +00:00
Stanislav Malyshev 9fd8469e94 fix for bug #49000 2009-07-30 05:01:53 +00:00
Kalle Sommer Nielsen fa09704cea Test case for bug #42434 2009-07-30 03:54:27 +00:00
Felipe Pena b16441622e - Added missing entries from me 2009-07-30 00:18:48 +00:00
Felipe Pena 99013d8321 - Fixed memleak in stream_is_local() 2009-07-29 19:09:17 +00:00
Greg Beaver 93054e9b38 oops, released as beta instead of stable, Gwynne: svn rm tags/RELEASE_2_0_0 fails, perhaps this can be allowed? 2009-07-29 16:29:30 +00:00
Felipe Pena 9e253ac6e7 - Fixed memleak on Phar::mungServer() 2009-07-29 16:17:57 +00:00
Derick Rethans 24b973cafc - Fixed bug #45554 (Inconsistent behavior of the u format char). 2009-07-29 15:34:59 +00:00
Johannes Schlüter 3e0d13859a Remove .project files (doesn't exist in trunk) 2009-07-29 13:51:52 +00:00
Ilia Alshanetsky 06a2acc527 Fixed bug #45141 (setcookie will output expires years of >4 digits). 2009-07-29 13:44:16 +00:00
Greg Beaver e29bccaae2 make phar tests pass in php 5.2, prepare for release of pecl/phar 2.0.0, merge Gwynne's TSRM fix to phar_object.c to other branches 2009-07-29 10:14:04 +00:00
Greg Beaver 5c4609021f sync run-tests.php with revision 286499 changes making php 6 tests with EXPECTF that can have arbitrary binary data in output work 2009-07-29 10:06:55 +00:00
Jani Taskinen 4fbc6a54ec - Fix news 2009-07-29 09:10:52 +00:00
Moriyoshi Koizumi 7ce2bff511 * Fix bug #48645 (mb_convert_encoding() doesn't understand hexadecimal html-entities) 2009-07-29 04:44:08 +00:00
Stanislav Malyshev 9e445b043b report fix for bug #49065 2009-07-29 00:18:19 +00:00
Stanislav Malyshev d1a16fc86d fix extension functions disabling (bug #49065) 2009-07-29 00:17:10 +00:00
Hannes Magnusson cc23b8d600 MFH: Fixed bug #44144 & add test 2009-07-28 22:25:31 +00:00
Jani Taskinen f48cab06ff - Fixed bug #48971 (Missing ZEND_NS_NAMED_FE macro) 2009-07-28 21:12:42 +00:00
Jani Taskinen 907763a20a - Fixed bug #48911 (embed sapi misses SAPI_API) 2009-07-28 21:07:43 +00:00
Kalle Sommer Nielsen b5b8303194 Fixed bug #42434 (ImageLine w/ antialias = 1px shorter)
- patch by wojjie at gmail dot com
2009-07-28 20:35:06 +00:00
Sriram Natarajan 34d8ee27cc - 48182 ssl handshake fails during asynchronous socket connection 2009-07-28 19:28:08 +00:00
Jani Taskinen 48a514673a - Skip some tests in 32bit systems, add cleanups where missing 2009-07-28 19:16:02 +00:00
Derick Rethans d936dd1802 - Updated to version 2009.11 (2009k) 2009-07-28 15:25:16 +00:00
Rasmus Lerdorf ee01362c98 Get rid of this platform-specific test 2009-07-28 14:56:08 +00:00
Dmitry Stogov ff766c1de2 Fixed bug #48912 (Namespace causes unexpected strict behaviour with extract()) 2009-07-28 12:35:27 +00:00
Antony Dovgal 421b6e0f2c configure dependency has to be optional as well 2009-07-28 08:59:08 +00:00
Antony Dovgal 75fc702162 fix segfault in session/tests/031.phpt by adding optional extension
dependency (php_hash_hashtable has to be initialized when setting
session.hash_function)
2009-07-28 08:54:23 +00:00
Takeshi Abe 59ff212783 added test for #43073 2009-07-27 22:11:43 +00:00
Takeshi Abe 366c261cce MFH: fixed #48732 (TTF Bounding box wrong for letters below baseline) and #48801 (Problem with imagettfbbox) 2009-07-27 15:06:28 +00:00
Felipe Pena 28add3cbf3 - MFH: Cosmetic changes 2009-07-27 14:11:53 +00:00
Jani Taskinen 2539da79ba - HEAD and PHP_5_2 have it like this, PHP_5_3 should not be different! 2009-07-27 09:23:06 +00:00
Kalle Sommer Nielsen 82cfb15677 Fixed bug #48872 (string.c: errors: duplicate case values) (Only in PHP_5_3) 2009-07-27 07:14:40 +00:00
Scott MacVicar 87dbefa03b MFH: Add error constant when json_encode detects an invalid UTF-8 sequence. 2009-07-27 03:43:38 +00:00
Felipe Pena 837732acc5 - Fix ZTS build 2009-07-26 23:44:59 +00:00
Jani Taskinen e2d044db40 - Regenerated 2009-07-26 23:22:27 +00:00
Jani Taskinen 8877a37f3e - Fixed bug #49064 (--enable-session=shared does not work: undefined symbol:
php_url_scanner_reset_vars). (Jani)

# Note: This does not exist in PHP_5_2. Merged there as well to keep these files synced.
2009-07-26 23:20:34 +00:00
Jani Taskinen ae492897c6 - Removed unused code (replaced long time ago by url_scanner_ex.* 2009-07-26 22:59:46 +00:00
Antony Dovgal d132b9985d fix test 2009-07-26 19:59:04 +00:00
Antony Dovgal 6d04f1a141 fix test 2009-07-26 19:53:23 +00:00
Antony Dovgal 3af4a22a3c fix test 2009-07-26 19:51:24 +00:00
Antony Dovgal 2fffc2b06c fix test 2009-07-26 19:45:38 +00:00
Rasmus Lerdorf 0e2af69d55 Not binary 2009-07-26 19:29:11 +00:00
Ilia Alshanetsky 899cb30275 Fixed bug #49026 (proc_open() can bypass safe_mode_protected_env_vars
restrictions).
2009-07-26 15:14:18 +00:00
Greg Beaver 1d50248937 make cache_list tests pass in php 6 2009-07-26 03:07:23 +00:00
Greg Beaver e8d80c8bfd fix buildFromIterator with filesystem iterator in php 6 2009-07-26 02:43:14 +00:00
Greg Beaver 96dd763df4 fix generation of phar.phar in php 6, fix remaining tests broken by PHP 6 (and not by spl/other stuff in php6) 2009-07-26 02:18:50 +00:00
Rasmus Lerdorf a37d7529ba The test for bug #46739 doesn't actually need the remote
responder, so get rid of the skipif in PHP 5, and it was
broken in PHP 6 because the keys in the curl_info array 
were not unicode.  All internally-generated arrays should
have unicode keys.
2009-07-26 02:12:38 +00:00
Greg Beaver 66908185b7 fix basic phar test issues, failing tests phar_oo_009.phpt and phar_buildfromiterator10.phpt are due to bugs in Spl 2009-07-26 01:24:12 +00:00
Greg Beaver 732f4af082 re-organize slightly, fix more php6-only compile warnings in php_stream_copy_to_mem 2009-07-26 01:03:47 +00:00
Greg Beaver 571dfc1e49 fix zip front controller tests for php6 2009-07-26 00:39:40 +00:00
Greg Beaver 39125fdd47 fix tar front controller tests for php6 2009-07-26 00:35:17 +00:00
Greg Beaver 7761a39314 fix more tests for php6 2009-07-26 00:28:50 +00:00
Greg Beaver cfbd6d852f more php6 fixes for phar, fix more tests 2009-07-25 23:45:45 +00:00
Kalle Sommer Nielsen 42afb1f209 BFN #48189 2009-07-25 23:40:22 +00:00
Kalle Sommer Nielsen 310bfadf3c Fixed bug #48189 (ibase_execute error in return param) 2009-07-25 23:37:47 +00:00
Jani Taskinen bc8155d737 - Fix tests to be more comptatible AND to test what they are supposed to test 2009-07-25 22:20:18 +00:00
Felipe Pena badd102c83 - Opss, fix the fix... 2009-07-25 21:56:31 +00:00
Felipe Pena 7c30b3c2dc - Fix test 2009-07-25 21:52:33 +00:00
Rasmus Lerdorf 5471bd7f6a Fix dumb typo in the skipif 2009-07-25 21:37:04 +00:00
Jani Taskinen 555b177c83 - Fix this again :) 2009-07-25 21:07:02 +00:00
Jani Taskinen 1f0c710ef2 - Add missing EXPERIMENTAL note (this thing REALLY is experimental at best..) 2009-07-25 20:58:51 +00:00
Jani Taskinen 776cb8a669 - Fixed bug #48637 ("file" wrapper is overwritten when using --with-curlwrappers)
# Also fixes bug #48603, basically same issue.
2009-07-25 20:44:19 +00:00
Felipe Pena 57140f7db0 - Making Valgrind happy 2009-07-25 20:39:01 +00:00
Derick Rethans ee084018e7 - Updated to version 2009.11 (2009k) 2009-07-25 15:14:28 +00:00
Jani Taskinen 5e22b47d05 - Fix bad environment usage 2009-07-25 14:52:52 +00:00
Jani Taskinen 1ca46f5ddd - Fix test when responder is something like lighttpd 2009-07-25 14:49:17 +00:00
Jani Taskinen 57d04afff0 - Fix test 2009-07-25 14:20:38 +00:00
Jani Taskinen 4f760d11f8 - Fixed bug #49052 (context option headers freed too early when using --with-curlwrappers) 2009-07-25 13:00:25 +00:00
Jani Taskinen ee992d9ff7 - Fix tests .oO(why are there so many things broken in this branch..?) 2009-07-25 00:43:42 +00:00
Jani Taskinen dad7c68b27 - Fix test 2009-07-25 00:35:25 +00:00
Greg Beaver 7d114c2e7f merge from HEAD changes to test 2009-07-24 23:55:49 +00:00
Greg Beaver e8756a3c3c begin work on making phar php6-ready 2009-07-24 23:53:24 +00:00
Moriyoshi Koizumi 4390903e75 - MFH (using svn merge; it seems I won't need to repeat the commit message anymore) 2009-07-24 23:48:58 +00:00
Greg Beaver aa65955c8c update test to work in php 6 2009-07-24 22:09:36 +00:00
Greg Beaver 96740db9ab fix PHAR_ARG_INFO #define to work with PHP major versions > 5 2009-07-24 21:27:51 +00:00
Jani Taskinen 2d549b7bdf - Fixed bug #48835 (Deprecated php.ini options in old php.inis makes "make test" to fail) 2009-07-24 20:24:12 +00:00
Jani Taskinen d6091b2521 - Fix test 2009-07-24 19:51:55 +00:00
Jani Taskinen 4892c04168 - Missing svn:ignore 2009-07-24 19:44:07 +00:00
Greg Beaver cd23986a7a fix --CLEAN-- of all.phpt, remove unnecessary check in phar_convert_again.phpt, and fix signature generation and checking for zip to also include central directory up to the signature, implement better check for end-of-zip at signature verification 2009-07-24 19:40:41 +00:00
Greg Beaver d68cc96ebd merge unmerged changes between branches, remove unnecessary test for zip signature failure in badparameters.phpt 2009-07-24 17:07:05 +00:00
Derick Rethans fb5d7e4748 - Added - to the list of "unsafe" characters so that the pecl dir can have the
- character in the name.
2009-07-24 16:30:48 +00:00
Greg Beaver e1962da708 fix minor memory leak 2009-07-24 16:21:40 +00:00
Greg Beaver 42e0e5dfb7 fix signature generation/validation for zip archives by phar extension, fix a few edge cases where memory was leaked on error conditions by missing efree() 2009-07-24 15:42:17 +00:00
Rafael Machado Dohms f7873d0aee Adding tests for imagesetthickness, basic and errors for both params, and complementing imagetruecolortopalette with out of bound params 2009-07-24 03:06:05 +00:00
Jani Taskinen b991dfdb1f - Fixed tests to be more portable 2009-07-23 19:06:56 +00:00
Jani Taskinen cce5a75b26 - Add missing svn:ignore property 2009-07-23 17:38:03 +00:00
Greg Beaver 115e370d6e fix PHP Bug #48377: error message unclear on converting phar with existing file 2009-07-23 17:04:24 +00:00
Greg Beaver 09b8bbc97f new phar test for zip with data descriptor in local file header 2009-07-23 16:40:47 +00:00
Greg Beaver 1723b16898 fix PHP bug #48791: open office files always reported as corrupted 2009-07-23 16:30:27 +00:00
Jani Taskinen af0c2c4760 - Fix test 2009-07-23 16:25:07 +00:00
Greg Beaver 01659b8b7c fix php bug #48783: make install will fail saying phar file exists 2009-07-23 15:48:04 +00:00
Greg Beaver 3bf5d05047 fix PHP bug #48740: PHAR install fails when INSTALL_ROOT is not the final install location 2009-07-23 15:40:10 +00:00
Jani Taskinen 6dc86facd0 - Fixed bug #48802 (printf() returns incorrect outputted length) 2009-07-23 14:54:04 +00:00
Jani Taskinen 855034b955 - Fixed bug #49032 (SplFileObject::fscanf() variables passed by reference) 2009-07-23 14:42:46 +00:00
Ilia Alshanetsky b89985ac55 Fixed bug #49014 (dechunked filter broken when serving more than 8192 bytes in
a chunk)         

# Original patch by andreas dot streichardt at globalpark dot com
2009-07-23 12:18:40 +00:00
Greg Beaver 4744223055 fix Bug #49021: phar tar signature algorithm reports as Unknown (0) in getSignature() call 2009-07-22 20:21:39 +00:00
Greg Beaver 667c59abd6 Fix Bug #49020: phar misinterprets ustar long filename standard 2009-07-22 19:51:37 +00:00
Greg Beaver fb3adb16fc don't package up subversion directory in phar.phar 2009-07-22 18:37:32 +00:00
Greg Beaver d967e29541 fix php bug #49018 (phar tar stores long filenames with prefix/name reversed) 2009-07-22 18:13:38 +00:00
Patrick Allaert 9b9363af5b MFH: The exact error message might differ (it's "Not owner" on Solaris) (r265951) 2009-07-22 12:20:56 +00:00
Rasmus Lerdorf 7bba051009 Fix bug #49003 by tweaking the fix to bug #44929 slightly.
A 0 followed by any punctuation is now significant instead
of just 0's in front of a period.
2009-07-21 21:15:48 +00:00
Sriram Natarajan 27dccf7ac0 - Fixed bug #48774 (SIGSEGVs when using curl_copy_handle()). 2009-07-21 20:32:32 +00:00
Ilia Alshanetsky 160c88cfa1 Fixed bug #48962 (cURL does not upload files with specified filename). 2009-07-21 15:56:08 +00:00
Zoe Slattery 9ff94c82df Remove empty sections. Fix bad use of --SKIP-- 2009-07-21 14:02:24 +00:00
Jani Taskinen d671793295 - There is only one Makefile that needs removing 2009-07-21 13:57:33 +00:00
Jani Taskinen 36b94bea86 - Fixed problem with vcsclean which caused it not to really clean whole tree 2009-07-21 12:01:26 +00:00
Johannes Schlüter 569869855e CVS->SVN 2009-07-20 14:34:09 +00:00
Gwynne Raskind 3832578522 revert Nuno's commit of my patch 2009-07-20 11:48:04 +00:00
Jani Taskinen c0aab038ba Fixed bug #48929 (Double \r\n after HTTP headers when "header" context option is an array) 2009-07-20 10:54:37 +00:00
Jani Taskinen a56e81fe13 - Removed unused parts 2009-07-20 10:51:40 +00:00
Kalle Sommer Nielsen 5c1d0c3eab Fix Windows build 2009-07-20 04:31:07 +00:00
Rafael Machado Dohms 12ef53b204 Removing deprecated test replaced by individual tests for imageistruecolor and imagetruecolortopalette 2009-07-20 03:48:55 +00:00
Rafael Machado Dohms 23a423aea0 Separating and complementing imageistruecolor and imagetruecolortopalette tests 2009-07-20 03:47:29 +00:00
Felipe Pena 00054412e4 - Fixed bug #48057 (Only the date fields of the first row are fetched, others are empty)
patch by: info at programmiernutte dot net
2009-07-20 00:17:24 +00:00
Felipe Pena 2507033c79 - Fixed bug #48980 (Crash when compiling with pdo_firebird) 2009-07-19 23:33:50 +00:00
Felipe Pena 9f8ff2f968 - Revert my mistake 2009-07-19 22:46:03 +00:00
Felipe Pena a0e5576f23 - Fixed module check (Related to bug #48785) 2009-07-19 20:53:26 +00:00
Felipe Pena cdf9cf3033 - Fixed bug #48773 (Incorrect error when setting PDO::ATTR_STATEMENT_CLASS with ctor_args)
[HEAD only]
2009-07-19 18:55:31 +00:00
Pierre Joye 4028b77c34 - #49763 entry (and test commit in multiple branches :) 2009-07-19 17:02:03 +00:00
Felipe Pena 0c9a16ffb7 - New tests 2009-07-19 16:31:43 +00:00
Christopher Jones defb5d1f7d MFH: Bug #48722 (Update OCI8 --enable-sigchild warning) 2009-07-19 16:27:59 +00:00
Christopher Jones 085daea052 make it easier for maintainers to set un/pw in environments that don't pass shell variables 2009-07-19 16:08:24 +00:00
Christopher Jones ce919053f3 Fix expected output to match final PHP 5.3 deprecated behavior 2009-07-19 16:06:19 +00:00
Christopher Jones 4c12299c08 Reduce Oracle version-dependent diffs. Make PHP 5/6 compatible 2009-07-19 16:05:08 +00:00
Pierre Joye 38bb4c1099 - MFB: Fix #48763, create corrupt archive 2009-07-19 15:32:09 +00:00
Pierre Joye f031901b1b - WS 2009-07-19 15:20:48 +00:00
Nuno Lopes 7655762e40 ignore a few generated files 2009-07-19 14:57:28 +00:00
Nuno Lopes 4526eee6db Add support for proc_open()'s bypass_shell feature for Unix systems (slightly modified patch from Gwynne) 2009-07-19 14:52:27 +00:00
Felipe Pena ea2abdc378 - Removed unnecessary strlen() call and if statement. 2009-07-19 14:36:16 +00:00
Felipe Pena 91841e0987 - New test 2009-07-19 03:36:46 +00:00
Felipe Pena d49b4fa597 - Tests related to bug #48770 2009-07-19 03:25:49 +00:00
Rafael Machado Dohms d7276e46e1 Commiting imagecreatetruecolor tests for PHP_5_3 branch 2009-07-19 01:42:08 +00:00
Pierre Joye a134024ea3 - let try to be smart, read the bug report.... 2009-07-18 17:06:21 +00:00
Zoe Slattery 98c8c6738a Added comment to XFAIL 2009-07-18 17:00:53 +00:00
Zoe Slattery 3c3c9d544e Adding explanation 2009-07-18 16:53:54 +00:00
Zoe Slattery d93cf1f610 removing empty XFAIL sections 2009-07-18 16:41:16 +00:00
Zoe Slattery d09ab2ab42 Removing unnecessary SKIPIF sections 2009-07-18 13:46:08 +00:00
Zoe Slattery 546a927dc8 fixing paths in INI section 2009-07-18 13:14:21 +00:00
Rasmus Lerdorf 15b0218437 Fix TTF Files 2009-07-18 03:18:36 +00:00
andy wharmby fbea458808 New cURL tests. Tested on Windows, Linux and Linux 64 bit 2009-07-17 20:46:30 +00:00
andy wharmby f3d407964e Fix cURL tests 2009-07-17 20:44:50 +00:00
Alexey Zakhlestin d3e8085c28 removing test. this one tests system-specific behavior, not something implemented in php 2009-07-17 17:17:57 +00:00
Alexey Zakhlestin edb55a4166 fixed tests. money_format() is implemented in underlying system, not in php. So, we shouldn't test for actual values returned. They are different between systems 2009-07-17 15:56:36 +00:00
Gwynne Raskind 2673b9be38 MFH: fix crash when session hash function generated long hashes with hash_bits_per_character larger than 4 2009-07-17 14:21:59 +00:00
Felipe Pena c803fbe66c - Fix test 2009-07-17 14:04:06 +00:00
Gwynne Raskind c08473090c MFH: document the hash name functionality available since 5.3 2009-07-17 13:22:56 +00:00
Jani Taskinen eb4446a812 - Add missing file exts 2009-07-17 12:31:58 +00:00
Jani Taskinen 5e76a611df - Fixed bug #48947 (vcsclean does not remove all created files) 2009-07-17 12:14:21 +00:00
Jani Taskinen 8503b66cb6 CS 2009-07-17 11:49:50 +00:00
Jani Taskinen 785f1bd170 - Fixed bug #47481 (natcasesort() does not sort extended ASCII characters correctly) 2009-07-17 11:13:51 +00:00
Zoe Slattery 4e0b75042a fix tests 2009-07-17 09:28:19 +00:00
Zoe Slattery 6917639217 fix tests 2009-07-17 09:04:52 +00:00
Zoe Slattery 29b557ae61 fix tests 2009-07-17 08:18:27 +00:00
Rasmus Lerdorf 4fdd6bacb7 Multi-branch test commit to see if email notifications are working 2009-07-17 04:26:33 +00:00
Stanislav Malyshev 326cb1bb0f fix memleak 2009-07-17 00:48:59 +00:00
Felipe Pena f4f825a7a5 - MFH: Fixed bug #48893 (Problems compiling with Curl) 2009-07-17 00:25:54 +00:00
Felipe Pena 520591607e - MFH: Fixed bug #48762 (IPv6 address filter still rejects valid address) 2009-07-16 23:29:36 +00:00
Jani Taskinen ecdd8ebbb9 MFH 2009-07-16 12:25:17 +00:00
Gwynne Raskind 24f9b1bd1e one more attempt at ridding us of some of those annoying mime types 2009-07-16 08:10:50 +00:00
Gwynne Raskind ad3dd7a718 MFH: dropped some more mime types, svnclean -> clean for multiple VCS 2009-07-16 04:50:06 +00:00
Felipe Pena 2adf42f890 - Removed trailing zeros on double to string conversion (noticed on #48924) 2009-07-16 00:59:34 +00:00
Rasmus Lerdorf 0f004989e9 Buffer handling fixes 2009-07-16 00:04:59 +00:00
Stanislav Malyshev 67f846c4c3 fix ini_restore problem 2009-07-16 00:02:19 +00:00
Stanislav Malyshev 1db1d4ccc8 fix freed mem reference 2009-07-15 23:55:50 +00:00
Rasmus Lerdorf 33c42127f6 MFH 2009-07-15 19:09:15 +00:00
Pierre Joye 6f9c84f844 - cvs > svn 2009-07-15 17:08:50 +00:00
Pierre Joye 9c18f65572 - cvs > svn 2009-07-15 16:52:21 +00:00
Alexey Zakhlestin 3e326b91e7 fix tests corrupted by svn's eol-style=native 2009-07-15 13:44:14 +00:00
Alexey Zakhlestin 07ae04de31 MFH: fix broken test 2009-07-15 10:06:38 +00:00
Felipe Pena aabf4dc30f - MFH: Fixed bug #48913 (Too long error code strings in pdo_odbc driver) 2009-07-15 02:36:08 +00:00
Felipe Pena 0225d5ef80 - MFH: Fixed bug #48913 (Too long error code strings in pdo_odbc driver) 2009-07-15 02:32:43 +00:00
Felipe Pena bffd08072c - MFH: Fixed bug #48899 (is_callable returns true even if method does not exist in parent class) 2009-07-15 01:11:24 +00:00
Gwynne Raskind 912131b304 kill bad mime types 2009-07-14 21:51:40 +00:00
Gwynne Raskind 1020d90072 MFH: CVS->SVN 2009-07-14 21:49:44 +00:00
Stanislav Malyshev 41d1c12978 fix build 2009-07-14 18:57:55 +00:00
David Soria Parra 758eca1145 MFH: - cvs->svn 2009-07-14 09:55:55 +00:00
Stanislav Malyshev c7eb83def9 add intl option 2009-07-13 23:57:20 +00:00
David Soria Parra 0391dea5be MFH: Fix date warning by setting the default timezone to UTC 2009-07-13 23:56:38 +00:00
Pierre Joye 81461c78ef - remove app/js mime 2009-07-13 22:02:28 +00:00
Rasmus Lerdorf 5e118fdc1a cvs->svn 2009-07-13 19:16:13 +00:00
Rasmus Lerdorf fe8bed8394 svn propdel svn:mime-type build/buildcheck.sh
cvs->svn
2009-07-13 17:36:49 +00:00
Pierre Joye 06033b5845 - rename to svn 2009-07-13 16:10:59 +00:00
Pierre Joye 95601a1f16 - rename to svn 2009-07-13 16:10:29 +00:00
Pierre Joye dffe3d8d21 - cvs to svn changes 2009-07-13 16:02:34 +00:00
Gwynne Raskind 2b62ffdba7 fix a huge number of wrong MIME types. UGH. 2009-07-13 12:15:13 +00:00
Pierre Joye 8faa7980f3 - remove ZendEngine* detection, we always have Zend now (svn) 2009-07-13 00:26:52 +00:00
Gwynne Raskind 627061c6a3 cvsclean -> svnclean 2009-07-12 19:43:27 +00:00
Ilia Alshanetsky c71358379d Fixed a possible crash inside OnUpdateErrorLog() when restoring an empty value
Avoid pointless safe_mode/open_basedir checks on OnUpdateMailLog() if value is empty
2009-07-12 16:38:14 +00:00
Rasmus Lerdorf 28356530cd Test commit 2009-07-12 14:16:30 +00:00
Rasmus Lerdorf 1f53affe7a MFB cvs->svn 2009-07-11 04:24:45 +00:00
David Soria Parra 098d0fcf55 MFH: Get rid of PHP 4 related buildconf and moving around directories. As we switched to svn ZE2 is in Zend by default. 2009-07-11 01:55:41 +00:00
Ilia Alshanetsky ba0e26f2c1 Fixed typo 2009-07-09 16:50:45 +00:00
Stanislav Malyshev 14f163fd80 report fix 2009-07-09 00:27:28 +00:00
Stanislav Malyshev 4bb8672039 fix mail.log openbasedir interaction with .htaccess 2009-07-09 00:21:17 +00:00
Felipe Pena fb235dc07f - MFH: Fixed bug #48854 (array_merge_recursive modifies arrays after first one) 2009-07-08 18:23:08 +00:00
Pierre Joye ddb869d674 - skip on windows 2009-07-08 10:42:06 +00:00
Pierre Joye e98be67b11 - windows version 2009-07-08 10:41:50 +00:00
Pierre Joye 528ede93df - windows version 2009-07-08 10:14:49 +00:00
Pierre Joye d8b465caae - skip on win, different error msg 2009-07-08 10:13:27 +00:00
Pierre Joye 8f7ce3ae3d - fix test (mtime only is changed) 2009-07-08 09:59:33 +00:00
Ilia Alshanetsky c16b7585f6 Fixed bug #48788 (RecursiveDirectoryIterator doesn't descend into symlinked
directories).

[DOC]

To avoid breaking how existing code works a new constant is introduced for
the RecursiveDirectoryIterator() that directs the code to follow symlinks.
This constant RecursiveDirectoryIterator::FOLLOW_SYMLINKS can be passed a
flag to the constructor to trigger symlink following.
2009-07-08 03:06:59 +00:00
David Soria Parra 2331863a5c MFH: Reset TZ environment variable. Some tests assume that it's not set. 2009-07-07 23:05:17 +00:00
Pierre Joye ba035b47fd - #46682 2009-07-07 22:17:54 +00:00
Pierre Joye 7a41848cc6 - #46882, touch() atime field returns different value 2009-07-07 22:13:32 +00:00
Pierre Joye f6016c64e5 - fixed, remove xfail 2009-07-07 22:04:42 +00:00
Pierre Joye 18174e18c9 - fix tests, 5.3 supports these things now on windows. Also shorter tests would be REALLY nice (or use iteration numbering) 2009-07-07 21:50:38 +00:00
Stanislav Malyshev e865c0b4ee merge errors support 2009-07-07 21:25:46 +00:00
Jani Taskinen 87f9d62861 - Fixed bug #48247 (Infinite loop and possible crash during startup with errors) 2009-07-07 16:42:11 +00:00
Pierre Joye c408f289be - #45905 2009-07-07 15:17:36 +00:00
Jani Taskinen 8ac02f5926 Check your editors, this is ascii only file! 2009-07-07 12:19:05 +00:00
David Soria Parra 8af2635eab MFH: Adjust tests. The order in which notices appear is platform dependend as the function call ordering in parameter lists is not defined in C. 2009-07-07 12:11:53 +00:00
Ulf Wendel 759cc732cf MFH. Fixing tests to run with SQL_MODE=ANSI_QUOTES as well. 2009-07-07 11:32:17 +00:00
Pierre Joye c79f7e3f6b - WS 2009-07-07 10:54:44 +00:00
Pierre Joye b38fde4694 - #45905, imagefilledrectangle() clipping error 2009-07-07 10:49:38 +00:00
Felipe Pena 4f0c8ef124 - MFH: New tests (WurzbrugUG testfest) 2009-07-07 01:17:46 +00:00
Ilia Alshanetsky 0e05af63ed MFB: Fixed bug #48808 (FILTER_VALIDATE_EMAIL allows some invalid e-mail
syntaxes)
2009-07-07 00:44:20 +00:00
Felipe Pena 44bf860516 - MFH: Fixed compiler warning 2009-07-07 00:02:34 +00:00
Stanislav Malyshev 387fbb2d4e fix protos 2009-07-06 23:48:27 +00:00
Pierre Joye 43be94f2be - forgot to add the author of the initial patch 2009-07-06 23:47:16 +00:00
Pierre Joye 4645ef2a49 - #48116 2009-07-06 23:38:03 +00:00
Stanislav Malyshev bfdeea808a add test 2009-07-06 23:28:16 +00:00
Pierre Joye f37fabb803 - #48116, restore 0.x compability, thx config.cache. 2009-07-06 23:26:23 +00:00
Pierre Joye c82245dea7 - #48116, fix build against openssl 1.0 2009-07-06 23:02:18 +00:00
andy wharmby 6e96ae79a3 Fix test 2009-07-06 19:35:01 +00:00
Pierre Joye 4186a6e57c - #48771 2009-07-06 17:48:02 +00:00
Ulf Wendel be7dd36297 MFH. Enabling test as requested by the skipif comment... it does pass when slightly modified. 2009-07-06 15:53:14 +00:00
Ulf Wendel 4786cfa4bf MFH. Fixing mysqlnd version test to run some four previously skipped tests. There is no proper way to check the mysqlnd version. The best one can do is adapt the tests to what PHP 5.3 and PHP 6.0 return today. 2009-07-06 15:45:19 +00:00
Ulf Wendel 556feffbd4 MFH. Adapting (old) tests to current PHP 6 semantics - s/unicode.semantics test/version_compare 2009-07-06 15:08:13 +00:00
Ulf Wendel f611876b2e MFH. Adding --CLEAN-- sections to all ext/mysqli tests 2009-07-06 14:39:10 +00:00
Pierre Joye fa38267833 - MFH: #48771, rename() between drives error: No error 2009-07-06 08:56:23 +00:00
Ilia Alshanetsky dac8acd1c1 MFB: Fixed bug #48718 (FILTER_VALIDATE_EMAIL does not allow numbers in domain
components).
2009-07-05 16:08:05 +00:00
Zoe Slattery b37019f963 fix test 2009-07-05 14:46:08 +00:00
Felipe Pena fc4e43ec3c MFH:
- Added missing methods' arginfo (for void params)
- Fixed arginfos:
  - MultipleIterator::__construct
  - MultipleIterator::setFlags      (Thanks Philip!)
  - SplFixedArray::__construct
2009-07-04 20:31:27 +00:00
Antony Dovgal 5725982614 stop polluting my /tmp dir 2009-07-03 14:02:28 +00:00
Ulf Wendel b90a412302 MFH. ... to play with large data sets. Currently its only 10MB in size to keep the test runtime short. However, its easy to increase, if you want to test large data sets 2009-07-03 12:14:39 +00:00
Jani Taskinen 0f60a5d540 Nuke "hotfix", fix the real issue.. 2009-07-03 11:42:11 +00:00
Patrick Allaert 17aa260703 MFH: Tests for ext/ldap from PHPBelgium TestFest 2009-07-03 09:21:31 +00:00
Ulf Wendel f31fc6df21 MFH. Global s/ini_get('unicode.semantics')/version check/ . Early PHP 6 times are gone. I hope unicode logic will not change any more 2009-07-03 08:42:46 +00:00
Ulf Wendel 26e9c79d4c MFH. Fixing borked test, again new run-tests.php has found it... Fails with HEAD, passes with 5.3 2009-07-03 08:25:25 +00:00
Jani Taskinen a6cbd01d99 - Fixed bug #48782 (CFLAGS killed during configure) 2009-07-03 07:59:53 +00:00
Ulf Wendel 5ac0398f73 MFH. Fixing borked test - thanks again new run-tests.php tool (and team). 2009-07-03 07:50:10 +00:00
Felipe Pena 8715a7f12e - New tests (DutchUG testfest) 2009-07-03 00:09:08 +00:00
Stanislav Malyshev 9937006ac5 bugfix 2009-07-02 22:36:16 +00:00
Ilia Alshanetsky 305f4984d2 MFB: Fixed bug #48733 (CURLOPT_WRITEHEADER|CURLOPT_FILE|CURLOPT_STDERR warns
on files that have been opened with r+).
2009-07-02 13:42:16 +00:00
Lukas Smith 84dcca9f48 MFH: removed references to track_vars, since this option doesnt exist since ages 2009-07-02 13:34:38 +00:00
Ulf Wendel 5147f6cf8d MFH. Adding CLEAN sections, fixing some SKIPIF sections. Cool new run-tests.php, Zoe (and other) - its a great help to detect stinky SKIPIF and CLEAN 2009-07-02 10:05:37 +00:00
Gwynne Raskind 9adf2ed4aa call-time pass-by-reference is deprecated in 5.3 2009-07-02 10:05:15 +00:00
Gwynne Raskind bfad6f6cee Don't use short tags in tests 2009-07-02 10:03:14 +00:00
Gwynne Raskind b26cd6839a Fixed a stray 'in the test 2009-07-02 10:02:38 +00:00
Ulf Wendel ed05c54d2e MFH - Test for bug #48754 2009-07-02 07:42:48 +00:00
Stanislav Malyshev b755935771 cleanup Locale::lookup 2009-07-02 00:43:26 +00:00
Felipe Pena 634f233cc0 - MFH: New tests (NorwayUG testfest) 2009-07-02 00:04:52 +00:00
Stanislav Malyshev 838d359641 typo 2009-07-01 20:31:26 +00:00
Kalle Sommer Nielsen dc69d9228a MFH: Fix test on Windows 2009-07-01 20:27:11 +00:00
Stanislav Malyshev 96f2a45df3 update API files 2009-07-01 20:25:38 +00:00
Stanislav Malyshev 09c10856f6 fix proto 2009-07-01 20:17:31 +00:00
Kalle Sommer Nielsen 485f28aae9 MFH: Fixed #45280 (Reflection of instantiated COM classes causes PHP to crash) (Paul Richards, Kalle) 2009-07-01 18:44:56 +00:00
Kalle Sommer Nielsen e536b2700a MFH: Fixed memory leak if zero parameters are passed, Thanks Felipe 2009-07-01 17:43:16 +00:00
Kalle Sommer Nielsen 937809f447 BFN #48757 2009-07-01 17:38:52 +00:00
Kalle Sommer Nielsen 21d61978dc MFH: Fixed bug #48757 (ReflectionFunction::invoke() parameter issues) 2009-07-01 17:38:03 +00:00
Ulf Wendel b6bd0f6806 MFH - Changing tests to run with both PHP 6 and PHP 5.3 to make future MFH easier. Basically three changes over all files: a) s/unicode(/%unicode|string% b) s/[u/[%u|b% c) s/unicode.semantics/version_compare 2009-07-01 15:33:31 +00:00
Ulf Wendel b5455f7a7d MFH - Adding XFAIL for some tests which expect the zval cache of mysqlnd to be on. It has been disabled for the PHP 5.3.0 release. Adding INI sections to ensure that statistics are collected. Adding tests that check if statistics collection can be disabled 2009-07-01 12:52:58 +00:00
Felipe Pena d9061f95fa - Fix test 2009-07-01 12:15:00 +00:00
Felipe Pena 3d7b3c8bb2 - Fixed tests 2009-07-01 02:32:55 +00:00
Felipe Pena db6f5e67a8 - MFH: New tests (SaoPaulo UG testfest) 2009-07-01 00:56:01 +00:00
Stanislav Malyshev 2361b4ea2a fix json shared build on Windows 2009-06-30 17:52:21 +00:00
Christian Seiler b4a43d0d94 MFH: spl_autoload_unregister/spl_autoload_functions and closures 2009-06-30 17:14:37 +00:00
Derick Rethans 9dfb40ea8c - MFH: Fixed bug #47351 (Memory leak in DateTime). 2009-06-30 16:17:30 +00:00
Greg Beaver 5dd3306551 fixed bug #48681 (openssl signature verification for tar archives broken) 2009-06-30 14:49:12 +00:00
Lukas Smith 74b8bc2e99 MFH: expanded the section about how to create the changelog 2009-06-30 14:24:25 +00:00
Scott MacVicar 27a1ce801c MFH Fix bug #48284 - adler32 is in the wrong order. Changed to match what zlib produces. 2009-06-30 13:21:53 +00:00
Ilia Alshanetsky ae2c5ee7d4 MFB: Fixed bug #48465 (sys_get_temp_dir() possibly inconsistent when using
TMPDIR).
2009-06-30 12:20:35 +00:00
Felipe Pena 0e294f2121 - MFH: Fixed bug #48709 (metaphone and 'wh') 2009-06-30 11:46:20 +00:00
Kalle Sommer Nielsen 51f8b64752 MFH: Fixed bug #38091 (Mail() does not use FQDN when sending SMTP helo)
# Note, this does not go in 5.2 because the inet ports for VC6 are not in that branch
2009-06-30 11:39:15 +00:00
Felipe Pena aafaa9c019 - New test 2009-06-30 11:37:42 +00:00
Lukas Smith f0a55e20d5 MFH: formatting fix for the re-releasing section 2009-06-30 11:37:24 +00:00
Felipe Pena 5a8169902a - MFH: Fixed bug #48709 (metaphone and 'wh') 2009-06-30 11:34:31 +00:00
Scott MacVicar ded5d566ad MFH Upgrade libsqlite to 3.6.16, fixes a possible error with triggers 2009-06-30 11:17:14 +00:00
Johannes Schlüter 52c9cad8e4 Back to -dev 2009-06-29 16:33:25 +00:00
Johannes Schlüter ba04122ae2 Fix grammar (thanks Christian Hoffmann) 2009-06-29 13:04:29 +00:00
Johannes Schlüter e6646ab7cf The php.ini files we ship were renamed 2009-06-29 10:03:24 +00:00
Johannes Schlüter d4671b904d Improve wording and drop outdated link 2009-06-29 09:37:06 +00:00
Johannes Schlüter dec83ec4d2 MFH: Fixed bug #48539 (pdo_dblib fails to connect, throws empty PDOException
"SQLSTATE[] (null)")  (Felipe)
2009-06-29 09:36:03 +00:00
andy wharmby d73094aed4 Basic test for max() on 64 bit platforms. Tested on Linux 64 bit 2009-06-29 07:52:23 +00:00
andy wharmby 54ba44da0a Fix tests 2009-06-29 07:45:11 +00:00
andy wharmby 93a16cf13a Basic tests for sleep() and usleep(). Tested on Windows, Linux and Linux 64 bit 2009-06-29 07:31:10 +00:00
Johannes Schlüter 81761e636d Fix path 2009-06-28 21:52:51 +00:00
Johannes Schlüter ccb33c060f MFH Add missing ini entries (Mikko) 2009-06-28 17:56:18 +00:00
Johannes Schlüter 6d68dbc331 MFH: Add ibase settings 2009-06-28 16:41:17 +00:00
Johannes Schlüter db256c502e Drop debug switches from UPGRADING, they need --enable-debug and aren't ment for users 2009-06-28 16:14:30 +00:00
Johannes Schlüter 3840317d40 MFH: Add two ini settings and remove ini setting which is commented out in code 2009-06-28 15:56:19 +00:00
Johannes Schlüter 79e1cf2fe0 MFH: fix typo 2009-06-28 15:29:24 +00:00
Johannes Schlüter c9fa89534c MFH: Add missing MySQL entries 2009-06-28 15:21:19 +00:00
Christopher Jones b44e08d1e5 Record "new" ini param 2009-06-28 14:31:12 +00:00
Pierre Joye a68f6c9c28 - fix build 2009-06-28 12:04:44 +00:00
Pierre Joye f403bd2128 - MFH: fix regression introduced by the fix for #48518 (Ilia, Rasmus) 2009-06-28 09:50:14 +00:00
Pierre Joye 25c47a2522 - MF52: calloc must actually clear the requested size (Andrei) 2009-06-28 09:48:48 +00:00
Hannes Magnusson c3003002f7 Group the open_basedir entries 2009-06-27 13:33:20 +00:00
Hannes Magnusson 3ca8e5ab0f - Remove outdated version information
- Remove no-longer-existing windows dll (there could be more..)
- List missing INI directives (need to add descriptions to them and sort
  them correctly..)
2009-06-27 13:29:53 +00:00
Hannes Magnusson f88d938dfb - Added missing deprecated things
- Added missing INI settings
2009-06-27 13:23:03 +00:00
Jani Taskinen 2498962223 - clean 2009-06-26 22:18:30 +00:00
Kalle Sommer Nielsen 6f429dfccb Seems like this wasn't merged, re-add credit for Pierre here 2009-06-26 20:39:36 +00:00
Johannes Schlüter 4b4283bdc0 Bump version to 5.3.0 and API Nos. up 2009-06-26 15:44:19 +00:00
Johannes Schlüter e1ae933031 Fix trouble with memory alignment on Sparch, see #48668 (David) 2009-06-26 15:42:11 +00:00
Christopher Jones 30fce08b23 Clarifications for oci8 changes 2009-06-26 15:15:02 +00:00
Matt Wilmas c860c9896e Typo, capitalization, wording 2009-06-26 12:24:20 +00:00
Gwynne Raskind bdc3d68061 more grammar and spelling, consistent usage, suggestions for replacements 2009-06-26 11:56:51 +00:00
Hannes Magnusson f36cb429f4 Add deprecated functions 2009-06-26 10:46:50 +00:00
Pierre Joye aaae921225 - update the windows section 2009-06-26 10:20:22 +00:00
Johannes Schlüter b13ed4ea93 Fix the version number there 2009-06-26 09:32:54 +00:00
Pierre Joye db129f6e54 - some updates, typos, missing entries 2009-06-26 08:48:36 +00:00
Johannes Schlüter e782d1820b Merge 5.3.0 NEWS 2009-06-26 08:12:13 +00:00
Pierre Joye 5f2df5d064 - WS 2009-06-26 07:39:42 +00:00
Pierre Joye 68a3c3f952 - add license 2009-06-26 07:24:41 +00:00
Johannes Schlüter 9485cad688 Revert mysqlnd to RC3 state after issues with pconnects 2009-06-25 19:03:52 +00:00
Kalle Sommer Nielsen ca1bda67f2 Persistent connections with mysqli missing 2009-06-25 18:17:52 +00:00
Hannes Magnusson 43f939fae0 reduntant 2009-06-25 18:04:35 +00:00
Hannes Magnusson ceac7e4370 More missing stuff 2009-06-25 18:01:08 +00:00
Gwynne Raskind 307a90caa3 missing .cvsignore file added 2009-06-25 16:18:24 +00:00
Felipe Pena c8cb2b4e10 - BFN #48696 2009-06-25 16:16:08 +00:00
Johannes Schlüter 144ff4d6b3 MFH: Fixed bug #48696 (ldap_read() segfaults with invalid parameters) (Felipe) 2009-06-25 15:19:29 +00:00
Johannes Schlüter 6354376924 MFH: Fixed bug #48678 (DateInterval segfaults when unserialising (Ilia) 2009-06-25 15:07:36 +00:00
Felipe Pena f03c5db12e - Added note about deprecation of "#" comment-style in .INI files 2009-06-25 14:56:14 +00:00
Zoe Slattery b2bc4dd331 fix skipif 2009-06-25 14:44:01 +00:00
Matt Wilmas 57b543ee6f Fix example - it means what it says 2009-06-25 13:00:08 +00:00
Zoe Slattery 8e972386f0 fix skipif 2009-06-25 12:36:46 +00:00
Gwynne Raskind ac564608bd fix a little typo I made, bug #48685 2009-06-25 10:41:07 +00:00
Johannes Schlüter 84940122a9 MFH Fix bug #48679 - Crash in SQLite with count on an unbuffered query set (Scott) 2009-06-25 09:38:04 +00:00
Gwynne Raskind e01ff47c43 Whitespace fixes, reformatting to bring all lines to 80 cols, grammatical fixes, removed redundant information 2009-06-25 07:57:05 +00:00
Johannes Schlüter 9f9895b34d Make clearer that thesse are internal functions 2009-06-24 22:26:56 +00:00
Greg Beaver 2c924e2848 fix slightly unclear error message in generation of phar.phar 2009-06-24 22:12:47 +00:00
Hannes Magnusson 60835e3051 Missing enhancements 2009-06-24 21:16:53 +00:00
Ilia Alshanetsky 00d0ecda10 Revert patch 2009-06-24 20:08:54 +00:00
Felipe Pena e67b4072e0 BFN 2009-06-24 17:43:09 +00:00
Felipe Pena caf8d811ef - MFH: Fixed memleak when depth arg is less than zero 2009-06-24 17:39:52 +00:00
Ilia Alshanetsky c0aa23fd86 MFB: Fixed bug #48465 (sys_get_temp_dir() possibly inconsistent when using
TMPDIR).
2009-06-24 12:21:45 +00:00
Pierre Joye b8f295a6d3 - add readme.redist.bins as .txt 2009-06-24 11:51:05 +00:00
Pierre Joye 4092360764 -add licenses info for bundled libs, codes merged from other projects, etc., information for binary distributions (windows, linux, etc.) 2009-06-24 11:46:29 +00:00
Pierre Joye 1f10584566 - add license info 2009-06-24 11:44:46 +00:00
Dmitry Stogov e583ce82ec Fixed bug #48643 (String functions memory issue) 2009-06-24 08:53:18 +00:00
Jani Taskinen a8e42c91b0 MFH:- Fixed bug #48661 (phpize broken with non-bash shells) 2009-06-24 07:42:33 +00:00
andy wharmby 0fbf8cebd7 Fix test 2009-06-23 23:00:55 +00:00
andy wharmby 3aaaf77a0e New and fixed html tests. Tested in Windows, Linux and Linux 64. 2009-06-23 22:45:31 +00:00
andy wharmby e6f4ec2f07 New basic parse_str() tests. Tested on Windows,Linux and Lnux 64 bit. Some tests fail on PHP 6 (tagged with XFAIL) due to bug 48658 2009-06-23 22:39:44 +00:00
Hannes Magnusson 0fa4242464 Missing items 2009-06-23 19:40:31 +00:00
Johannes Schlüter aded4474fc MFH: Fix build problem (Kalle) 2009-06-23 18:14:27 +00:00
David Soria Parra 4d7e6edd63 MFH: Fix bug #48644 mysqlnd does not compile with '--enable-mysqlnd-threading' 2009-06-23 14:15:28 +00:00
Hannes Magnusson f3d8a9ad0d MFH: Fix arginfo for libxml_disable_entity_loader() and libxml_use_internal_errors() 2009-06-23 13:44:24 +00:00
Hannes Magnusson 83855c0ce7 better place for it 2009-06-23 13:37:35 +00:00
Hannes Magnusson 85cb296a09 TZ is no longer used to guess the timezone 2009-06-23 13:33:26 +00:00
Johannes Schlüter 86eaa90955 MFH The experimental warning sohuld be in the configure output... 2009-06-23 13:19:28 +00:00
Johannes Schlüter 96d5c5e931 The json header should be installed so other exts can use it 2009-06-23 13:09:34 +00:00
Hannes Magnusson 6b3f0cfc54 New function 2009-06-23 11:13:05 +00:00
Rob Richards f7b30e6578 MFH: add libxml_disable_entity_loader function 2009-06-23 10:50:09 +00:00
Kalle Sommer Nielsen 220c68d54a MFH: Move these defines to config.w32.h
Also credit Pierre for the inet_ntop()/inet_pton() implementations
2009-06-23 06:56:45 +00:00
Kalle Sommer Nielsen 3410350caa MFH:
Use %* instead of a range + WS
2009-06-23 02:14:27 +00:00
Kalle Sommer Nielsen 1f5e20c33e MFH:
* Fix deprecation warning when building deplister
* Fix some mkdir warnings if "nmake build-dist" is executed twice
2009-06-23 01:37:23 +00:00
Pierre Joye a1c1dd6ba1 - gd compat mode news 2009-06-22 22:14:37 +00:00
Pierre Joye 8a2e38ebdf - #48624 2009-06-22 21:39:36 +00:00
Takeshi Abe aa85d1dbc1 moved to PHP_5_2 2009-06-22 15:51:49 +00:00
Ilia Alshanetsky 1c4dafd84d Revert unrelated bits to the previous commit 2009-06-22 14:24:27 +00:00
Pierre Joye a7db554314 - #48624 .user.ini never gets parsed 2009-06-22 14:10:40 +00:00
Pierre Joye d1fb4d2da4 - #48619, imap_search ALL segfaults 2009-06-22 14:09:55 +00:00
Ilia Alshanetsky bc8e357482 MFB: Fixed bug #48636 (Error compiling of ext/date on netware). 2009-06-22 13:43:14 +00:00
Felipe Pena 58c717ff8f - BFN #48641 (I missed to add in the previous commit: patch by crrodriguez at opensuse dot org) :P 2009-06-22 11:44:49 +00:00
Felipe Pena 56d7a43f00 - Fixed bug #48641 (tmpfile() uses old parameter parsing) 2009-06-22 11:37:30 +00:00
Hannes Magnusson b3e9695a65 Sync with docs 2009-06-22 10:30:23 +00:00
Scott MacVicar 96be32d8ca BFN - Partially fixed in RC4, fixed properly in the next release. 2009-06-21 22:38:49 +00:00
Scott MacVicar c63b6f5d8a MFH Specific test for bug #48276 2009-06-21 22:31:41 +00:00
Scott MacVicar 25715c7660 MFH Fix bug #48276 - year is a long long so we need %lld so big endian systems print the correct value. 2009-06-21 22:19:11 +00:00
Hannes Magnusson b293b35eaa Fix proto and arginfo 2009-06-21 20:40:53 +00:00
Hannes Magnusson 6b107d99be Fixed bug#48485 (Error in documentation and upgrade guide) 2009-06-21 18:34:50 +00:00
andy wharmby ee726e4497 New lang tests. 2009-06-21 17:42:15 +00:00
Johannes Schlüter 47be72139d MFH: It's 2009 2009-06-21 16:44:50 +00:00
Ilia Alshanetsky 0ce6b61e04 BFN 2009-06-21 15:30:57 +00:00
Ilia Alshanetsky 81e5787949 Fixed bug #48620 (X-PHP-Originating-Script assumes no trailing CRLF in
existing headers)
2009-06-21 15:29:16 +00:00
Johannes Schlüter ef9c23468c Merge in NEWS from 5.2 2009-06-21 11:50:37 +00:00
Takeshi Abe f1c919496b entry for bug #48555 2009-06-21 06:29:41 +00:00
Takeshi Abe c84e4181b4 MFH: fixed bug #48555 (ImageFTBBox() differs from previous versions for texts with new lines) 2009-06-21 06:09:46 +00:00
Kalle Sommer Nielsen c2131f8efb Fixed typo, its fdf, not fPdf 2009-06-21 05:41:08 +00:00
Kalle Sommer Nielsen c25893731b Missing Windows constants 2009-06-21 05:29:01 +00:00
Kalle Sommer Nielsen 97d35803d7 get_extension_funcs have been in PHP since php4 2009-06-21 01:49:52 +00:00
Kalle Sommer Nielsen 9fef343050 MFH: Fixed arginfo for array_map, patch by Matthew Fonda <matthewfonda@gmail.com> 2009-06-20 06:07:35 +00:00
Kalle Sommer Nielsen 17459bac7d MFH: Fix memleak 2009-06-19 22:15:28 +00:00
Scott MacVicar d976be4bda Make the check case sensitive, and since we can only have a constructor that matches the class name or is __construct
its probably safe to just check for __. This means we can skip lowering the function_name, which is hard to be binary
safe sine we don't store the length.

If we just did a zend_hash_exists lookup we'd be fine since its stored lowercased already :)
2009-06-19 03:29:47 +00:00
andy wharmby e64f0795e1 Fix test; remove spurious code 2009-06-18 21:53:17 +00:00
andy wharmby 7c7dd8b712 Basic tests for strftime(). Tested on Windows (all tests skip), Linux and Liinux 64 bit 2009-06-18 21:14:15 +00:00
Johannes Schlüter 9851acba7b Back to dev 2009-06-18 21:07:08 +00:00
andy wharmby 1e119743a5 Backport ob test to php 5.2 and 53. 2009-06-18 21:03:00 +00:00
Johannes Schlüter ff1bf7f766 5.3.0 RC 4 2009-06-18 21:01:03 +00:00
Greg Beaver 645226d19b fix EXPECT section of test 2009-06-18 18:12:04 +00:00
Johannes Schlüter 067276a043 Temporarily disable this optimization causing too much trouble, kept in HEAD 2009-06-18 15:07:23 +00:00
Scott MacVicar 8e3aebd550 Fix bug #48215 - Calling a method with the same name as the parent class calls the constructor instead. 2009-06-18 13:46:16 +00:00
Derick Rethans b2d3c2bf18 - Updated to version 2009.10 (2009j) 2009-06-18 09:02:51 +00:00
Zoe Slattery b928d971b5 Tests from Berlin test fest 2009-06-18 07:29:09 +00:00
Rasmus Lerdorf 269df474bf Ah, broken vimrc.. 2009-06-18 06:38:30 +00:00
Rasmus Lerdorf e70abda281 Fix bug #48592 2009-06-18 06:32:38 +00:00
Jani Taskinen dabcff916d Pierre, this can not be so hard 2009-06-17 22:51:05 +00:00
Jani Taskinen 8c7c7de858 unfuck the file, fucked up by Pierre as usual 2009-06-17 22:50:18 +00:00
Felipe Pena 7ef7c93849 - Reorder 2009-06-17 19:55:32 +00:00
Pierre Joye 99b0b22582 - fix NEWS (thx Felipe!) 2009-06-17 19:42:56 +00:00
Pierre Joye 27ea6ef77f - update with latest bits 2009-06-17 19:40:33 +00:00
Pierre Joye 6086c0866c - kill unused var 2009-06-17 19:28:52 +00:00
Pierre Joye f2457fbd56 - #47318, UMR when trying to activate user config 2009-06-17 19:22:24 +00:00
andy wharmby e5b5f13b79 New test for standard object compare handler. Tested on Windows, Linux and Linux 64 2009-06-17 19:15:19 +00:00
andy wharmby fb3132f502 New foreach tests. Tested on Windows, Linux and Linux 64 bit. 2009-06-17 19:07:17 +00:00
Hannes Magnusson b685def15a MFB5.2: "Make this happy on gcc2" 2009-06-17 17:56:17 +00:00
Felipe Pena 31f64d6943 BFN #48578 2009-06-17 16:22:14 +00:00
Andrey Hristov 0aada07656 MFH:
Fix two problems:
- The value of mysqli_get_client_info() has been changed recently and did
not include "mysqlnd" anymore thus the test suite was thinking the build
is always libmysql. This did not kept the suite from running pconn tests
- Going back to the libc allocator because the memory arena could be on a
  persistent connections. If the build is not debug there will be no error
  but the memory will be freed and in the second use of this pconn freed
  memory will be used - not good! For now the arena doesn't take an argument
  whether it should allocate persistently or not, thus persistent is safe
  for now.

Johannes gave his +1 to commit this.
2009-06-17 16:22:13 +00:00
Felipe Pena 219c2603bb - MFH: Fixed bug #48578 (Can't build 5.3 on FBSD 4.11) (Rasmus) 2009-06-17 16:20:04 +00:00
Scott MacVicar 3e58e86d01 MFH Add SplDoublyLinkedList::prev() and fix a memory leak when the iterator pointer isn't at the end 2009-06-17 13:27:09 +00:00
Robin Fernandes 73cd7e83ee Additional class related tests. 2009-06-17 10:38:25 +00:00
Hannes Magnusson d535dec2e0 fix skipif 2009-06-17 10:18:17 +00:00
Hannes Magnusson 9900d2097c fix skipif 2009-06-17 10:14:25 +00:00
Pierre Joye 02fe289540 - fix test 2009-06-17 10:10:19 +00:00
Pierre Joye f399abb610 - missing --SKIPIF-- header 2009-06-17 10:08:01 +00:00
Rasmus Lerdorf a7cc9e7274 Need the gcc version check here too 2009-06-17 08:55:23 +00:00
Pierre Joye 2e08b57ee6 - fix build when IO_REPARSE_TAG_SYMLINK is not defined (works with 2k+) 2009-06-16 21:54:12 +00:00
Felipe Pena ef55a8a663 - Fixed tests 2009-06-16 19:49:55 +00:00
andy wharmby d7072fa367 New strcoll error test. Tested on Windows, Linux and Linux 64. 2009-06-16 19:39:39 +00:00
Andrey Hristov 30800a79b9 MFH: C-comments 2009-06-16 18:00:00 +00:00
Pierre Joye 5a3efd5b78 - fix readlink in TS SAPI 2009-06-16 16:50:13 +00:00
Rasmus Lerdorf f90425316a Tweak to make this compile with gcc2 2009-06-16 16:10:15 +00:00
Felipe Pena f9bb99055e - MFH: Fixed build (removed trailing comma) patch by Seiji Masugata <s.masugata at digicom.dnp.co.jp> 2009-06-16 14:33:33 +00:00
Andrey Hristov 10ee06ca48 MFH:
Memory usage optimisation. mysqlnd is not libmysql. mysqlnd does use the
Zend allocator, which means that is easier to hit memory_limit if you
have big stored (buffered) result sets. Before with libmysql you won't
hit memory_limit because libmysql uses libc's allocator and nothing is
checked. Now, with mysqlnd the situation is stricter and it is easier to
hit memory_limit. We try to optimize for big result sets. If a result set
is larger than 10 rows we will start freeing some data to keep memory usage
after 10 rows constant. This will help in the cases where a buffered result
set is scrolled forward only and just only once, or mysqlnd will need to
decode data from the network buffers again - yes, it is a trade-off between
CPU time and memory size. The best for big result sets is of course using
unbuffered queries - for comparison : 3 Million rows with buffered take
at least 180MB, with buffered you will stay at 3MB, and unbuffered will be
just 7-8% slower.
2009-06-16 13:07:14 +00:00
Ilia Alshanetsky 34842709d6 Fixed test 2009-06-16 12:40:59 +00:00
andy wharmby c731b2287f Fix typo in test 2009-06-16 11:37:13 +00:00
Pierre Joye b4cf9d80d4 - fix title 2009-06-16 10:37:59 +00:00
Pierre Joye 1a69c562bd - fix title 2009-06-16 10:37:30 +00:00
Andrey Hristov 27270621cb MFH:
Hardwire function call instead of using callbacks. We don't actually need
callbacks, it was done for making 2 functions static, not to pollute the
global functions space but that had its price of 8 bytes overheat per
allocation, which is just too much. Also making the app member 32b instead
of 64b, which should save additional 4 byte, to the total of 12 byte per
allocation of a row buffer.
2009-06-16 09:15:38 +00:00
andy wharmby f0f302fe7f New class related tests. Tested on Windows, Linux and Linux 64. Tests written by Iain Lewis 2009-06-16 08:59:39 +00:00
Andrey Hristov a2acaa7fcd MFH:
Use Zend's allocator instead of libc's and also don't try to work on
zvals that are NULLs.
2009-06-16 07:53:35 +00:00
Felipe Pena c353601a3f - MFH: Fixed bug #48562 (Reference recursion causes segfault when used in wddx_serialize_vars()) 2009-06-16 02:54:26 +00:00
Pierre Joye 8e76db4aa7 - revert last commit, should not have been applied 2009-06-16 00:17:56 +00:00
Pierre Joye a5302d870d - #47767, include_once does not resolve windows symlinks or junctions 2009-06-16 00:13:56 +00:00
Pierre Joye 18d5751a9e - Windows ACL cache support, update existing tests and add a new one 2009-06-16 00:07:05 +00:00
Felipe Pena da9b80e309 - Drop unused code 2009-06-15 17:56:08 +00:00
andy wharmby fcbfe08d60 New test for bitwise operators. Tested on Linux 64 bit 2009-06-15 17:38:44 +00:00
andy wharmby d8ce08a24b Move tests to correct directory 2009-06-15 17:34:40 +00:00
Felipe Pena aa8811982e - MFH: Fixed bug #48557 (Numeric string keys in Apache Hashmaps are not cast to integers) patch by David Zülke <david.zuelke at bitextender.com> 2009-06-15 17:31:02 +00:00
Patrick Allaert f78a0b585c MFH: Fixing #48441 (ldap_search() with sizelimit/timelimit/deref options makes those options persistent) 2009-06-15 15:18:31 +00:00
Pierre Joye c06884c960 - add TODO about int definition cleanup 2009-06-15 15:08:12 +00:00
Patrick Allaert 91a8fd7f7e MFH: Refactoring that will help fixing #48441 2009-06-15 15:04:11 +00:00
Pierre Joye 60223d6a6d - #48535, file_exists returns false when impersonate is used 2009-06-15 15:01:01 +00:00
Pierre Joye 2db291e728 - MFH: simplify, use correct type and silent warnings 2009-06-15 14:47:15 +00:00
Scott MacVicar fdfc7d05e7 BFN 2009-06-15 13:41:42 +00:00
Scott MacVicar 532674945c MFH sync SQLite 3.6.15 2009-06-15 13:23:59 +00:00
Ilia Alshanetsky bb55de47cd Simplify original fix for bug #33475 2009-06-15 12:37:37 +00:00
andy wharmby 4a110443df New POSIX extension tests from Berlin UG TestFest 2009. 2009-06-15 12:14:55 +00:00
Pierre Joye e52e1fab4c - silent warning 2009-06-15 08:32:38 +00:00
Philip Olson 380dededf4 Synced with the wiki 2009-06-14 19:15:57 +00:00
Philip Olson 7593f572ea Remove unused file (see file UPGRADING for the 5.2->5.3 guide) 2009-06-14 17:56:07 +00:00
andy wharmby 3fd133bcf3 Backport ob test to php 5.2 and 53. 2009-06-14 16:47:11 +00:00
andy wharmby 1888c718cb New foreach tests. Tested on Windows, Linux and Linux 64 bit. 2009-06-14 14:17:43 +00:00
andy wharmby ceca4f3615 Basic tests for function_exists() and get_defined_functions(). Tested on Windows, Linux and Linux 64 bit. 2009-06-14 13:49:16 +00:00
Ilia Alshanetsky 1c8d05069e MFB: Fixed bug #48512 (DOMDocument::validate() fails with both a E_NOTICE
and E_WARN if no DTD)
2009-06-14 13:13:35 +00:00
andy wharmby a6735b8b24 New json extension tests. Tested on Windows, Linux and Linux 64 bit. 2009-06-14 12:08:27 +00:00
Greg Beaver 8fc5746d0e remove missing erealloc entry that will go in php 5.2 NEWS 2009-06-13 17:34:21 +00:00
Greg Beaver 79d05eac0d fix Bug #48541: spl_autoload_register only registers first closure, then leaks the others. Fix missing erealloc in fix for bug #40091 (PHP_5_3 only) 2009-06-13 17:30:50 +00:00
Greg Beaver df07072f7c fix criminally unclear NEWS entry by me 2009-06-13 16:43:04 +00:00
andy wharmby 642b84cd83 New iconv extension tests. Tested on Windows, Linux and Linux 64 bit. 2009-06-13 12:17:42 +00:00
Felipe Pena 2cb9fe1f89 - Constified method_name arg. in zend_get_user_call_function() and zend_get_user_callstatic_function() 2009-06-12 21:36:53 +00:00
Felipe Pena f9b9765ed0 - MFH: Fixed bug #48514 (cURL extension uses same resource name for simple and multi APIs) 2009-06-12 20:48:28 +00:00
andy wharmby 092562b263 New iconv extension tests. Tested on Windows, Linux and Linux 64 bit. 2009-06-12 18:57:09 +00:00
andy wharmby c48a3ddea8 New iconv extension tests. Tested on Windows, Linux and Linux 64 bit 2009-06-12 17:16:01 +00:00
Kalle Sommer Nielsen 5c2a979522 MFH: Fixed static build of mbstring on Windows (makes static build of exif possible too) 2009-06-12 16:15:51 +00:00
Felipe Pena 61d723a359 - Dropped unnecessary var 2009-06-12 14:03:35 +00:00
Andrey Hristov 22c8786493 MFH:
Fix crash when tracing is enabled. Position after buffer was used also
direct usage of MYSQLND_STRING pointer instead of the "s" property of the
structure.
2009-06-12 13:24:57 +00:00
Felipe Pena 5f8ca6da95 MFH: Fixed bug #48533 (__callStatic is not invoked for private/protected methods) 2009-06-12 01:05:25 +00:00
andy wharmby c8ead0cd61 Delete duplicate test 2009-06-11 23:04:35 +00:00
andy wharmby 791b526c67 New intval() tests. Tested on Windows, Linux and linux 64 2009-06-11 22:26:51 +00:00
andy wharmby 1386f796d2 New 64 bit math tests. Tested on Windows, Linux and Linux 64 bit. Tests authored by Dave Kelsey 2009-06-11 21:17:00 +00:00
andy wharmby 13dce00cdf Add/Fix SKIPIF sections of cURL tests 2009-06-11 21:11:20 +00:00
Andrey Hristov 9a2cc0ce67 Put these in an ifdef because they are not used at all if the zval cache
is off.
2009-06-11 17:54:04 +00:00
Greg Beaver 4016894486 update NEWS about phar.phar on windows 2009-06-11 14:40:43 +00:00
Greg Beaver f7246e2086 add phar.phar creation on windows 2009-06-11 14:39:37 +00:00
Pierre Joye f2fcd8fb29 - silent warning and make it less ambiguous 2009-06-11 14:36:48 +00:00
andy wharmby ec0cff39c7 New POISX tests. Tested on Windows (all test SKIP), Linux and Linux 64 2009-06-11 12:31:00 +00:00
Johannes Schlüter 11340cf299 MFH: Use a better extension version 2009-06-11 10:18:08 +00:00
Antony Dovgal efa7b5c4c8 MFH: fix bug #48518 (curl crashes when writing into invalid file handle) 2009-06-11 09:46:43 +00:00
Antony Dovgal 0c8e557621 reapply the fix 2009-06-11 09:43:59 +00:00
Hannes Magnusson 4ed202e185 MFH: Mark spl as required and fix extension loading order
# Not needed in 5.2 as the simplexmliterator is part of spl there
2009-06-11 09:41:15 +00:00
Andrey Hristov 28c8d25dca MFH:
Protect the code when variable is NULL, which should never happen, but
anyway, you know about "never happens" :)
2009-06-11 08:52:06 +00:00
Andrey Hristov cff09ba5df MFH:
Check the pointer before calling a function on it, or we will crash.
  This is a very rare situation where the server is totally broken.
2009-06-11 08:35:47 +00:00
Andrey Hristov a3b85c28c6 Sync with PHP6 - TSRMLS_FETCH
Extract reference decrement in own function
Remove PHPAPI of a function and make it static as it is not called
externally
2009-06-11 08:30:08 +00:00
Felipe Pena 8da7275f1b - MFH: Fix the fix (Bug #46973 - IPv6 address filter rejects valid address) 2009-06-10 19:01:17 +00:00
Johannes Schlüter a8f3eeefe8 back to -dev 2009-06-10 18:39:15 +00:00
Johannes Schlüter 10d976d225 5.3.0RC3 2009-06-10 18:18:43 +00:00
Johannes Schlüter 32f91ba388 MFH Hannes said this shall not be run for RCs 2009-06-10 18:15:22 +00:00
Pierre Joye 1cc5bc31b9 - check for static lib as well 2009-06-10 15:44:51 +00:00
Antony Dovgal ea8d871a01 revert the fix for a while 2009-06-10 11:53:58 +00:00
Antony Dovgal 029f42dc63 MFH: fix arginfo for curl_multi_info_read() 2009-06-10 11:10:01 +00:00
Pierre Joye dfb8717c1e - put mpir headers in their own directory 2009-06-10 09:59:21 +00:00
andy wharmby c0977c826e Fix test - remove bogus variation 2009-06-09 20:18:31 +00:00
Pierre Joye efb976cd2c - missing ACL entry 2009-06-09 16:38:17 +00:00
Pierre Joye 2276bc5188 - #41874 2009-06-09 14:10:08 +00:00
David Soria Parra 368569c05b MFH: Fix bug #47042 (cgi sapi is incorrectly removing the SCRIPT_FILENAME for non apache).
The fix was provided by Sriram Natarajan.
2009-06-09 13:31:39 +00:00
Pierre Joye ba79cd5a23 - fix build (void alarm) 2009-06-09 09:26:02 +00:00
Pierre Joye 64934cf360 - missing include 2009-06-09 09:25:18 +00:00
Scott MacVicar 2d96aa5b22 BFN 2009-06-09 02:00:46 +00:00
Scott MacVicar fc8426ad31 MFH Fix bug #48493 - spl_autoload_register can leave the HT in an inconsistent way.
Need to point the second elements previous item to head so we can traverse upwards.
2009-06-09 01:58:07 +00:00
Scott MacVicar cf1a08e317 Move entry to 5.2 2009-06-09 00:42:51 +00:00
Pierre Joye 49666eece6 #41874, separate STDOUT and STDERR in exec functions 2009-06-09 00:25:37 +00:00
Pierre Joye c59a4a0173 - typo 2009-06-08 21:27:05 +00:00
Derick Rethans 6421bb34f8 - Updated to version 2009.9 (2009i) 2009-06-08 13:53:34 +00:00
Ilia Alshanetsky ae5a233a62 Fixed test 2009-06-08 12:31:08 +00:00
Robert Nicholson e592b4fd15 New tests for operators. These tests were auto generated to verify correctness for a number of significant values. The work was done by Dave Kelsey. 2009-06-08 11:59:32 +00:00
Andrey Hristov ec777b89f4 Merge with HEAD. Someone committed changes to HEAD and did not merge back to
the branch.
Also switch off the zval cache, for now.
2009-06-08 10:20:27 +00:00
Pierre Joye 4cb1d57fd5 - sync with 1.0.2, improve perf x86-64 (patch by Solar Designer) 2009-06-08 08:44:15 +00:00
Scott MacVicar 40521699ce MFH make SQLite3::enableExceptions() return the previous value. 2009-06-08 02:15:54 +00:00
Ilia Alshanetsky 5289261baa Fixed bug #44827 (define() is missing error checks for class constants) 2009-06-08 01:26:03 +00:00
Patrick Allaert 4aca43008f MFH: Removed credit 2009-06-07 21:27:19 +00:00
Robert Nicholson 176012df22 New tests for foreach loops. These were written by another member of the Projectzero team. 2009-06-07 21:03:48 +00:00
Matt Wilmas dca18b68d1 MFH: Fixed bug #47836 (array operator [] inconsistency when the array has PHP_INT_MAX index value)
Also simplified related array_push() test
2009-06-07 19:28:15 +00:00
Matt Wilmas 2462fce244 MFH: Changed error messages to use "cannot" instead of "can not" (meaning "also can") 2009-06-07 15:46:54 +00:00
Patrick Allaert 10b559c28c MFH: Fixed bug #48469 (ldap_get_entries() memory leaks on empty search results) 2009-06-07 13:07:58 +00:00
Matt Wilmas 1fa3b21c15 MFH: Fixed error message grammar:
- "cannot" instead of "can not" (meaning "also can")
 - "than" instead of "then" (Hint: "then" should hardly be needed;
     you're not telling the order in which to do something)

... plus removed a couple ending. dots
2009-06-06 02:40:49 +00:00
Brian Shire cb7a21a42b MFH: Make pass_two visible to extensions with ZEND_API (required for optimizer). 2009-06-05 23:20:59 +00:00
Rasmus Lerdorf 04f5d7c909 There is no always_inline attribute in gcc2 2009-06-05 22:14:21 +00:00
Matt Wilmas d55300298e MFH: Added zend_eval_stringl and made create_function(), etc. binary-safe 2009-06-05 18:50:32 +00:00
Matt Wilmas a80be6827d MFH: Fixed tests again after double->long conversion change (to match 5.2) 2009-06-05 17:15:33 +00:00
Arnaud Le Blanc 85b9327836 MFH: better fix for #48409 , #48428 , #48228 2009-06-05 11:21:31 +00:00
Greg Beaver fb86c3f7a2 MFH: fixed isset() on sub-directories (isset("blah") if file "blah/foo.php" exists) 2009-06-05 04:46:49 +00:00
Greg Beaver a8e7103bbe MFPECL: fix security vulnerability in phar's handling of long tar filenames 2009-06-04 19:59:09 +00:00
Matt Wilmas 26cde1ee2f MFH: Updated tests after double->long conversion change (basically to match 5.2)
# Let me know about other failing tests I missed
2009-06-04 18:25:06 +00:00
Matt Wilmas b907aa4331 MFH:
Restored double->long conversion behavior to that of PHP 5.2 (on most platforms) and prior:
 * Out-of-range numbers overflow/preserve least significant bits (no LONG_MAX/MIN limit)
 * See bug #42868 (presumably-rare platform with different results in 5.2)
 * On 32-bit platforms with 64-bit long type, a zend_long64 cast has been added,
    otherwise it's the same as 5.2
 * Use this conversion method everywhere instead of some plain (long) casts

Added 'L' parameter parsing specifier to ensure a LONG_MAX/MIN limit:
 * Essentially what 5.3's new conversion was doing in most cases
 * Functions with "limit" or "length" type params could be updated to use this,
    and prevent confusing overflow behavior with huge numbers (*also* in 5.2)
  - See bug #47854, for example; or even #42868 again

# Test updates coming
2009-06-04 18:20:45 +00:00
Andrei Zmievski 1787a2272a MFB 2009-06-04 18:17:43 +00:00
Etienne Kneuss b8d64e4085 MFH: Include other flags as well 2009-06-04 14:46:26 +00:00
Hannes Magnusson 2a257adda9 MFH: Fixed creating directory structure when extracting phars 2009-06-04 12:22:32 +00:00
Jani Taskinen a332541aaa MFH:- Fixed bug #48419 (non-portable STDIN fileno in cgi_main.c) 2009-06-04 11:51:43 +00:00
Jani Taskinen 29c0b397ec MFH: CS + WS changes 2009-06-04 11:47:27 +00:00
Pierre Joye e7560b8316 - typo 2009-06-04 07:41:01 +00:00
Pierre Joye 6220c88f14 - new constnats 2009-06-04 07:01:47 +00:00
Pierre Joye 0168025f4c - [DOC] add PHP_WINDOWS_NT_* and PHP_WINDOWS_VERSION_* constants (usefull for testing and features detections)
see http://msdn.microsoft.com/en-us/library/ms724451(VS.85).aspx for the explanation
2009-06-04 06:59:46 +00:00
Felipe Pena 1504c700be - Fixed tests 2009-06-04 01:15:12 +00:00
Brian Shire b39f215173 MFH: Add test for Bug #47859 parse_ini_file() does not like asterisk (*) in key in the beginning 2009-06-03 19:37:26 +00:00
Ilia Alshanetsky 2c31cd513b Fixed bug #46386 (Digest authentication with SOAP module fails against MSSQL
SOAP services)

#original patch by lordelph at gmail dot com
2009-06-03 12:39:50 +00:00
Zoe Slattery 2e8ad7f7d1 Commiting testfest tests from tek 2009-06-03 12:30:40 +00:00
Pierre Joye 472d000289 - fix title 2009-06-03 08:31:24 +00:00
Pierre Joye 2f6f336205 - fix parameter order and return value check in windows (Venkat Raman Don, Pierre)' link 2009-06-03 07:56:53 +00:00
Kalle Sommer Nielsen f763fbb1ee MFH: config.h is in this directory, not in ext/bcmath root, fixes re-compilation for me 2009-06-03 01:19:33 +00:00
Kalle Sommer Nielsen 3dcd2b6ace MFH:
* We dont need to wrap to two lines here, its small enough to show with a standard sized cmd window
* Bump copyright year in the .rc
2009-06-03 01:14:58 +00:00
Jani Taskinen d0ef930190 MFH:- Fixed bug #48456 (CPPFLAGS not restored properly in phpize.m4) 2009-06-02 19:54:03 +00:00
Ilia Alshanetsky c1c9645128 Fixed test 2009-06-02 12:19:34 +00:00
Jani Taskinen c7172ee172 fix test 2009-06-02 08:03:07 +00:00
Nuno Lopes 95ef46c034 fix compiler warnings by moving all std includes after include of zend_config.h.
this also fixes the build with stricter compilers than gcc (like clang)
2009-06-01 17:51:53 +00:00
Arnaud Le Blanc a197c0b751 MFH: New tests
# These tests were failing on different configurations, so adding them
# all to get more chances of seeing one failing in case of problem.
2009-06-01 16:10:35 +00:00
Arnaud Le Blanc 2403a58011 MFH: better fix for #48409 , #48428 , #48228 2009-06-01 15:07:42 +00:00
Ilia Alshanetsky 083ed5b3e5 Fixed bug #48273 (snmp*_real_walk() returns SNMP errors as values) 2009-06-01 13:10:18 +00:00
Zoe Slattery 102f76b323 Engine execution order tests 2009-06-01 13:01:04 +00:00
Zoe Slattery 9dc6f2a873 Fixes to work on Windows as well as Linux 2009-06-01 09:01:06 +00:00
Etienne Kneuss 61bbd8af75 MFH: Add test for the timeout inside shutdown function 2009-05-31 21:32:42 +00:00
Stanislav Malyshev 2d6377e322 fix for #48247 2009-05-31 21:28:38 +00:00
Andrei Zmievski 77beb62c5f Fix the build. 2009-05-31 18:55:10 +00:00
Ilia Alshanetsky 7c3e7f88c4 Fixed bug #48359 (Script hangs on snmprealwalk if OID is not increasing)
# Original patch by simonov at gmail dot com
2009-05-31 14:11:04 +00:00
Jani Taskinen 7012d0967c MFH: no dots in errors 2009-05-31 13:51:08 +00:00
Jani Taskinen 686ede9c50 fix news 2009-05-31 13:20:22 +00:00
Kalle Sommer Nielsen 80bc751be1 This shouldn't have been in there 2009-05-31 11:16:46 +00:00
Andrei Zmievski efc0927f4f Expose encode/decode API. 2009-05-31 01:44:07 +00:00
Arnaud Le Blanc b4d9c79162 MFH: Take small blocks cache into account in memory_get_usage() 2009-05-30 16:42:13 +00:00
Arnaud Le Blanc bed00e15d1 MFH: Fix aliasing issue (fixes #48409 , #48428 , #48228) 2009-05-30 16:31:12 +00:00
Scott MacVicar 16398c1990 MFH: Make sure the timeout is checked in the shutdown function, patch from Etienne 2009-05-30 09:48:16 +00:00
Ulf Wendel 1ad1a2a0af MFH - Fixing tests - messages/warnings can vary by version 2009-05-29 13:37:08 +00:00
Ulf Wendel 775cc0ca20 MFH - Updating test to reflect API changes. 2009-05-29 13:23:01 +00:00
Ulf Wendel 13d92e6957 MFH - Skip test for libmysql. The MySQL C-API does not support it, mysqlnd does... 2009-05-29 13:12:39 +00:00
Andrey Hristov 0f5e7e2bf9 NEWS 2009-05-29 13:11:10 +00:00
Andrey Hristov c1d46eb502 MFH:Add support for mysql_stmt_store_result() from libmysql 6.0.8+ and 5.4.x 2009-05-29 13:09:47 +00:00
Ulf Wendel f3f1256332 MFH - 1) The wording of a message can differ by version and by libmysql vs. mysqlnd. 2) %i is better than %s 2009-05-29 13:02:43 +00:00
Ulf Wendel 6252b5ca20 MFH - Behaviour is undefined with libmysql, accept whatever libmysql may return. With mysqlnd you get the defined value of -1 to indicate 'no value'. 2009-05-29 12:55:55 +00:00
Andrey Hristov ccf0665170 MFH:Fix for the failing mysql_stmt_execute() test. Data was cleaned after
stmt_reset() but it should stay and be freed as later as next stmt_execute()
2009-05-29 12:19:40 +00:00
Ulf Wendel 3f17909a60 MFH - 'Fixing' test to reflect a libmysql vs. mysqlnd difference. With libmysql it is not defined what mysql_stmt_store_result() shall return when one tries to store the (non-existing) result set of a failed SQL statement, http://dev.mysql.com/doc/refman/6.0/en/mysql-stmt-store-result.html . mysqlnd will detect the SQL failure and return false. libmysql will return true. If you want libmysql to change, file a bug report at MySQL... I don't think there is a good way to work around this in the extension itself. 2009-05-29 11:59:26 +00:00
Zoe Slattery 4085d06822 better fix 2009-05-29 11:46:42 +00:00
Ulf Wendel 2445a242ec MFH - Another detail where mysqlnd is superior than libmysql. The mysql_info() from libmysql does not support SELECT: http://dev.mysql.com/doc/refman/6.0/en/mysql-info.html . mysqlnd does support it. Libmysql feature request filed http://bugs.mysql.com/bug.php?id=45189 2009-05-29 11:01:06 +00:00
Ulf Wendel a027a64d73 MFH: Weaker test - libmysql/server error messages can differ by version 2009-05-29 10:34:23 +00:00
Ulf Wendel 396f5803e8 MFH - Weaker test: functions are only available if HAVE_EMBEDDED_MYSQLI is set. There is probably no proper way to check this condition in the user land. 2009-05-29 10:25:49 +00:00
Ulf Wendel 19bdbc49c3 MFH - Skip when using libmysql. Likely a regression bug - http://bugs.mysql.com/bug.php?id=45184 2009-05-29 10:15:50 +00:00
Zoe Slattery c3bcd7d365 fixing to work with older levels of libcurl 2009-05-29 09:46:11 +00:00
Andrey Hristov a3aaa2398d MFH:The option has changed the name, hence we change the test 2009-05-29 08:58:32 +00:00
Pierre Joye 469d4938fc - MF52: #42143, the constant NAN is reported as 0 on Windows 2009-05-29 08:11:36 +00:00
Andrey Hristov 133296f962 MFH:Fix a very well hidden error because of not being careful with CPP.
I usually don't make this mistake :)
2009-05-29 08:05:38 +00:00
Zoe Slattery e660f91c26 Engine execution order tests 2009-05-29 07:52:04 +00:00
Kalle Sommer Nielsen 953cf4c217 MFH: If we don't have a comment (for the 3rd argument in ARG_[ENABLE|WITH], then don't print a comment say "undefined" 2009-05-29 07:43:07 +00:00
Scott MacVicar 4044f880e8 MFH: Fix bug #48416 - Force a cache size for ereg to stop it getting out of control. Lazy LRU here. 2009-05-28 21:57:24 +00:00
Ulf Wendel 19194ff51b MFH - Asynchronous queries are mysqlnd only. If you want them with libmysql, ping JimW who works on Connector/C. 2009-05-28 18:57:34 +00:00
Ulf Wendel 2eccc6f2bf MFH - Andrey needs to have a look at this one. The bug report itself is bogus. However, the bug report shows a result set and that is wrong. 2009-05-28 18:28:08 +00:00
Andrey Hristov fe55da71bb MFH:
Forgot to commit this one, of the ANSI_QUOTES fame
2009-05-28 18:10:40 +00:00
Andrey Hristov cabce152f9 MFH:Fix again the tests for ANSI_QUOTES 2009-05-28 18:00:28 +00:00
Andrey Hristov 804f6138a6 MFH:Fix a valgrind warning as well as more trace log information 2009-05-28 17:49:29 +00:00
Andrey Hristov 76d091d5f5 MFH:Fix a problem with cursors, which did not happen with unbuffered PS for
some reason. Double free of the data, which led to valgrind warnigns.
The fix actually optimizes the code in this cases because the old code
used copy_ctor while the new one skips it because it is not needed.
Transferring data ownership and nulling works best, for PS where we
always copy the string from the result set, unlike the text protocol.
2009-05-28 16:35:41 +00:00
Ulf Wendel 4645f51360 MFH - I had accidently removed Andrey's path to work with ANSI QUOTES... fixing what I broke (part 1) 2009-05-28 15:49:14 +00:00
Ulf Wendel 7926037318 MFH - what a wonderful word. After the change in HEAD its easy to do a merge. The merge removes all UEXPECTF sections from the old days. Yes, there have been UEXPECTFs in 5_3. I hope PHP 6 won't change again over time... :-) 2009-05-28 14:33:43 +00:00
Antony Dovgal 31c2c5ffb7 fix test 2009-05-28 13:56:44 +00:00
Pierre Joye f002287eb3 - MFH: #48378, exif_read_data() segfaults on certain corrupted .jpeg files 2009-05-28 13:48:32 +00:00
Arnaud Le Blanc 23a25db653 MFH: New test 2009-05-28 13:22:28 +00:00
Arnaud Le Blanc 245f051bbe Moved to 5.2 2009-05-28 13:21:08 +00:00
Andrey Hristov 6c4e8fa4f9 MFH:
Fix a bug with mysqlnd_fetch_field(_direct()). With mysqlnd the optimised
function was called, which however, doesn't respect that during store the
raw data is not unpacked, to be lazy. The data is unpacked to zvals later,
during every row fetch. However, this way max_length won't be calculated
correctly. So, if a mysqlnd_fetch_field(_direct) call comes we need to
unpack everything and then calculate max_length...and that is expensive,
defies our lazy unpacking optimisation.
2009-05-28 11:47:48 +00:00
Andrey Hristov 90a8a7f857 MFH:Fix a test, UNSIGNED is expected 2009-05-28 10:16:41 +00:00
Arnaud Le Blanc 6a9aa30d85 MFB52: Fix "request_startup() for zlib module failed" when client does not
accepts compression and zlib.output_compression is On
# (not in HEAD)
2009-05-28 10:15:14 +00:00
Andrey Hristov 04d8609e9f MFH: Fix failures when the server is running with ANSI_QUOTES 2009-05-28 09:58:36 +00:00
Scott MacVicar 2cbe718985 BFN, though this library gets a lot of updates 2009-05-28 03:22:44 +00:00
Scott MacVicar 0062120464 MFH sync SQLite 3.6.14.2 2009-05-28 03:20:33 +00:00
Pierre Joye 2a93efcea3 - fix build, stderr cannot be used as var or struct member 2009-05-27 22:35:26 +00:00
Robert Nicholson 1d4da4fd0c Language Tests: returnByReference 2009-05-27 22:34:25 +00:00
Andrey Hristov bf1a698e51 MFH:
Less warnings by usage of proper modifier
2009-05-27 20:05:37 +00:00
Andrey Hristov 91a4502914 MFH:because we use int64_t we need corresponding printf modifiers. the type
can be different on 32 and 64 bit, thus we can't use ld and lld but
C helps us with inttypes.h and PRId64 and PRIu64 modifiers (without the %)
2009-05-27 19:57:11 +00:00
Andrey Hristov 07fc51d559 MFH: Fix tests when the server is running with ANSI_QUOTES 2009-05-27 18:18:58 +00:00
Ulf Wendel 6cf02c738b Crappy anonymous MySQL user account... trying to make the test more portable. 2009-05-27 17:54:30 +00:00
Ulf Wendel 774f562375 The test is bogus as long as there is no (proper) way to detect from the PHP userland if persistent connections do a change user or not. If they do is controlled by define at the moment. 2009-05-27 17:52:32 +00:00
Ulf Wendel b3645db1ce Testing a little further into the direction of a possible mysqlnd vs. libmysql compatibility break or a libmysql bug. It is not clearly stated in the MySQL C-API documentation what excactly happens on stmt_reset(). 2009-05-27 17:50:09 +00:00
Ulf Wendel a39d92c144 Trying to get test failures down by fixing tests. 2009-05-27 17:46:14 +00:00
Pierre Joye 45832feb40 - fix build 2009-05-27 15:16:18 +00:00
Andrey Hristov 10bc558aca MFH: Revert in regard of my_ulonglong which should be used instead of long
which can be anything.
2009-05-27 15:05:28 +00:00
Pierre Joye 7f6fa6ce1c - fix build on unix with bundled gd 2009-05-27 13:48:13 +00:00
Antony Dovgal 988b89aaa3 MFH: fix compile warnings 2009-05-27 13:42:17 +00:00
Pierre Joye f726afbfeb - [DOC] always enable imagecolormatch 2009-05-27 08:18:24 +00:00
Pierre Joye 59ec80c572 - MFH: [DOC] always enable imagerotate (bundled or system gd) 2009-05-27 07:18:05 +00:00
Kalle Sommer Nielsen e9d289289b MFH: Lets pass the built php binary to run-tests.php's -p parameter 2009-05-27 01:46:48 +00:00
Kalle Sommer Nielsen a9ddcbf162 MFH: Added configure.bat to cvsignore 2009-05-27 01:45:13 +00:00
Kalle Sommer Nielsen 4ab4b6817d MFH: Silent dl() if it fails 2009-05-27 01:38:13 +00:00
Pierre Joye a008f130cd - MFH: [DOC] - add image(filled)ellipse to the compat layer (work around a bug in debian too, function is declared but not present in the lib...) 2009-05-26 20:14:31 +00:00
Jani Taskinen 1296356489 - Test for bug #48203 2009-05-26 17:19:23 +00:00
Jani Taskinen 83748ac00d MFH: Fixed bug #48203 (crash when CURLOPT_STDERR is set to regular file) 2009-05-26 15:49:15 +00:00
Derick Rethans f10d399459 - Updated to version 2009.8 (2009h) 2009-05-26 14:26:57 +00:00
Arnaud Le Blanc f2b8b7f4e0 MFH: Fix return value of pcntl_wexitstatus() (fixes #47566,
patch by james at jamesreno dot com)
2009-05-26 14:01:39 +00:00
Pierre Joye 4988470303 - ws 2009-05-26 13:57:07 +00:00
Andrey Hristov 7ae2505cab Fix a typo, utf8 is 3 byte max, for us, for now
Add a another cset
2009-05-26 13:41:18 +00:00
Pierre Joye 704d7587b0 - enable filter constants 2009-05-26 13:35:59 +00:00
Pierre Joye 6b3e2b1910 - expose gdImageGetTrueColorPixel in bundled lib
- fix bundled lib build
2009-05-26 13:08:59 +00:00
Pierre Joye b682f42915 - [DOC] always enable imagefilter and imageconvolution, even when built against system's gd 2009-05-26 12:50:40 +00:00
Felipe Pena 8b63e5b092 - Fixed param type (%l -> %ld) 2009-05-26 12:35:46 +00:00
Felipe Pena d91344722d - MFH: Nuke unused variables 2009-05-26 12:32:00 +00:00
Jani Taskinen 9672e18acd Nuke duplicate tests 2009-05-26 10:27:08 +00:00
Jani Taskinen 694566d6c4 fix test 2009-05-26 10:12:16 +00:00
Pierre Joye c559d4fb30 - always add libgd/ 2009-05-26 08:53:13 +00:00
Pierre Joye d8b76a8411 - add a note about the actual problen so we don't forget it 2009-05-26 08:10:49 +00:00
Jani Taskinen 7811bcb155 - Added note about omitted break 2009-05-26 08:03:07 +00:00
Eric Stewart 86fed7fac7 Add tests:
DOMComment::__construct() with constructor called twice.
DOMDocumentFragment::appendXML() with unbound fragment.
DOMDocumentFragment::appendXML() with unbalanced chunks.
DOMDocumentFragment::__construct() called twice.
DOMDocumentType: basic access to all properties.
DOMDocumentType::name with invalid state.
DOMDocumentType::entities with invalid state.
DOMDocumentType::notations with invalid state.
DOMDocumentType::publicId with invalid state.
DOMDocumentType::publicId with empty value.
DOMDocumentType::systemId with invalid state.
DOMDocumentType::systemId with empty value.
DOMDocumentType::internalSubset with invalid state.
2009-05-26 06:09:18 +00:00
Jani Taskinen c3795a63e0 - Fixed bug #45202 (zlib.output_compression can not be set with ini_set()) 2009-05-26 05:54:50 +00:00
Jani Taskinen e179d7c26e ws + cs 2009-05-26 04:44:54 +00:00
Kalle Sommer Nielsen 4b95edd125 MFH: Typo 2009-05-25 19:41:13 +00:00
Pierre Joye c32cdc4fd0 - better fix for file:/// and file://localhost (thx Ilia), init file_dest when the path is an uri 2009-05-25 16:09:27 +00:00
Pierre Joye c11979a8bf - #48202, Out of memory error when passing non-existing filename, enable related tests (marked as XFAIL now) 2009-05-25 15:35:03 +00:00
Rasmus Lerdorf e00d6f1876 Removing test 2009-05-25 11:58:27 +00:00
Pierre Joye da27f4237a - MFH: enable MPIR support and the good old 4.1.x gmp for VC6. solving the lgplv3 mess 2009-05-25 10:15:19 +00:00
Eric Stewart d9c9d4cf4b Add the following new tests:
DOMCharacterData::appendData() with no arguments.
DOMCharacterData::deleteData() with count exceeding string size.
DOMCharacterData::deleteData() with no arguments.
DOMCharacterData::deleteData() with offset exceeding string size.
DOMCharacterData::insertData() with no arguments.
DOMCharacterData::replaceData() with no arguments.
DOMComment::__construct() with more arguments than acceptable.
DOMDocumentFragment::__construct().
DOMDocumentFragment::__construct() with too many errors.
DOMDocumentFragment::appendXML() with no arguments.
DOMDocumentFragment::appendXML() with children with properties.
2009-05-25 06:03:41 +00:00
Sara Golemon 00a554b4a3 MFH(r-1.103) Expand zend_symtable_update_current_key to allow specifying HashPosition 2009-05-25 01:18:00 +00:00
Greg Beaver 1c30b43e50 MFH: fix potential segfault when converting phars with metadata to other formats, add test 2009-05-24 18:50:58 +00:00
Ilia Alshanetsky 529bcf35c2 MFB: Improve fix for bug #48313 2009-05-24 16:01:48 +00:00
Felipe Pena 0873648ef0 - New tests (testfest NorthWestUG) 2009-05-23 15:38:18 +00:00
Felipe Pena 941ac63eef - MFH: Added missing param checks 2009-05-23 15:14:15 +00:00
Felipe Pena be7d45b0dc - New xsl files 2009-05-23 14:49:55 +00:00
Felipe Pena 5dfcef7ab4 - New tests (testfest BerlinUG) 2009-05-23 14:45:07 +00:00
Felipe Pena 424c018991 - Fix error message 2009-05-23 14:26:47 +00:00
Nuno Lopes 79a9229772 fix compilation of pdo_firebird and intl extension with ld --as-needed 2009-05-23 13:52:00 +00:00
Kalle Sommer Nielsen e26710bfc4 Fixed compiler warning again, uint8_t is only available with mysqlnd. This is not affecting HEAD 2009-05-23 02:58:15 +00:00
Eric Stewart 30cdf25f22 New test: DOMAttr read $name property.
New test: DOMAttr read $ownerElement with null parent.
New test: DOMAttr write non-string $value property
New test: DOMCDATASection __construct() with no arguments.
New test: DOMCharacterData - Invalid State Error when getting data out of content.
2009-05-23 01:42:37 +00:00
Eric Stewart 21cb2046ae New test: DOMAttr __construct() with no arguments. 2009-05-23 01:33:39 +00:00
Kalle Sommer Nielsen e45cdba580 MFH: Previous commit was an old version of the patch, PHP_ZTS is not a boolean but the behaviour is still correct 2009-05-22 19:47:15 +00:00
Kalle Sommer Nielsen 3de5c79f73 MFH: Don't build SQLite threadsafe on NTS builds 2009-05-22 19:41:15 +00:00
Kalle Sommer Nielsen 4d855122a5 MFH: Fix test on Windows 2009-05-22 18:27:38 +00:00
Kalle Sommer Nielsen 7852108cce MFH: Added missing SKIPIF 2009-05-22 18:22:30 +00:00
Felipe Pena ff4fd58f08 - MFH: Fixed invalid date checking 2009-05-22 12:49:40 +00:00
Felipe Pena 50038a78f5 - New test 2009-05-22 12:38:57 +00:00
Arnaud Le Blanc b33c51693b MFH: Use zend_get_property_info() in get_class_vars() (fixes #46812) 2009-05-22 11:19:30 +00:00
Kalle Sommer Nielsen ccd915ff3f getClosureThis() and $this handling in closures was removed 2009-05-22 03:32:20 +00:00
Arnaud Le Blanc 5c5dcf5e7a MFH: Fixed bug #48336 (ReflectionProperty::getDeclaringClass() does not
work with redeclared property)
(patch by Markus dot Lidel at shadowconnect dot com)
2009-05-21 16:01:37 +00:00
Arnaud Le Blanc 9aca3c04a0 MFH: set second argument of gettimeofday() to NULL (fixes #48346,
patch by adriano at guiadohardware dot net)
2009-05-21 14:21:40 +00:00
Arnaud Le Blanc 52cc098a90 MFH: Better fix for #45622 (patch by robinf at php do net) 2009-05-21 13:26:14 +00:00
Ilia Alshanetsky 44fe1bf83f Fixed bug #48207 (CURLOPT_(FILE|WRITEHEADER options do not error out when
working with a non-writable stream)
2009-05-21 12:52:05 +00:00
Jani Taskinen 2e61607c8a MFH: ws 2009-05-21 02:15:03 +00:00
Ilia Alshanetsky b683c61e60 MFB: Re-introduce the Matteo's patch and combine default & text handling
since they appear to be the same irregardless on notes inside sqlite3.h
2009-05-20 15:05:36 +00:00
Ilia Alshanetsky 52f599687a Fixed build 2009-05-20 13:10:49 +00:00
Jani Taskinen d5455551a5 - Sync with HEAD (thanks Hannes :) 2009-05-20 12:44:19 +00:00
Jani Taskinen 9a4069529c MFH: Fix non-windows builds 2009-05-20 12:15:39 +00:00
Kalle Sommer Nielsen 061f229abc MFH: Fixed shared build 2009-05-20 10:18:51 +00:00
Arnaud Le Blanc 6540730732 MFH: Fix skipif 2009-05-20 10:08:32 +00:00
Antony Dovgal 0813510d1b sync with HEAD 2009-05-20 09:26:12 +00:00
Arnaud Le Blanc 90d1875421 MFH: set default value of "precision" ini setting,
many tests depend on this
2009-05-20 09:22:50 +00:00
Arnaud Le Blanc 808acd6b64 MFH: Fix skipif 2009-05-20 09:13:29 +00:00
Arnaud Le Blanc 73553e8c77 MFH: Fixed bug #48326 (constant MSG_DONTWAIT not defined) 2009-05-20 09:05:46 +00:00
Kalle Sommer Nielsen f02ebe4a08 MFH: Fix compiler warnings in ext/mysql, ext/mysqli and ext/pdo_mysql 2009-05-20 08:30:12 +00:00
Kalle Sommer Nielsen 31a1dbe2df MFH: Fix Windows build, dns_get_record is defined in dns_win32.c, not here 2009-05-20 08:18:48 +00:00
Jani Taskinen 764fd8a423 MFH:- Fix bug #48317 (compile failure in dns.h) (thanks to Pierre for introducing this) 2009-05-19 19:39:53 +00:00
Hannes Magnusson 39ac962ffd MFH: Partial fix for bug#48333 2009-05-19 19:23:33 +00:00
Ilia Alshanetsky 5ec5e3b5f2 The \0 removal is only needed prior to 3.4.0 2009-05-19 19:15:18 +00:00
Ilia Alshanetsky 37609844de Warning fix 2009-05-19 18:42:08 +00:00
Ilia Alshanetsky 8f7b7495f2 Upgraded to 3.6.14.1 2009-05-19 18:32:46 +00:00
Kalle Sommer Nielsen 21f836ee64 MFH: Fixed compiler warnings
# (see previous commit message)
2009-05-19 18:08:57 +00:00
Kalle Sommer Nielsen 6068ce7469 MFH: Fixed compiler warning 2009-05-19 17:47:06 +00:00
Kalle Sommer Nielsen ff88b45ffc MFH: Fix compiler warnings 2009-05-19 17:38:29 +00:00
Ilia Alshanetsky 70fb8c85f1 Revert faulty warning fix 2009-05-19 16:14:13 +00:00
Kalle Sommer Nielsen 9e230424b5 Cast to unsigned char to prevent compiler warning 2009-05-19 16:06:00 +00:00
Kalle Sommer Nielsen 01fc4ed1d6 MFH: Fix compiler warnings 2009-05-19 16:03:36 +00:00
Brian Shire c80f0bf769 MFH: Fix bug #47859 parse_ini_file() does not like asterisk (*) in key in the beginning, and allow [*_-] chars at start of ini labels 2009-05-19 15:59:36 +00:00
Jani Taskinen 59bc60ffbe - Revert bad compile warning fix which causes compile failures with older glibc 2009-05-19 15:38:07 +00:00
Jani Taskinen ff18679418 MFH:- Fix test: since cURL 7.19.4 CURLINFO_CONTENT_LENGTH_* return -1 if the size is unknown 2009-05-19 14:05:39 +00:00
Jani Taskinen e36c8c49c3 MFH: Unify macros 2009-05-19 11:12:20 +00:00
Kalle Sommer Nielsen 5d3972f73a MFH: Cast to SQLUSMALLINT 2009-05-19 10:25:53 +00:00
Kalle Sommer Nielsen a58bd002d6 MFH: Fix --with-pdo-mssql build and add some warnings if header/libs are not found 2009-05-19 10:22:25 +00:00
Hannes Magnusson 45b2586666 Fix build 2009-05-19 10:00:12 +00:00
Jani Taskinen ec9b82f0f4 fix news 2009-05-19 09:41:34 +00:00
Derick Rethans d29d24427f - MFH: Get rid of the four different versions of zend_extension* and only use
zend_extension. Because of the API identifier change in PHP 5.3 you also get
  a proper warning message now.
#- [DOC]
2009-05-18 21:33:38 +00:00
Pierre Joye aedaf1aea9 - close manually the impersonation token 2009-05-18 20:56:46 +00:00
Zoe Slattery e5348b9152 Removing redundant UEXPECT 2009-05-18 19:16:30 +00:00
Ilia Alshanetsky e99d4e9adc Fixed bug #48313 (fgetcsv() does not return null for empty rows) 2009-05-18 18:45:30 +00:00
Jani Taskinen 9ece649f7c MFH: ws + sync 2009-05-18 16:10:09 +00:00
Hannes Magnusson 82c49a50f4 MFH: Print out the WARNed section 2009-05-18 14:08:23 +00:00
Hannes Magnusson ebf4c8ddb8 Fix test 2009-05-18 13:52:16 +00:00
Jani Taskinen befe469770 MFH 2009-05-18 12:51:05 +00:00
Pierre Joye 4398fbcb07 - MFH: use ZEND_ARG_ARRAY_INFO for arginfo_curl_setopt_array 2009-05-18 12:01:44 +00:00
Pierre Joye f77d46ea36 - sync with HEAD 2009-05-18 11:58:04 +00:00
Pierre Joye 52d8816cf7 - more WS 2009-05-18 11:48:31 +00:00
Pierre Joye b5b4b19b8b - MFH: add CURLPROXY_SOCKS4 2009-05-18 11:18:59 +00:00
Pierre Joye 4b0a0e5568 - WS 2009-05-18 11:17:51 +00:00
Pierre Joye 0f8d0d9f62 - should not have been commited 2009-05-18 10:32:04 +00:00
Pierre Joye 330e416563 - MFB: - disable file:// when safe_mode or open_basedir are enabled 2009-05-18 10:31:08 +00:00
Pierre Joye 10ace3fe97 - #44859, fixed support for windows ACL, drop win9x code 2009-05-17 19:44:27 +00:00
Felipe Pena 47f87a58aa - New tests (testfest BerlinUG) 2009-05-17 18:08:09 +00:00
Felipe Pena b5cec43162 - New tests (testfest BelgiumUG) 2009-05-17 16:51:59 +00:00
Felipe Pena 6f75314b84 - New tests (testfet LondonUG) 2009-05-17 15:24:08 +00:00
Arnaud Le Blanc c79528a26d MFH: Fixed bug #48309 (stream_copy_to_stream() and fpasstru() do not
update stream position of plain files)
2009-05-17 14:58:10 +00:00
Felipe Pena 7c30401aec - New tests (testfest Quebec) 2009-05-17 01:16:35 +00:00
Felipe Pena 1bcc3aac33 - New tests (testfest DutchUG) 2009-05-16 21:13:43 +00:00
Arnaud Le Blanc 8a8e036175 MFH: Test for #38802 2009-05-16 20:45:28 +00:00
Arnaud Le Blanc ac57b7078b MFH: Minimal HTTP server to test HTTP stream wrapper 2009-05-16 20:44:05 +00:00
Arnaud Le Blanc a5db3627e5 Fixed bug #38802 (max_redirects and ignore_errors)
(patch by datibbaw@php.net)
2009-05-16 20:34:48 +00:00
Arnaud Le Blanc fab1f0e754 Fix warning when inner stream of a temp:// stream is closed before
the stream ifself
2009-05-16 20:27:36 +00:00
Arnaud Le Blanc a2600facdd MFH: Fixed bug #48307 (stream_copy_to_stream() copies 0 bytes when $source
is a socket)
2009-05-16 20:23:06 +00:00
Felipe Pena 06a10f3789 - New tests (testfest Quebec) 2009-05-16 18:26:59 +00:00
Felipe Pena 2fa28208a6 - Added changes from testfest ParisUG && Changed line endings 2009-05-16 17:02:24 +00:00
Felipe Pena 84b1765852 - New tests (testfest ParisUG) 2009-05-16 16:37:31 +00:00
Felipe Pena 11c78461d6 - New tests (testfest DutchUG) 2009-05-16 15:13:57 +00:00
Felipe Pena 837cf07807 - New tests (testfest CataloniaUG) 2009-05-16 14:41:27 +00:00
Pierre Joye 59a6d8d5a2 - WS 2009-05-15 17:48:34 +00:00
Kalle Sommer Nielsen db137b4d69 MFH: Fix compiler warnings 2009-05-15 17:28:08 +00:00
Moriyoshi Koizumi fcede921b6 * MFH: Roll it back. 2009-05-15 17:03:03 +00:00
Christopher Jones ad07803d23 MFH: New array_multisort() test and code comment fix (Simon Westcott) 2009-05-15 16:46:22 +00:00
Kalle Sommer Nielsen 178cb9c572 Added some more comments about deprecated ini settings 2009-05-15 09:44:08 +00:00
Kalle Sommer Nielsen 105272bdec MFH: Fix arginfo 2009-05-15 09:10:55 +00:00
Scott MacVicar a6acb07d2a BFN 2009-05-14 22:03:35 +00:00
Scott MacVicar d2a7785878 MFH Allow a custom recursion depth to be specified for json_decode() 2009-05-14 22:02:08 +00:00
Jani Taskinen c0ce0e7932 - Fix the harmless patch that caused harm :) 2009-05-14 21:23:35 +00:00
Jani Taskinen 5910fcaf13 MFH 2009-05-14 21:00:15 +00:00
Moriyoshi Koizumi 6e265a738e - Add a new test for the additional delimiter of the encoding conversion filter 2009-05-14 19:06:20 +00:00
Arnaud Le Blanc 12d41f7a1f moved to 5.2 2009-05-14 19:03:59 +00:00
Moriyoshi Koizumi cc547c86df - Update the test as newer libc gets the bogus input through rather than
rejecting it.
2009-05-14 19:02:38 +00:00
Hannes Magnusson 24b0e5dfe5 Add missing file 2009-05-14 18:53:39 +00:00
Felipe Pena 63c12a8f99 - MFH: Improved fix for #42414 2009-05-14 17:24:42 +00:00
Arnaud Le Blanc eeed7e12f5 moved to 5.2 2009-05-14 16:23:58 +00:00
Jani Taskinen f0dd266bdd MFH:- Fixed bug #48256 (Crash due to double-linking of history.o) 2009-05-14 13:40:51 +00:00
Greg Beaver 7aabee2ec6 MFH: fix potential free of NULL 2009-05-14 13:36:56 +00:00
Ilia Alshanetsky c205eb5143 Fixed compiler warnings 2009-05-14 12:29:47 +00:00
Dmitry Stogov 2f8ca07d18 Fixed wrong return value 2009-05-14 08:21:54 +00:00
Matt Wilmas 464cfab1b1 Now in 5.2 (or should the entry be here as well...?) 2009-05-14 01:31:02 +00:00
Felipe Pena 3201292cd3 - New tests 2009-05-14 01:28:58 +00:00
Felipe Pena 652b77243c MFH:
- Fixed bug #42414 (some odbc_*() functions incompatible with Oracle ODBC driver)
  patch by: jhml at gmx dot net
2009-05-14 01:26:39 +00:00
Greg Beaver 475cf4d288 fix Bug #48257: PharData throws exception with non-phar tar 2009-05-13 20:25:43 +00:00
Jani Taskinen 1033af1cb3 MFH: Fixed module loading order and made request shutdown functions also to
be loaded in reverse like all other shutdowns are.
2009-05-13 18:48:20 +00:00
Kalle Sommer Nielsen f67e7f4947 MFH: Fix compiler warnings, safe_emalloc expects size_t, not double as ceil returns 2009-05-13 16:29:26 +00:00
Kalle Sommer Nielsen 18e7a82dd4 MFH: Nuke compiler warning 2009-05-13 15:55:12 +00:00
Ilia Alshanetsky 46e28fb021 Fixed bug #44996 (xmlrpc_decode() ignores time zone on iso8601.datetime)
# Original patch by kawai at apache dot org
2009-05-13 14:23:14 +00:00
Felipe Pena 539b7a2154 - MFH: Fixed bug #48240 (DBA Segmentation fault dba_nextkey) 2009-05-13 02:14:53 +00:00
Matteo Beccati c25b0a2817 MFH
- Moved test for bug #44861 to PDO commons and added support for pdo_oci
# This allows scrollable cursors to be tested with all the drivers
# that currently support them (pgsql and oci), ensuring a consistent
# behaviour. The test is skipped when using other drivers.
2009-05-12 23:40:32 +00:00
Felipe Pena db1eafa8d0 - MFH: Fixed bug #48248 (SIGSEGV when access to private property via &__get) 2009-05-12 22:55:05 +00:00
Matteo Beccati 3fb4089ba7 MFH
- Fixed bug #48188
2009-05-12 22:18:15 +00:00
Matteo Beccati 7be13beddb MFH
- Fixed bug #48070
2009-05-12 21:53:18 +00:00
Felipe Pena e753493c97 - Fixed tests on Windows 2009-05-12 19:46:58 +00:00
Ilia Alshanetsky c3e3d607b4 Fixed bug #47564 (unpacking unsigned long 32bit bit endian returns wrong
result)
2009-05-12 12:34:55 +00:00
Felipe Pena 4f068cc23b - MFH: Fix code && new test 2009-05-11 15:03:47 +00:00
Felipe Pena 85bcfa89ad - Added missing param checks 2009-05-11 14:14:52 +00:00
Ilia Alshanetsky d73b2316a1 moved to 5.2 as well 2009-05-11 12:35:19 +00:00
Ilia Alshanetsky 60d4c0308a Fixed bug #48204 (xmlwriter_open_uri() does not emit warnings on invalid
paths)
2009-05-11 12:21:26 +00:00
Pierre Joye dff4655e31 - MFH: define HAVE_PQPROTOCOLVERSION and HAVE_PG_LO_CREATE (Tim Starling) 2009-05-11 10:44:12 +00:00
Jani Taskinen 2a31dbbadf MFH:- Removed unnecessary TSRMLS_FETCH() calls 2009-05-11 08:31:15 +00:00
Jani Taskinen daae8fb6fc MFH: cs + ws 2009-05-11 07:52:49 +00:00
Kalle Sommer Nielsen 776a648f17 MFH: Fix conditional 2009-05-11 06:43:05 +00:00
Jani Taskinen 899e56337f - Fix paths 2009-05-11 05:01:37 +00:00
Felipe Pena 13a3092fce - Starting tests for this extension 2009-05-11 03:09:59 +00:00
Felipe Pena 937b429ad8 - Fixed tests 2009-05-11 01:51:07 +00:00
Jani Taskinen f3bd837434 MFH: sync 2009-05-10 23:08:52 +00:00
Jani Taskinen 1338aa26be sync with HEAD 2009-05-10 22:39:33 +00:00
Jani Taskinen 235712f3de BFN 2009-05-10 21:06:35 +00:00
Jani Taskinen 068d240da5 - Fixed bug #48200 (compile failure with mbstring.c when --enable-zend-multibyte is used) 2009-05-10 21:04:46 +00:00
Stanislav Malyshev 06000724e7 revent wrong part 2009-05-10 20:58:26 +00:00
Felipe Pena f306943799 - Fixed bug #48227 (NumberFormatter::format leaks memory) 2009-05-10 20:17:22 +00:00
Etienne Kneuss bad0b796a8 MFB: Add test for #48224 2009-05-10 20:12:56 +00:00
David Coallier 0204349438 - Removed the RETURN_TRUE to keep consistency with documentation. This function
is supposed to be "void registerPHPFunctions"
2009-05-10 19:59:47 +00:00
Stanislav Malyshev 0cb1c2797f little errors cleanup 2009-05-10 19:10:36 +00:00
Etienne Kneuss 7c41c86a02 MFB: Fix #48224 (Remove incorrect shuffle) 2009-05-10 16:45:21 +00:00
Felipe Pena a8209c5157 - Simplify test (cweiske) 2009-05-10 15:48:39 +00:00
Felipe Pena 680bc45ba5 - MFH: Fixed bug #48221 (memory leak when passing invalid xslt parameter) 2009-05-10 15:13:05 +00:00
Hannes Magnusson 64e4c69090 fix proto
# Why doesn't this exist in HEAD?
2009-05-10 13:26:38 +00:00
Felipe Pena 91bdeda644 - MFH: Fixed memory leak (patch by Christian Weiske) 2009-05-10 01:03:45 +00:00
Johannes Schlüter 021623dbf1 really delete it 2009-05-09 22:36:14 +00:00
Johannes Schlüter 037211ec08 MFH Remove bad CREDITS file 2009-05-09 22:34:45 +00:00
Etienne Kneuss bc75208538 MFH: Fix bug #47534 (RecursiveDirectoryIterator::getChildren ignoring CURRENT_AS_PATHNAME) 2009-05-09 21:06:59 +00:00
Scott MacVicar c81345bbd0 BFN 2009-05-09 20:42:44 +00:00
Jani Taskinen 8308ce2d0a - Moved to PHP_5_2 2009-05-09 20:37:47 +00:00
Scott MacVicar 2d183dcc1d MFH Update bundled libmagic to 5.03 2009-05-09 20:34:37 +00:00
Jani Taskinen 558f3861ec MFH:- Fixed bug #47468 (enable cli|cgi-only extensions for embed sapi) 2009-05-09 20:26:51 +00:00
Scott MacVicar cc33f375a6 MFH Broken test when you have a snapshot as it relies on CVS 2009-05-09 20:18:43 +00:00
Scott MacVicar 01a6919ff0 Fix bug #48206 again 2009-05-09 19:45:26 +00:00
Scott MacVicar e89c1cf7d9 MFH Fix bug #48206 - Iterating over an invalid data structure leads to a segfault 2009-05-09 19:35:09 +00:00
Hannes Magnusson ebf7a8e9a3 Fix comments 2009-05-08 11:35:12 +00:00
Arnaud Le Blanc 7d61fa216d test for #44034 2009-05-08 09:50:34 +00:00
Arnaud Le Blanc 1d13e22f41 Fix invalid read 2009-05-08 09:44:17 +00:00
Antony Dovgal c4cf7a858d MFH: fix ZTS build 2009-05-08 07:58:19 +00:00
Brian Shire 4c81aa0b50 MFH: Add missing #ifdef for curl version that does not have FTP_FILEMETHOD or IPRESOLVE options. related to fix for bug #39637 2009-05-08 03:33:06 +00:00
Matteo Beccati d33fecdde8 MFH
- Fixed bug #48185 removing no-op code
2009-05-07 23:29:54 +00:00
Felipe Pena bb31072d3e - Fix build 2009-05-07 22:42:46 +00:00
Scott MacVicar f8207707c9 BFN 2009-05-07 16:56:18 +00:00
Scott MacVicar 81e3b74188 Print warning when using loadExtension on non cli, cgi and embeded 2009-05-07 16:49:26 +00:00
Jani Taskinen 782644535f MFH 2009-05-07 13:47:43 +00:00
Jani Taskinen da7302f792 MFH 2009-05-07 13:44:23 +00:00
Zoe Slattery f2cc5467da fixing missing semi-colon 2009-05-07 13:26:00 +00:00
Ilia Alshanetsky 9861f86c9f Fixed compiler warning 2009-05-07 12:39:26 +00:00
Felipe Pena a2516cd273 - Missing title 2009-05-07 12:15:40 +00:00
Felipe Pena dcfe5d7140 - MFH: Parameter parsing changes for get_defined_constants() (Kalle) 2009-05-07 12:08:09 +00:00
Scott MacVicar 4b34028479 BFN 2009-05-07 11:29:32 +00:00
Scott MacVicar e718846c5b MFH Update bundled libsqlite to 3.6.14 2009-05-07 11:27:45 +00:00
Zoe Slattery cba448a9d3 Replacing generate script with a new version 2009-05-07 09:21:43 +00:00
Hannes Magnusson 903f306a60 Fix tests 2009-05-07 08:08:00 +00:00
Kalle Sommer Nielsen 686c3975e7 use have been a keyword in a forever, thanks Greg 2009-05-07 06:58:57 +00:00
Kalle Sommer Nielsen e4e260dc21 Windows ME is not supported either as of 5.3 2009-05-07 03:16:28 +00:00
Kalle Sommer Nielsen 036314329a * use is a reserved keyword
* notes to Windows section
2009-05-07 03:14:07 +00:00
Jani Taskinen 996eab8983 - Fixed ini deprecation message issues in tests.
# CGI headers are stripped and the error ends up there with CGI..
2009-05-06 20:32:00 +00:00
Jani Taskinen f719e30684 MFH 2009-05-06 19:03:06 +00:00
Johannes Schlüter 508a2d0c3d Back to -dev 2009-05-06 18:57:45 +00:00
2688 changed files with 110470 additions and 34923 deletions

No files matched your search

+19
View File
@@ -15,6 +15,25 @@ document ____executor_globals
ZTS detection is automatically based on ext/standard module struct
end
define print_cvs
____executor_globals
set $p = $eg.current_execute_data.CVs
set $c = $eg.current_execute_data.op_array.last_var
set $v = $eg.current_execute_data.op_array.vars
set $i = 0
printf "Compiled variables count: %d\n", $c
while $i < $c
printf "%d = %s\n", $i, $v[$i].name
if $p[$i] != 0
printzv *$p[$i]
else
printf "*uninitialized*\n"
end
set $i = $i + 1
end
end
define dump_bt
set $t = $arg0
while $t
-11
View File
@@ -1,11 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>php-5.3</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
</buildSpec>
<natures>
</natures>
</projectDescription>
+3 -3
View File
@@ -59,8 +59,8 @@ Exceptions:
you're calling.
7. When commenting out code using a #if statement, do NOT use 0 only. Instead
use "<cvs username here>_0". For example, #if FOO_0, where FOO is your
cvs user foo. This allows easier tracking of why code was commented out,
use "<svn username here>_0". For example, #if FOO_0, where FOO is your
svn user foo. This allows easier tracking of why code was commented out,
especially in bundled libraries.
8. Do not define functions that are not available. For instance, if a
@@ -259,7 +259,7 @@ The file labelled 'EXPERIMENTAL' should include the following
information::
Any authoring information (known bugs, future directions of the module).
Ongoing status notes which may not be appropriate for CVS comments.
Ongoing status notes which may not be appropriate for SVN comments.
Aliases & Legacy Documentation
-----------------------------------
+19 -17
View File
@@ -198,13 +198,18 @@ Apache 1.3.x on Unix systems
13. Setup your php.ini file:
cp php.ini-dist /usr/local/lib/php.ini
PHP will use the built-in default values if no php.ini file was
placed in the configuration directory. The default location is
/usr/local/lib, if you prefer your php.ini in another location, use
--with-config-file-path=/some/path in step 10.
You may edit your .ini file to set PHP options. If you prefer your
php.ini in another location, use --with-config-file-path=/some/path in
step 10.
The PHP distribution provides two sample php.ini files, you can use them
by
cp php.ini-development /usr/local/lib/php.ini
or
cp php.ini-production /usr/local/lib/php.ini
If you instead choose php.ini-recommended, be certain to read the list
If you choose one of these php.ini files be certain to read the list
of changes within, as they affect how PHP behaves.
14. Edit your httpd.conf to load the PHP module. The path on the right hand
@@ -386,7 +391,7 @@ Apache 2.0 on Unix systems
http://snaps.php.net/php5-latest.tar.gz or download binaries for
Windows http://snaps.php.net/win32/php5-win32-latest.zip.
* a prerelease version downloadable from http://qa.php.net/.
* you have always the option to obtain PHP through anonymous CVS.
* you have always the option to obtain PHP through SVN.
These versions of PHP are compatible to Apache 2.0.40 and later.
@@ -1303,8 +1308,8 @@ Introduction to PECL Installations
When building PHP modules, it's important to have known-good versions
of the required tools (autoconf, automake, libtool, etc.) See the
Anonymous CVS Instructions for details on the required tools, and
required versions.
SVN Instructions for details on the required tools, and required
versions.
__________________________________________________________________
Downloading PECL extensions
@@ -1320,14 +1325,11 @@ Downloading PECL extensions
PECL extensions that have releases listed on the PECL web site are
available for download and installation using the pecl command.
Specific revisions may also be specified.
* CVS
Most PECL extensions also reside in CVS. A web-based view may be
seen at http://cvs.php.net/pecl/. To download straight from CVS,
the following sequence of commands may be used. Note that phpfi is
the password for user cvsread:
* SVN
All PECL files reside in SVN. A web-based view may be seen at
http://svn.php.net/pecl/. To download straight from SVN, use:
$ cvs -d:pserver:cvsread@cvs.php.net:/repository login
$ cvs -d:pserver:cvsread@cvs.php.net:/repository co pecl/extname
$ svn co http://svn.php.net/repository/pecl/<extname>/trunk <extname>
* Windows downloads
Windows users may find compiled PECL binaries by downloading the
@@ -1375,7 +1377,7 @@ Compiling shared PECL extensions with phpize
Sometimes, using the pecl installer is not an option. This could be
because you're behind a firewall, or it could be because the extension
you want to install is not available as a PECL compatible package, such
as unreleased extensions from CVS. If you need to build such an
as unreleased extensions from SVN. If you need to build such an
extension, you can use the lower-level build tools to perform the build
manually.
@@ -1522,7 +1524,7 @@ The configuration file
directives are documented in the manual though. For a complete list of
directives available in your PHP version, please read your well
commented php.ini file. Alternatively, you may find the the latest
php.ini from CVS helpful too.
php.ini from SVN helpful too.
Example 6-1. php.ini example
; any text on a line after an unquoted semicolon (;) is ignored
+3 -4
View File
@@ -89,14 +89,14 @@ test: all
elif test ! -z "$(SAPI_CLI_PATH)" && test -x "$(SAPI_CLI_PATH)"; then \
INI_FILE=`$(top_builddir)/$(SAPI_CLI_PATH) -d 'display_errors=stderr' -r 'echo php_ini_loaded_file();' 2> /dev/null`; \
if test "$$INI_FILE"; then \
$(EGREP) -v '^(zend_)?extension(_debug)?(_ts)?[\t\ ]*=' "$$INI_FILE" > $(top_builddir)/tmp-php.ini; \
$(EGREP) -v '^(magic_quotes_(gpc|runtime|sybase)?|(zend_)?extension(_debug)?(_ts)?)[\t\ ]*=' "$$INI_FILE" > $(top_builddir)/tmp-php.ini; \
else \
echo > $(top_builddir)/tmp-php.ini; \
fi; \
INI_SCANNED_PATH=`$(top_builddir)/$(SAPI_CLI_PATH) -d 'display_errors=stderr' -r '$$a = explode(",\n", trim(php_ini_scanned_files())); echo $$a[0];' 2> /dev/null`; \
if test "$$INI_SCANNED_PATH"; then \
INI_SCANNED_PATH=`$(top_srcdir)/build/shtool path -d $$INI_SCANNED_PATH`; \
$(EGREP) -h -v '^(zend_)?extension(_debug)?(_ts)?[\t\ ]*=' "$$INI_SCANNED_PATH"/*.ini >> $(top_builddir)/tmp-php.ini; \
$(EGREP) -h -v '^(magic_quotes_(gpc|runtime|sybase)?|(zend_)?extension(_debug)?(_ts)?)[\t\ ]*=' "$$INI_SCANNED_PATH"/*.ini >> $(top_builddir)/tmp-php.ini; \
fi; \
TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \
TEST_PHP_SRCDIR=$(top_srcdir) \
@@ -115,9 +115,8 @@ clean:
rm -f libphp$(PHP_MAJOR_VERSION).la $(SAPI_CLI_PATH) $(OVERALL_TARGET) modules/* libs/*
distclean: clean
rm -f config.cache config.log config.status Makefile.objects Makefile.fragments libtool main/php_config.h stamp-h php5.spec sapi/apache/libphp$(PHP_MAJOR_VERSION).module buildmk.stamp
rm -f Makefile config.cache config.log config.status Makefile.objects Makefile.fragments libtool main/php_config.h stamp-h sapi/apache/libphp$(PHP_MAJOR_VERSION).module buildmk.stamp
$(EGREP) define'.*include/php' $(top_srcdir)/configure | $(SED) 's/.*>//'|xargs rm -f
find . -name Makefile | xargs rm -f
.PHONY: all clean install distclean test
.NOEXPORT:
+1454 -525
View File
File diff suppressed because it is too large. Load diff
+1
View File
@@ -48,6 +48,7 @@ Type specifiers
h - array (returned as HashTable*)
H - array or HASH_OF(object) (returned as HashTable*)
l - long (long)
L - long, limits out-of-range numbers to LONG_MAX/LONG_MIN (long)
o - object of any type (zval*)
O - object of specific type given by class entry (zval*, zend_class_entry)
r - resource (zval*)
+429
View File
@@ -0,0 +1,429 @@
1. libmagic (ext/fileinfo) see ext/fileinfo/libmagic/LICENSE
2. Oniguruma (ext/mbstring) see ext/mbstring/oniguruma/COPYING
3. libmbfl (ext/mbstring) see ext/mbstring/libmbfl/LICENSE
4. pcrelib (ext/pcre) see ext/pcre/pcrelib/LICENCE
5. ext/standard crypt
6. ext/standard crypt's blowfish implementation
7. Sqlite/Sqlite3 ext/sqlite3 ext/sqlite
8. ext/json/json_parser
9. ext/standard/rand
10. ext/standard/scanf
11. ext/standard/strnatcmp.c
12. ext/standard/uuencode
13. libxmlrpc ext/xmlrpc
14. libzip ext/zip
15. main/snprintf.c
16. main/strlcat
17. main/strlcpy
18. libgd see ext/gd/libgd/COPYING
5. ext/standard crypt
FreeSec: libcrypt for NetBSD
Copyright (c) 1994 David Burren
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
3. Neither the name of the author nor the names of other contributors
may be used to endorse or promote products derived from this software
without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
SUCH DAMAGE.
6. ext/standard crypt's blowfish implementation
This code comes from John the Ripper password cracker, with reentrant
and crypt(3) interfaces added, but optimizations specific to password
cracking removed.
Written by Solar Designer <solar at openwall.com> in 1998-2002 and
placed in the public domain.
There's absolutely no warranty.
It is my intent that you should be able to use this on your system,
as a part of a software package, or anywhere else to improve security,
ensure compatibility, or for any other purpose. I would appreciate
it if you give credit where it is due and keep your modifications in
the public domain as well, but I don't require that in order to let
you place this code and any modifications you make under a license
of your choice.
This implementation is compatible with OpenBSD bcrypt.c (version 2a)
by Niels Provos <provos at citi.umich.edu>, and uses some of his
ideas. The password hashing algorithm was designed by David Mazieres
<dm at lcs.mit.edu>.
There's a paper on the algorithm that explains its design decisions:
http://www.usenix.org/events/usenix99/provos.html
Some of the tricks in BF_ROUND might be inspired by Eric Young's
Blowfish library (I can't be sure if I would think of something if I
hadn't seen his code).
7. Sqlite/Sqlite3 ext/sqlite3 ext/sqlite
The author disclaims copyright to this source code. In place of
a legal notice, here is a blessing:
May you do good and not evil.
May you find forgiveness for yourself and forgive others.
May you share freely, never taking more than you give.
8. ext/json/json_parser
Copyright (c) 2005 JSON.org
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
The Software shall be used for Good, not Evil.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
9. ext/standard/rand
The following php_mt_...() functions are based on a C++ class MTRand by
Richard J. Wagner. For more information see the web page at
http://www-personal.engin.umich.edu/~wagnerr/MersenneTwister.html
Mersenne Twister random number generator -- a C++ class MTRand
Based on code by Makoto Matsumoto, Takuji Nishimura, and Shawn Cokus
Richard J. Wagner v1.0 15 May 2003 rjwagner@writeme.com
The Mersenne Twister is an algorithm for generating random numbers. It
was designed with consideration of the flaws in various other generators.
The period, 2^19937-1, and the order of equidistribution, 623 dimensions,
are far greater. The generator is also fast; it avoids multiplication and
division, and it benefits from caches and pipelines. For more information
see the inventors' web page at http://www.math.keio.ac.jp/~matumoto/emt.html
Reference
M. Matsumoto and T. Nishimura, "Mersenne Twister: A 623-Dimensionally
Equidistributed Uniform Pseudo-Random Number Generator", ACM Transactions on
Modeling and Computer Simulation, Vol. 8, No. 1, January 1998, pp 3-30.
Copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura,
Copyright (C) 2000 - 2003, Richard J. Wagner
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
3. The names of its contributors may not be used to endorse or promote
products derived from this software without specific prior written
permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
10. ext/standard/scanf
scanf.c --
This file contains the base code which implements sscanf and by extension
fscanf. Original code is from TCL8.3.0 and bears the following copyright:
This software is copyrighted by the Regents of the University of
California, Sun Microsystems, Inc., Scriptics Corporation,
and other parties. The following terms apply to all files associated
with the software unless explicitly disclaimed in individual files.
The authors hereby grant permission to use, copy, modify, distribute,
and license this software and its documentation for any purpose, provided
that existing copyright notices are retained in all copies and that this
notice is included verbatim in any distributions. No written agreement,
license, or royalty fee is required for any of the authorized uses.
Modifications to this software may be copyrighted by their authors
and need not follow the licensing terms described here, provided that
the new terms are clearly indicated on the first page of each file where
they apply.
IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY
FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY
DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT. THIS SOFTWARE
IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE
NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
MODIFICATIONS.
GOVERNMENT USE: If you are acquiring this software on behalf of the
U.S. government, the Government shall have only "Restricted Rights"
in the software and related documentation as defined in the Federal
Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2). If you
are acquiring the software on behalf of the Department of Defense, the
software shall be classified as "Commercial Computer Software" and the
Government shall have only "Restricted Rights" as defined in Clause
252.227-7013 (c) (1) of DFARs. Notwithstanding the foregoing, the
authors grant the U.S. Government and others acting in its behalf
permission to use and distribute the software in accordance with the
terms specified in this license.
11. ext/standard/strnatcmp.c
strnatcmp.c -- Perform 'natural order' comparisons of strings in C.
Copyright (C) 2000 by Martin Pool <mbp@humbug.org.au>
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
arising from the use of this software.
Permission is granted to anyone to use this software for any purpose,
including commercial applications, and to alter it and redistribute it
freely, subject to the following restrictions:
1. The origin of this software must not be misrepresented; you must not
claim that you wrote the original software. If you use this software
in a product, an acknowledgment in the product documentation would be
appreciated but is not required.
2. Altered source versions must be plainly marked as such, and must not be
misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution.
12. ext/standard/uuencode
Portions of this code are based on Berkeley's uuencode/uudecode
implementation.
Copyright (c) 1983, 1993
The Regents of the University of California. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
3. All advertising materials mentioning features or use of this software
must display the following acknowledgement:
This product includes software developed by the University of
California, Berkeley and its contributors.
4. Neither the name of the University nor the names of its contributors
may be used to endorse or promote products derived from this software
without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
SUCH DAMAGE.
13. libxmlrpc ext/xmlrpc
Copyright 2000 Epinions, Inc.
Subject to the following 3 conditions, Epinions, Inc. permits you, free
of charge, to (a) use, copy, distribute, modify, perform and display this
software and associated documentation files (the "Software"), and (b)
permit others to whom the Software is furnished to do so as well.
1) The above copyright notice and this permission notice shall be included
without modification in all copies or substantial portions of the
Software.
2) THE SOFTWARE IS PROVIDED "AS IS", WITHOUT ANY WARRANTY OR CONDITION OF
ANY KIND, EXPRESS, IMPLIED OR STATUTORY, INCLUDING WITHOUT LIMITATION ANY
IMPLIED WARRANTIES OF ACCURACY, MERCHANTABILITY, FITNESS FOR A PARTICULAR
PURPOSE OR NONINFRINGEMENT.
3) IN NO EVENT SHALL EPINIONS, INC. BE LIABLE FOR ANY DIRECT, INDIRECT,
SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES OR LOST PROFITS ARISING OUT
OF OR IN CONNECTION WITH THE SOFTWARE (HOWEVER ARISING, INCLUDING
NEGLIGENCE), EVEN IF EPINIONS, INC. IS AWARE OF THE POSSIBILITY OF SUCH
DAMAGES.
14. libzip ext/zip
zip.h -- exported declarations.
Copyright (C) 1999-2009 Dieter Baron and Thomas Klausner
This file is part of libzip, a library to manipulate ZIP archives.
The authors can be contacted at <libzip@nih.at>
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in
the documentation and/or other materials provided with the
distribution.
3. The names of the authors may not be used to endorse or promote
products derived from this software without specific prior
written permission.
THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS
OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY
DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
15. main/snprintf.c
Copyright (c) 2002, 2006 Todd C. Miller <Todd.Miller@courtesan.com>
Permission to use, copy, modify, and distribute this software for any
purpose with or without fee is hereby granted, provided that the above
copyright notice and this permission notice appear in all copies.
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
Sponsored in part by the Defense Advanced Research Projects
Agency (DARPA) and Air Force Research Laboratory, Air Force
Materiel Command, USAF, under agreement number F39502-99-1-0512.
main/spprintf
Copyright (c) 1995-1998 The Apache Group. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in
the documentation and/or other materials provided with the
distribution.
3. All advertising materials mentioning features or use of this
software must display the following acknowledgment:
"This product includes software developed by the Apache Group
for use in the Apache HTTP server project (http://www.apache.org/)."
4. The names "Apache Server" and "Apache Group" must not be used to
endorse or promote products derived from this software without
prior written permission.
5. Redistributions of any form whatsoever must retain the following
acknowledgment:
"This product includes software developed by the Apache Group
for use in the Apache HTTP server project (http://www.apache.org/)."
THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY
EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE APACHE GROUP OR
ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
OF THE POSSIBILITY OF SUCH DAMAGE.
====================================================================
This software consists of voluntary contributions made by many
individuals on behalf of the Apache Group and was originally based
on public domain software written at the National Center for
Supercomputing Applications, University of Illinois, Urbana-Champaign.
For more information on the Apache Group and the Apache HTTP server
project, please see <http://www.apache.org/>.
This code is based on, and used with the permission of, the
SIO stdio-replacement strx_* functions by Panos Tsirigotis
<panos@alumni.cs.colorado.edu> for xinetd.
16. main/strlcat
17. main/strlcpy
Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
3. The name of the author may not be used to endorse or promote products
derived from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+8 -10
View File
@@ -114,21 +114,17 @@ commit this.
1. Update in ``php-bugs-web/include/functions.inc`` the ``show_version_option``
function to include the new RC and commit.
2. Run the bumpRelease script for phpweb in your local checkout
a. ``php bin/bumpRelease 5`` (or ``php bin/bumpRelease 4`` for PHP4)
3. Update ``phpweb/include/version.inc`` (x=major version number)
2. Update ``phpweb/include/version.inc`` (x=major version number)
a. ``$PHP_x_RC`` = "5.3.0RC1"
b. ``$PHP_x_RC_DATE`` = "06 September 2007"
4. Commit those changes:
3. Commit those changes:
a. ``cvs commit include/version.inc include/releases.inc``
5. For the first RC, write the doc team (phpdoc@lists.php.net) about updating the
4. For the first RC, write the doc team (phpdoc@lists.php.net) about updating the
INSTALL and win32/install.txt files which are generated from the PHP manual sources.
Rolling a stable release
@@ -214,6 +210,10 @@ f.e. ``ChangeLog-4.php`` from the NEWS file
III. ``s/Fixed bug #\([0-9]\+\)/<?php bugfix(\1); ?>/``
IV. ``s/Fixed PECL bug #\([0-9]\+\)/<?php peclbugfix(\1); ?>/``
V. ``s/FR #\([0-9]\+\)/FR <?php bugl(\1); ?>/``
4. ``cp releases/4_4_0.php releases/4_4_1.php``
5. ``cvs add releases/4_4_1.php``
@@ -252,9 +252,8 @@ number, and remove the RC from there.
II. For PHP5: Set $CURRENT_QA_RELEASE_5 to false
Re-releasing the same version (or -pl)
------------------------------------
--------------------------------------
1. Commit the new binaries to ``phpweb/distributions/``
@@ -285,4 +284,3 @@ to upgrade.
5. Wait an hour or two, then send a mail to php-announce@lists.php.net,
php-general@lists.php.net and internals@lists.php.net with a text similar to
the news entry.
+10 -30
View File
@@ -8,11 +8,11 @@ part is making it acceptable for inclusion into our repository. :-)
How to create patch?
--------------------
We are working with CVS. You need to get CVS source to create a patch
that we accept. Visit http://www.php.net/anoncvs.php to get CVS
source. You can check out older versions, but make sure you get
the default branch (i.e. Do not use -r option when you check out the
CVS source)
We use Subversion (SVN) for revision control. You need to get the
source from SVN in order to create a patch. Read
http://www.php.net/svn.php for help on using SVN. You can check out
older branches, but make sure you get trunk as well and make your
patch work there.
Read CODING_STANDARDS file before you start working.
@@ -21,7 +21,7 @@ add a new feature to PHP. After you finished editing, please test your
patch. Read README.TESTING for testing.
After you finish testing your patch, take diff file using
"cvs diff > your.patch" command.
"svn diff > your.patch" command.
Read README.TESTING for submitting a test script for your patch. This is
not strictly required, but it is preferred to submit a test script along
@@ -41,25 +41,8 @@ maintainer and/or internals@lists.php.net, or pear-dev@lists.php.net if
you are patching PEAR. Official module maintainers can be found in
EXTENSIONS file in PHP source.
If you are new to CVS (Concurrent Versions System), visit
http://cvshome.org/ for details.
Recommended CVS client settings for creating patch file
------------------------------------------------------
Recommended ~/.cvsrc file setting is:
------
cvs -z3
update -d -P
checkout -P
diff -u
------
diff -u means:
-u Use the unified output format.
With this CVS setting, you don't have to worry about adding/deleting
newlines and spaces.
If you are new to SVN (Subversion), visit
http://svnbook.red-bean.com/ for details.
Check list for submitting patch
@@ -70,10 +53,7 @@ Check list for submitting patch
web server error logs when you test your patch?
- Did you build PHP for multi-threaded web servers. (Optional)
- Did you create test script for "make test"? (Recommended)
- Did you check your patch is unified format and it does not
contain white space changes? (If you are not using recommended
cvs setting)
- Did you update CVS source before you take final patch?
- Did you update SVN source before you take final patch?
- Did you read the patch again?
@@ -118,7 +98,7 @@ these questions:
What happens when your patch is applied?
----------------------------------------
Your name will be included together with your email address in the CVS
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.
+17 -17
View File
@@ -1,18 +1,18 @@
====================
CVS Commit Rules
SVN Commit Rules
====================
This is the first file you should be reading after you get your CVS account.
We'll assume you're basically familiar with CVS, but feel free to post
This is the first file you should be reading after you get your SVN account.
We'll assume you're basically familiar with SVN, but feel free to post
your questions on the mailing list. Please have a look at
http://cvsbook.red-bean.com/ for more detailed information on CVS.
http://svnbook.red-bean.com/ for more detailed information on SVN.
PHP is developed through the efforts of a large number of people.
Collaboration is a Good Thing(tm), and CVS lets us do this. Thus, following
some basic rules with regards to CVS usage will::
Collaboration is a Good Thing(tm), and SVN lets us do this. Thus, following
some basic rules with regards to SVN usage will::
a. Make everybody happier, especially those responsible for maintaining
the CVS itself.
the SVN itself.
b. Keep the changes consistently well documented and easily trackable.
@@ -43,21 +43,21 @@ Having said that, here are the organizational rules::
Currently we have the following branches in use::
HEAD Will become PHP 6.0. This CVS branch is for active development.
trunk Will become PHP 6.0. This CVS branch is for active development.
PHP_5_3 Is used to release the PHP 5.3.x series. It still allows for
larger enhancements.
branches/PHP_5_3 Is used to release the PHP 5.3.x series. It still allows for
larger enhancements.
PHP_5_2 Is used to release the PHP 5.2.x series. Only bugfixes are permitted
on this branch (Consult the releasemaster prior to commit).
branches/PHP_5_2 Is used to release the PHP 5.2.x series. Only bugfixes are permitted
on this branch (Consult the releasemaster prior to commit).
PHP_5_1 This branch is closed.
branches/PHP_5_1 This branch is closed.
PHP_4_4 This branch is closed.
branches/PHP_4_4 This branch is closed.
The next few rules are more of a technical nature::
1. All changes should first go to HEAD and then get merged from HEAD
1. All changes should first go to trunk and then get merged from trunk
(aka MFH'ed) to all other relevant branches.
2. DO NOT TOUCH ChangeLog! It is automagically updated from the commit
@@ -132,11 +132,11 @@ If you don't see your messages in ChangeLog right away, don't worry!
These files are updated once a day, so your stuff will not show up until
somewhat later.
When you change the NEWS file for a bug fix, then please keep the bugs
When you change the NEWS file for a bug fix, then please keep the bugs
sorted in decreasing order under the fixed version.
You can use LXR (http://lxr.php.net/) and Bonsai (http://bonsai.php.net/)
to look at PHP CVS repository in various ways.
to look at PHP SVN repository in various ways.
To receive daily updates to ChangeLog and NEWS, send an empty message to
php-cvs-daily-subscribe@lists.php.net.
-1022
View File
File diff suppressed because it is too large. Load diff
+267 -16
View File
@@ -35,6 +35,9 @@
#ifdef TSRM_WIN32
#include <io.h>
#include "tsrm_win32.h"
# ifndef IO_REPARSE_TAG_SYMLINK
# define IO_REPARSE_TAG_SYMLINK 0xA000000C
# endif
#endif
#ifdef NETWARE
@@ -137,6 +140,42 @@ static int php_check_dots(const char *element, int n)
#ifdef TSRM_WIN32
#ifdef CTL_CODE
#undef CTL_CODE
#endif
#define CTL_CODE(DeviceType,Function,Method,Access) (((DeviceType) << 16) | ((Access) << 14) | ((Function) << 2) | (Method))
#define FILE_DEVICE_FILE_SYSTEM 0x00000009
#define METHOD_BUFFERED 0
#define FILE_ANY_ACCESS 0
#define FSCTL_GET_REPARSE_POINT CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 42, METHOD_BUFFERED, FILE_ANY_ACCESS)
#define MAXIMUM_REPARSE_DATA_BUFFER_SIZE ( 16 * 1024 )
typedef struct {
unsigned long ReparseTag;
unsigned short ReparseDataLength;
unsigned short Reserved;
union {
struct {
unsigned short SubstituteNameOffset;
unsigned short SubstituteNameLength;
unsigned short PrintNameOffset;
unsigned short PrintNameLength;
unsigned long Flags;
wchar_t ReparseTarget[1];
} SymbolicLinkReparseBuffer;
struct {
unsigned short SubstituteNameOffset;
unsigned short SubstituteNameLength;
unsigned short PrintNameOffset;
unsigned short PrintNameLength;
wchar_t ReparseTarget[1];
} MountPointReparseBuffer;
struct {
unsigned char ReparseTarget[1];
} GenericReparseBuffer;
};
} REPARSE_DATA_BUFFER;
#define SECS_BETWEEN_EPOCHS (__int64)11644473600
#define SECS_TO_100NS (__int64)10000000
static inline time_t FileTimeToUnixTime(const FILETIME FileTime)
@@ -232,9 +271,6 @@ CWD_API int php_sys_stat(const char *path, struct stat *buf) /* {{{ */
buf->st_atime = FileTimeToUnixTime(data.ftLastAccessTime);
buf->st_ctime = FileTimeToUnixTime(data.ftCreationTime);
buf->st_mtime = FileTimeToUnixTime(data.ftLastWriteTime);
if (buf->st_mtime != buf->st_atime) {
buf->st_atime = buf->st_mtime;
}
return 0;
}
/* }}} */
@@ -392,6 +428,31 @@ CWD_API char *virtual_getcwd(char *buf, size_t size TSRMLS_DC) /* {{{ */
}
/* }}} */
#ifdef PHP_WIN32
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;
const char *e = bucket_key + strlen(bucket_key);
if (!bucket_key) {
return 0;
}
for (h = 2166136261U; bucket_key < e;) {
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);
}
return h;
}
/* }}} */
#else
static inline unsigned long realpath_cache_key(const char *path, int path_len) /* {{{ */
{
register unsigned long h;
@@ -405,6 +466,7 @@ static inline unsigned long realpath_cache_key(const char *path, int path_len) /
return h;
}
/* }}} */
#endif /* defined(PHP_WIN32) */
CWD_API void realpath_cache_clean(TSRMLS_D) /* {{{ */
{
@@ -425,7 +487,11 @@ CWD_API void realpath_cache_clean(TSRMLS_D) /* {{{ */
CWD_API void realpath_cache_del(const char *path, int path_len TSRMLS_DC) /* {{{ */
{
#ifdef PHP_WIN32
unsigned long key = realpath_cache_key(path, path_len TSRMLS_CC);
#else
unsigned long key = realpath_cache_key(path, path_len);
#endif
unsigned long n = key % (sizeof(CWDG(realpath_cache)) / sizeof(CWDG(realpath_cache)[0]));
realpath_cache_bucket **bucket = &CWDG(realpath_cache)[n];
@@ -458,8 +524,12 @@ static inline void realpath_cache_add(const char *path, int path_len, const char
if (CWDG(realpath_cache_size) + size <= CWDG(realpath_cache_size_limit)) {
realpath_cache_bucket *bucket = malloc(size);
unsigned long n;
#ifdef PHP_WIN32
bucket->key = realpath_cache_key(path, path_len TSRMLS_CC);
#else
bucket->key = realpath_cache_key(path, path_len);
#endif
bucket->path = (char*)bucket + sizeof(realpath_cache_bucket);
memcpy(bucket->path, path, path_len+1);
bucket->path_len = path_len;
@@ -471,6 +541,12 @@ static inline void realpath_cache_add(const char *path, int path_len, const char
}
bucket->realpath_len = realpath_len;
bucket->is_dir = is_dir;
#ifdef PHP_WIN32
bucket->is_rvalid = 0;
bucket->is_readable = 0;
bucket->is_wvalid = 0;
bucket->is_writable = 0;
#endif
bucket->expires = t + CWDG(realpath_cache_ttl);
n = bucket->key % (sizeof(CWDG(realpath_cache)) / sizeof(CWDG(realpath_cache)[0]));
bucket->next = CWDG(realpath_cache)[n];
@@ -482,7 +558,12 @@ static inline void realpath_cache_add(const char *path, int path_len, const char
static inline realpath_cache_bucket* realpath_cache_find(const char *path, int path_len, time_t t TSRMLS_DC) /* {{{ */
{
#ifdef PHP_WIN32
unsigned long key = realpath_cache_key(path, path_len TSRMLS_CC);
#else
unsigned long key = realpath_cache_key(path, path_len);
#endif
unsigned long n = key % (sizeof(CWDG(realpath_cache)) / sizeof(CWDG(realpath_cache)[0]));
realpath_cache_bucket **bucket = &CWDG(realpath_cache)[n];
@@ -503,6 +584,12 @@ static inline realpath_cache_bucket* realpath_cache_find(const char *path, int p
}
/* }}} */
CWD_API realpath_cache_bucket* realpath_cache_lookup(const char *path, int path_len, time_t t TSRMLS_DC) /* {{{ */
{
return realpath_cache_find(path, path_len, t TSRMLS_CC);
}
/* }}} */
#undef LINK_MAX
#define LINK_MAX 32
@@ -513,12 +600,13 @@ static int tsrm_realpath_r(char *path, int start, int len, int *ll, time_t *t, i
#ifdef TSRM_WIN32
WIN32_FIND_DATA data;
HANDLE hFind;
TSRM_ALLOCA_FLAG(use_heap_large)
#else
struct stat st;
#endif
realpath_cache_bucket *bucket;
char *tmp;
TSRM_ALLOCA_FLAG(use_heap);
TSRM_ALLOCA_FLAG(use_heap)
while (1) {
if (len <= start) {
@@ -606,16 +694,180 @@ static int tsrm_realpath_r(char *path, int start, int len, int *ll, time_t *t, i
/* continue resolution anyway but don't save result in the cache */
save = 0;
}
if (save) {
directory = (data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) != 0;
if (is_dir && !directory) {
/* not a directory */
FindClose(hFind);
return -1;
}
FindClose(hFind);
}
tmp = tsrm_do_alloca(len+1, use_heap);
memcpy(tmp, path, len+1);
if(save && (data.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT)) {
/* File is a reparse point. Get the target */
HANDLE hLink = NULL;
REPARSE_DATA_BUFFER * pbuffer;
unsigned int retlength = 0;
int bufindex = 0, isabsolute = 0;
wchar_t * reparsetarget;
BOOL isVolume = FALSE;
char printname[MAX_PATH];
char substitutename[MAX_PATH];
int printname_len, substitutename_len;
int substitutename_off = 0;
if(++(*ll) > LINK_MAX) {
return -1;
}
hLink = CreateFile(path, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_FLAG_OPEN_REPARSE_POINT|FILE_FLAG_BACKUP_SEMANTICS, NULL);
if(hLink == INVALID_HANDLE_VALUE) {
return -1;
}
pbuffer = (REPARSE_DATA_BUFFER *)tsrm_do_alloca(MAXIMUM_REPARSE_DATA_BUFFER_SIZE, use_heap_large);
if(!DeviceIoControl(hLink, FSCTL_GET_REPARSE_POINT, NULL, 0, pbuffer, MAXIMUM_REPARSE_DATA_BUFFER_SIZE, &retlength, NULL)) {
tsrm_free_alloca(pbuffer, use_heap_large);
CloseHandle(hLink);
return -1;
}
CloseHandle(hLink);
if(pbuffer->ReparseTag == IO_REPARSE_TAG_SYMLINK) {
reparsetarget = pbuffer->SymbolicLinkReparseBuffer.ReparseTarget;
printname_len = pbuffer->MountPointReparseBuffer.PrintNameLength / sizeof(WCHAR);
isabsolute = (pbuffer->SymbolicLinkReparseBuffer.Flags == 0) ? 1 : 0;
if (!WideCharToMultiByte(CP_THREAD_ACP, 0,
reparsetarget + pbuffer->MountPointReparseBuffer.PrintNameOffset / sizeof(WCHAR),
printname_len + 1,
printname, MAX_PATH, NULL, NULL
)) {
tsrm_free_alloca(pbuffer, use_heap_large);
return -1;
};
printname_len = pbuffer->MountPointReparseBuffer.PrintNameLength / sizeof(WCHAR);
printname[printname_len] = 0;
substitutename_len = pbuffer->MountPointReparseBuffer.SubstituteNameLength / sizeof(WCHAR);
if (!WideCharToMultiByte(CP_THREAD_ACP, 0,
reparsetarget + pbuffer->MountPointReparseBuffer.SubstituteNameOffset / sizeof(WCHAR),
substitutename_len + 1,
substitutename, MAX_PATH, NULL, NULL
)) {
tsrm_free_alloca(pbuffer, use_heap_large);
return -1;
};
substitutename[substitutename_len] = 0;
}
else if(pbuffer->ReparseTag == IO_REPARSE_TAG_MOUNT_POINT) {
isabsolute = 1;
reparsetarget = pbuffer->MountPointReparseBuffer.ReparseTarget;
printname_len = pbuffer->MountPointReparseBuffer.PrintNameLength / sizeof(WCHAR);
if (!WideCharToMultiByte(CP_THREAD_ACP, 0,
reparsetarget + pbuffer->MountPointReparseBuffer.PrintNameOffset / sizeof(WCHAR),
printname_len + 1,
printname, MAX_PATH, NULL, NULL
)) {
tsrm_free_alloca(pbuffer, use_heap_large);
return -1;
};
printname[pbuffer->MountPointReparseBuffer.PrintNameLength / sizeof(WCHAR)] = 0;
substitutename_len = pbuffer->MountPointReparseBuffer.SubstituteNameLength / sizeof(WCHAR);
if (!WideCharToMultiByte(CP_THREAD_ACP, 0,
reparsetarget + pbuffer->MountPointReparseBuffer.SubstituteNameOffset / sizeof(WCHAR),
substitutename_len + 1,
substitutename, MAX_PATH, NULL, NULL
)) {
tsrm_free_alloca(pbuffer, use_heap_large);
return -1;
};
substitutename[substitutename_len] = 0;
} else {
tsrm_free_alloca(pbuffer, use_heap_large);
return -1;
}
if(isabsolute && substitutename_len > 4) {
/* Do not resolve volumes (for now). A mounted point can
target a volume without a drive, it is not certain that
all IO functions we use in php and its deps support
path with volume GUID instead of the DOS way, like:
d:\test\mnt\foo
\\?\Volume{62d1c3f8-83b9-11de-b108-806e6f6e6963}\foo
*/
if (strncmp(substitutename, "\\??\\Volume{",11) == 0
|| strncmp(substitutename, "\\\\?\\Volume{",11) == 0) {
isVolume = TRUE;
substitutename_off = 0;
} else
/* do not use the \??\ and \\?\ prefix*/
if (strncmp(substitutename, "\\??\\", 4) == 0
|| strncmp(substitutename, "\\\\?\\", 4) == 0) {
substitutename_off = 4;
}
}
if (!isVolume) {
char * tmp = substitutename + substitutename_off;
for(bufindex = 0; bufindex < (substitutename_len - substitutename_off); bufindex++) {
*(path + bufindex) = *(tmp + bufindex);
}
*(path + bufindex) = 0;
j = bufindex;
} else {
j = len;
}
#if VIRTUAL_CWD_DEBUG
fprintf(stderr, "reparse: print: %s ", printname);
fprintf(stderr, "sub: %s ", substitutename);
fprintf(stderr, "resolved: %s ", path);
#endif
tsrm_free_alloca(pbuffer, use_heap_large);
if(isabsolute == 1) {
if (!((j == 3) && (path[1] == ':') && (path[2] == '\\'))) {
/* use_realpath is 0 in the call below coz path is absolute*/
j = tsrm_realpath_r(path, 0, j, ll, t, 0, is_dir, &directory TSRMLS_CC);
if(j < 0) {
tsrm_free_alloca(tmp, use_heap);
return -1;
}
}
}
else {
if(i + j >= MAXPATHLEN - 1) {
tsrm_free_alloca(tmp, use_heap);
return -1;
}
memmove(path+i, path, j+1);
memcpy(path, tmp, i-1);
path[i-1] = DEFAULT_SLASH;
j = tsrm_realpath_r(path, start, i + j, ll, t, use_realpath, is_dir, &directory TSRMLS_CC);
if(j < 0) {
tsrm_free_alloca(tmp, use_heap);
return -1;
}
}
directory = (data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY);
if(link_is_dir) {
*link_is_dir = directory;
}
}
else {
if (save) {
directory = (data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) != 0;
if (is_dir && !directory) {
/* not a directory */
return -1;
}
}
#elif defined(NETWARE)
save = 0;
tmp = tsrm_do_alloca(len+1, use_heap);
@@ -687,19 +939,18 @@ static int tsrm_realpath_r(char *path, int start, int len, int *ll, time_t *t, i
#ifdef TSRM_WIN32
if (j < 0 || j + len - i >= MAXPATHLEN-1) {
tsrm_free_alloca(tmp, use_heap);
if (save) FindClose(hFind);
return -1;
}
if (save) {
i = strlen(data.cFileName);
memcpy(path+j, data.cFileName, i+1);
j += i;
FindClose(hFind);
} else {
/* use the original file or directory name as it wasn't found */
memcpy(path+j, tmp+i, len-i+1);
j += (len-i);
}
}
#else
if (j < 0 || j + len - i >= MAXPATHLEN-1) {
tsrm_free_alloca(tmp, use_heap);
@@ -961,7 +1212,7 @@ CWD_API char *virtual_realpath(const char *path, char *real_path TSRMLS_DC) /* {
new_state.cwd[0] = '\0';
new_state.cwd_length = 0;
}
if (virtual_file_ex(&new_state, path, NULL, CWD_REALPATH)==0) {
int len = new_state.cwd_length>MAXPATHLEN-1?MAXPATHLEN-1:new_state.cwd_length;
@@ -1057,7 +1308,7 @@ static void UnixTimeToFileTime(time_t t, LPFILETIME pft) /* {{{ */
}
/* }}} */
static int win32_utime(const char *filename, struct utimbuf *buf) /* {{{ */
TSRM_API int win32_utime(const char *filename, struct utimbuf *buf) /* {{{ */
{
FILETIME mtime, atime;
HANDLE hFile;
@@ -1233,7 +1484,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
retval = (MoveFileEx(oldname, newname, MOVEFILE_REPLACE_EXISTING) == 0) ? -1 : 0;
retval = (MoveFileEx(oldname, newname, MOVEFILE_REPLACE_EXISTING|MOVEFILE_COPY_ALLOWED) == 0) ? -1 : 0;
#else
retval = rename(oldname, newname);
#endif
+14 -2
View File
@@ -210,6 +210,12 @@ typedef struct _realpath_cache_bucket {
int realpath_len;
int is_dir;
time_t expires;
#ifdef PHP_WIN32
unsigned char is_rvalid;
unsigned char is_readable;
unsigned char is_wvalid;
unsigned char is_writable;
#endif
struct _realpath_cache_bucket *next;
} realpath_cache_bucket;
@@ -231,6 +237,7 @@ 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);
/* The actual macros to be used in programs using TSRM
* If the program defines VIRTUAL_DIR it will use the
@@ -281,7 +288,7 @@ CWD_API void realpath_cache_del(const char *path, int path_len TSRMLS_DC);
/* rename on windows will fail if newname already exists.
MoveFileEx has to be used */
#if defined(TSRM_WIN32)
# define VCWD_RENAME(oldname, newname) (MoveFileEx(oldname, newname, MOVEFILE_REPLACE_EXISTING) == 0 ? -1 : 0)
# define VCWD_RENAME(oldname, newname) (MoveFileEx(oldname, newname, MOVEFILE_REPLACE_EXISTING|MOVEFILE_COPY_ALLOWED) == 0 ? -1 : 0)
#else
# define VCWD_RENAME(oldname, newname) rename(oldname, newname)
#endif
@@ -304,8 +311,13 @@ CWD_API void realpath_cache_del(const char *path, int path_len TSRMLS_DC);
#define VCWD_REALPATH(path, real_path) tsrm_realpath(path, real_path TSRMLS_CC)
#if HAVE_UTIME
#define VCWD_UTIME(path, time) utime(path, time)
# ifdef TSRM_WIN32
# define VCWD_UTIME(path, time) win32_utime(path, time)
# else
# define VCWD_UTIME(path, time) utime(path, time)
# endif
#endif
#define VCWD_CHMOD(path, mode) chmod(path, mode)
#if !defined(TSRM_WIN32) && !defined(NETWARE)
#define VCWD_CHOWN(path, owner, group) chown(path, owner, group)
+333 -22
View File
@@ -23,14 +23,16 @@
#include <io.h>
#include <process.h>
#include <time.h>
#include <errno.h>
#define TSRM_INCLUDE_FULL_WINDOWS_HEADERS
#include "SAPI.h"
#include "TSRM.h"
#ifdef TSRM_WIN32
#include <Sddl.h>
#include "tsrm_win32.h"
#include "tsrm_virtual_cwd.h"
#ifdef ZTS
static ts_rsrc_id win32_globals_id;
@@ -45,6 +47,16 @@ static void tsrm_win32_ctor(tsrm_win32_globals *globals TSRMLS_DC)
globals->process_size = 0;
globals->shm_size = 0;
globals->comspec = _strdup((GetVersion()<0x80000000)?"cmd.exe":"command.com");
/* Set it to INVALID_HANDLE_VALUE
* It will be initialized correctly in tsrm_win32_access or set to
* NULL if no impersonation has been done.
* the impersonated token can't be set here as the impersonation
* will happen later, in fcgi_accept_request (or whatever is the
* SAPI being used).
*/
globals->impersonation_token = INVALID_HANDLE_VALUE;
globals->impersonation_token_sid = NULL;
}
static void tsrm_win32_dtor(tsrm_win32_globals *globals TSRMLS_DC)
@@ -66,6 +78,13 @@ static void tsrm_win32_dtor(tsrm_win32_globals *globals TSRMLS_DC)
}
free(globals->comspec);
if (globals->impersonation_token && globals->impersonation_token != INVALID_HANDLE_VALUE ) {
CloseHandle(globals->impersonation_token);
}
if (globals->impersonation_token_sid) {
free(globals->impersonation_token_sid);
}
}
TSRM_API void tsrm_win32_startup(void)
@@ -84,23 +103,268 @@ TSRM_API void tsrm_win32_shutdown(void)
#endif
}
char * tsrm_win32_get_path_sid_key(const char *pathname TSRMLS_DC)
{
PSID pSid = TWG(impersonation_token_sid);
DWORD sid_len = pSid ? GetLengthSid(pSid) : 0;
TCHAR *ptcSid = NULL;
char *bucket_key = NULL;
if (!pSid) {
bucket_key = (char *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, strlen(pathname) + 1);
if (!bucket_key) {
return NULL;
}
memcpy(bucket_key, pathname, strlen(pathname));
return bucket_key;
}
if (!ConvertSidToStringSid(pSid, &ptcSid)) {
return NULL;
}
bucket_key = (char *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, strlen(pathname) + strlen(ptcSid) + 1);
if (!bucket_key) {
LocalFree(ptcSid);
return NULL;
}
memcpy(bucket_key, ptcSid, strlen(ptcSid));
memcpy(bucket_key + strlen(ptcSid), pathname, strlen(pathname) + 1);
LocalFree(ptcSid);
return bucket_key;
}
PSID tsrm_win32_get_token_sid(HANDLE hToken)
{
BOOL bSuccess = FALSE;
DWORD dwLength = 0;
PTOKEN_USER pTokenUser = NULL;
PSID sid;
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)) {
if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) {
goto Finished;
}
pTokenUser = (PTOKEN_USER)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwLength);
if (pTokenUser == NULL) {
goto Finished;
}
}
/* and fetch it now */
if (!GetTokenInformation(
hToken, TokenUser, (LPVOID) pTokenUser, dwLength, &dwLength)) {
goto Finished;
}
sid_len = GetLengthSid(pTokenUser->User.Sid);
/* ConvertSidToStringSid(pTokenUser->User.Sid, &ptcSidOwner); */
pResultSid = malloc(sid_len);
if (!pResultSid) {
goto Finished;
}
if (!CopySid(sid_len, pResultSid, pTokenUser->User.Sid)) {
goto Finished;
}
return pResultSid;
Finished:
if (pResultSid) {
free(pResultSid);
}
/* Free the buffer for the token groups. */
if (pTokenUser != NULL) {
HeapFree(GetProcessHeap(), 0, (LPVOID)pTokenUser);
}
return NULL;
}
TSRM_API int tsrm_win32_access(const char *pathname, int mode)
{
time_t t;
HANDLE thread_token;
PSID token_sid;
SECURITY_INFORMATION sec_info = OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION;
GENERIC_MAPPING gen_map = { FILE_GENERIC_READ, FILE_GENERIC_WRITE, FILE_GENERIC_EXECUTE, FILE_ALL_ACCESS };
DWORD priv_set_length = sizeof(PRIVILEGE_SET);
PRIVILEGE_SET privilege_set = {0};
DWORD sec_desc_length = 0, desired_access = 0, granted_access = 0;
BYTE * psec_desc = NULL;
BOOL fAccess = FALSE;
BOOL bucket_key_alloc = FALSE;
realpath_cache_bucket * bucket = NULL;
char * real_path = NULL;
TSRMLS_FETCH();
if (mode == 1 /*X_OK*/) {
#if 1
/* This code is not supported by Windows 98,
* but we don't support it anymore */
DWORD type;
return GetBinaryType(pathname, &type)?0:-1;
#else
SHFILEINFO sfi;
return access(pathname, 0) == 0 &&
SHGetFileInfo(pathname, 0, &sfi, sizeof(SHFILEINFO), SHGFI_EXETYPE) != 0 ? 0 : -1;
#endif
return GetBinaryType(pathname, &type) ? 0 : -1;
} else {
return access(pathname, mode);
if(!IS_ABSOLUTE_PATH(pathname, strlen(pathname)+1)) {
real_path = (char *)malloc(MAX_PATH);
if(tsrm_realpath(pathname, real_path TSRMLS_CC) == NULL) {
goto Finished;
}
pathname = real_path;
}
if(access(pathname, mode)) {
return errno;
}
/* If only existence check is made, return now */
if (mode == 0) {
return 0;
}
/* Only in NTS when impersonate==1 (aka FastCGI) */
/*
AccessCheck() requires an impersonation token. We first get a primary
token and then create a duplicate impersonation token. The
impersonation token is not actually assigned to the thread, but is
used in the call to AccessCheck. Thus, this function itself never
impersonates, but does use the identity of the thread. If the thread
was impersonating already, this function uses that impersonation context.
*/
if(!OpenThreadToken(GetCurrentThread(), TOKEN_ALL_ACCESS, TRUE, &thread_token)) {
DWORD err = GetLastError();
if (GetLastError() == ERROR_NO_TOKEN) {
if (!OpenProcessToken(GetCurrentProcess(), TOKEN_ALL_ACCESS, &thread_token)) {
TWG(impersonation_token) = NULL;
goto Finished;
}
}
}
/* token_sid will be freed in tsrmwin32_dtor */
token_sid = tsrm_win32_get_token_sid(thread_token);
if (!token_sid) {
if (TWG(impersonation_token_sid)) {
free(TWG(impersonation_token_sid));
}
TWG(impersonation_token_sid) = NULL;
goto Finished;
}
/* Different identity, we need a new impersontated token as well */
if (!TWG(impersonation_token_sid) || !EqualSid(token_sid, TWG(impersonation_token_sid))) {
if (TWG(impersonation_token_sid)) {
free(TWG(impersonation_token_sid));
}
TWG(impersonation_token_sid) = token_sid;
/* Duplicate the token as impersonated token */
if (!DuplicateToken(thread_token, SecurityImpersonation, &TWG(impersonation_token))) {
goto Finished;
}
}
if (CWDG(realpath_cache_size_limit)) {
t = time(0);
bucket = realpath_cache_lookup(pathname, strlen(pathname), t TSRMLS_CC);
if(bucket == NULL && real_path == NULL) {
/* We used the pathname directly. Call tsrm_realpath */
/* so that entry is created in realpath cache */
real_path = (char *)malloc(MAX_PATH);
if(tsrm_realpath(pathname, real_path TSRMLS_CC) != NULL) {
pathname = real_path;
bucket = realpath_cache_lookup(pathname, strlen(pathname), t TSRMLS_CC);
}
}
}
/* Do a full access check because access() will only check read-only attribute */
if(mode == 0 || mode > 6) {
if(bucket != NULL && bucket->is_rvalid) {
fAccess = bucket->is_readable;
goto Finished;
}
desired_access = FILE_GENERIC_READ;
} else if(mode <= 2) {
if(bucket != NULL && bucket->is_wvalid) {
fAccess = bucket->is_writable;
goto Finished;
}
desired_access = FILE_GENERIC_READ | FILE_GENERIC_WRITE;
} else if(mode <= 4) {
if(bucket != NULL && bucket->is_rvalid) {
fAccess = bucket->is_readable;
goto Finished;
}
desired_access = FILE_GENERIC_READ|FILE_FLAG_BACKUP_SEMANTICS;
} else { // if(mode <= 6)
if(bucket != NULL && bucket->is_rvalid && bucket->is_wvalid) {
fAccess = bucket->is_readable & bucket->is_writable;
goto Finished;
}
desired_access = FILE_GENERIC_READ | FILE_GENERIC_WRITE;
}
if(TWG(impersonation_token) == NULL) {
goto Finished;
}
/* Get size of security buffer. Call is expected to fail */
if(GetFileSecurity(pathname, sec_info, NULL, 0, &sec_desc_length)) {
goto Finished;
}
psec_desc = (BYTE *)malloc(sec_desc_length);
if(psec_desc == NULL ||
!GetFileSecurity(pathname, sec_info, (PSECURITY_DESCRIPTOR)psec_desc, sec_desc_length, &sec_desc_length)) {
goto Finished;
}
MapGenericMask(&desired_access, &gen_map);
if(!AccessCheck((PSECURITY_DESCRIPTOR)psec_desc, TWG(impersonation_token), desired_access, &gen_map, &privilege_set, &priv_set_length, &granted_access, &fAccess)) {
goto Finished_Impersonate;
}
/* Keep the result in realpath_cache */
if(bucket != NULL) {
if(desired_access == (FILE_GENERIC_READ|FILE_FLAG_BACKUP_SEMANTICS)) {
bucket->is_rvalid = 1;
bucket->is_readable = fAccess;
}
else if(desired_access == FILE_GENERIC_WRITE) {
bucket->is_wvalid = 1;
bucket->is_writable = fAccess;
}
}
Finished_Impersonate:
if(psec_desc != NULL) {
free(psec_desc);
psec_desc = NULL;
}
Finished:
if(real_path != NULL) {
free(real_path);
real_path = NULL;
}
if(fAccess == FALSE) {
errno = EACCES;
return errno;
} else {
return 0;
}
}
}
@@ -179,20 +443,45 @@ TSRM_API FILE *popen(const char *command, const char *type)
TSRM_API FILE *popen_ex(const char *command, const char *type, const char *cwd, char *env)
{
FILE *stream = NULL;
int fno, str_len = strlen(type), read, mode;
int fno, type_len = strlen(type), read, mode;
STARTUPINFO startup;
PROCESS_INFORMATION process;
SECURITY_ATTRIBUTES security;
HANDLE in, out;
char *cmd;
DWORD dwCreateFlags = 0;
BOOL res;
process_pair *proc;
char *cmd;
int i;
char *ptype = (char *)type;
HANDLE thread_token = NULL;
HANDLE token_user = NULL;
BOOL asuser = TRUE;
TSRMLS_FETCH();
if (!type) {
return NULL;
}
/*The following two checks can be removed once we drop XP support */
type_len = strlen(type);
if (type_len <1 || type_len > 2) {
return NULL;
}
for (i=0; i < type_len; i++) {
if (!(*ptype == 'r' || *ptype == 'w' || *ptype == 'b' || *ptype == 't')) {
return NULL;
}
ptype++;
}
security.nLength = sizeof(SECURITY_ATTRIBUTES);
security.bInheritHandle = TRUE;
security.lpSecurityDescriptor = NULL;
if (!str_len || !CreatePipe(&in, &out, &security, 2048L)) {
if (!type_len || !CreatePipe(&in, &out, &security, 2048L)) {
return NULL;
}
@@ -204,8 +493,7 @@ TSRM_API FILE *popen_ex(const char *command, const char *type, const char *cwd,
startup.hStdError = GetStdHandle(STD_ERROR_HANDLE);
read = (type[0] == 'r') ? TRUE : FALSE;
mode = ((str_len == 2) && (type[1] == 'b')) ? O_BINARY : O_TEXT;
mode = ((type_len == 2) && (type[1] == 'b')) ? O_BINARY : O_TEXT;
if (read) {
in = dupHandle(in, FALSE);
@@ -217,13 +505,36 @@ TSRM_API FILE *popen_ex(const char *command, const char *type, const char *cwd,
startup.hStdOutput = GetStdHandle(STD_OUTPUT_HANDLE);
}
dwCreateFlags = NORMAL_PRIORITY_CLASS;
if (strcmp(sapi_module.name, "cli") != 0) {
dwCreateFlags |= CREATE_NO_WINDOW;
}
/* Get a token with the impersonated user. */
if(OpenThreadToken(GetCurrentThread(), TOKEN_ALL_ACCESS, TRUE, &thread_token)) {
DuplicateTokenEx(thread_token, MAXIMUM_ALLOWED, &security, SecurityImpersonation, TokenPrimary, &token_user);
} else {
DWORD err = GetLastError();
if (err == ERROR_NO_TOKEN) {
asuser = FALSE;
}
}
cmd = (char*)malloc(strlen(command)+strlen(TWG(comspec))+sizeof(" /c ")+2);
sprintf(cmd, "%s /c \"%s\"", TWG(comspec), command);
if (!CreateProcess(NULL, cmd, &security, &security, security.bInheritHandle, NORMAL_PRIORITY_CLASS|CREATE_NO_WINDOW, env, cwd, &startup, &process)) {
return NULL;
if (asuser) {
res = CreateProcessAsUser(token_user, NULL, cmd, &security, &security, security.bInheritHandle, dwCreateFlags, env, cwd, &startup, &process);
CloseHandle(token_user);
} else {
res = CreateProcess(NULL, cmd, &security, &security, security.bInheritHandle, dwCreateFlags, env, cwd, &startup, &process);
}
free(cmd);
if (!res) {
return NULL;
}
CloseHandle(process.hThread);
proc = process_get(NULL TSRMLS_CC);
@@ -252,7 +563,7 @@ TSRM_API int pclose(FILE *stream)
}
fflush(process->stream);
fclose(process->stream);
fclose(process->stream);
WaitForSingleObject(process->prochnd, INFINITE);
GetExitCodeProcess(process->prochnd, &termstat);
+4
View File
@@ -63,6 +63,8 @@ typedef struct {
int process_size;
int shm_size;
char *comspec;
HANDLE impersonation_token;
PSID impersonation_token_sid;
} tsrm_win32_globals;
#ifdef ZTS
@@ -88,6 +90,7 @@ typedef struct {
#define SHM_RND FILE_MAP_WRITE
#define SHM_REMAP FILE_MAP_COPY
char * tsrm_win32_get_path_sid_key(const char *pathname TSRMLS_DC);
TSRM_API void tsrm_win32_startup(void);
TSRM_API void tsrm_win32_shutdown(void);
@@ -96,6 +99,7 @@ TSRM_API FILE *popen_ex(const char *command, const char *type, const char *cwd,
TSRM_API FILE *popen(const char *command, const char *type);
TSRM_API int pclose(FILE *stream);
TSRM_API int tsrm_win32_access(const char *pathname, int mode);
TSRM_API int win32_utime(const char *filename, struct utimbuf *buf);
TSRM_API int shmget(int key, int size, int flags);
TSRM_API void *shmat(int key, const void *shmaddr, int flags);
+320 -60
View File
@@ -21,11 +21,12 @@ UPGRADE NOTES - PHP 5.3
a. New libraries
b. New extensions
c. New stream wrappers
d. New functions
e. New global constants
f. New classes
g. New methods
h. New class constants
d. New stream filters
e. New functions
f. New global constants
g. New classes
h. New methods
i. New class constants
=============================
1. Reserved words and classes
@@ -39,62 +40,101 @@ UPGRADE NOTES - PHP 5.3
2. Changes made to existing functions
=====================================
- The HTTP stream wrapper now considers all status codes from 200 to 399 to be
successful.
- The array functions natsort(), natcasesort(), usort(), uasort(), uksort(),
array_flip() and array_unique(), no longer accept objects passed as arguments.
If you need to access their properties using an object, you will need to cast
the objects to arrays first.
array_flip(), and array_unique() no longer accept objects passed as arguments.
If you need to use them to access an object's properties, you must cast the
object to an array first.
- var_dump() output now includes private object members.
- session_start() now returns FALSE when the session startup fails.
- property_exists() now checks the existence of a property independent of
accessibility (like method_exists()).
- The $initial parameter for array_reduce can now be of any type.
- clearstatcache() no longer clears the realpath cache by default.
- The filesystem functions opendir(), scandir() and dir() now use the default
context if no context is passed as an argument to them.
- realpath() is no longer system-dependent and works identically on all
platforms.
- call_user_func() now propagates $this even if the callee is the parent class.
- The filesystem functions opendir(), scandir(), and dir() now use the default
context if no context argument is passed.
- The behaviour of functions with by-reference parameters called by value has
changed. Where previously the function would accept the by-value argument, a
warning is now emitted and all by-ref parameters are set to NULL.
- There is now native support for the following math functions: asinh(), acosh(),
atanh(), log1p() and expm1().
- There is now native support for the following math functions: asinh(),
acosh(), atanh(), log1p(), and expm1().
- In the GD extension, there is now pixelation support available through
the imagefilter() function.
- crypt() now has Blowfish and extended DES support, and crypt() features are now
100% portable. PHP has its own internal crypt implementation which drops into
place when support for crypt or crypt_r() is not found.
- crypt() now has Blowfish and extended DES support, and crypt() features are
now 100% portable. PHP has its own internal crypt implementation which drops
into place when system support for crypt or crypt_r() is not found.
- get_cfg_var() is now able to return "array" INI options.
- Stream wrappers can now be used by include_path().
- Stream wrappers can now be used by the include_path INI directive.
- These functions now take new parameters:
clearstatcache(): $clear_realpath_cache and $filename.
copy(): $context
fgetcsv(): $escape
ini_get_all(): $details
json_encode(): $options
json_decode(): $depth
nl2br(): $is_xhtml
parse_ini_file(): $scanner_mode
round(): $mode
stream_context_create(): $params
strstr(), stristr(): $before_needle
sybase_connect(): $new
- And new mode option for fopen: 'n' (O_NONBLOCK)
- The new mysqlnd library necessitates using MySQL's newer 41-byte password
format. Continued use of the old 16 byte passwords will cause mysql_connect()
and other related functions to produce the following error message:
"mysqlnd cannot connect to MySQL 4.1+ using old authentication"
- The dl() function is now disabled by default, and only available under the
cli, cgi, and embed SAPIs.
- mail() now supports the logging of sent mail.
- stream_select(), stream_set_blocking(), stream_set_timeout(), and
stream_set_write_buffer() now work with user-space stream wrappers.
- getopt() accepts "long options" now on all platforms.
Optional values and using = as a separator for short options are now
supported.
- There are new parameters in:
clearstatcache(): clear_realpath_cache and filename.
copy(): context.
fgetcsv(): escape.
ini_get_all(): details.
nl2br(): is_xhtml.
parse_ini_file(): scanner_mode.
round(): mode.
stream_context_create(): params.
strstr(), stristr(): before_needle.
===================================
3. Changes made to existing methods
===================================
- The magic methods __get(), __set(), __isset(), __unset() and __call() should
- The magic methods __get(), __set(), __isset(), __unset(), and __call() should
always be public and can no longer be static. Method signatures are enforced.
- The __call() magic method is now invoked on access to private and protected
methods.
- The __toString() magic method can no longer accept arguments.
- There is a new magic method, __callStatic().
- count() vs count_elements() handler resolution rules have changed. (This could
potentially break custom PHP extensions.)
- Internal count() vs. count_elements() handler resolution rules have changed.
(This could potentially break custom PHP extensions.)
- The trailing / has been removed from SplFileInfo and other related directory
classes.
@@ -102,7 +142,7 @@ UPGRADE NOTES - PHP 5.3
- SplFileInfo::getpathinfo() now returns information about the path name.
- There are new parameters in:
Exception::__construct(): previous.
Exception::__construct(): $previous
===================================
4. Changes made to existing classes
@@ -117,13 +157,60 @@ UPGRADE NOTES - PHP 5.3
- define_syslog_variables() is deprecated.
- All ereg functions are deprecated. Use PCRE (preg_*()) instead.
- set_socket_blocking() is deprecated.
- call_user_method() and call_user_method_array() are now deprecated. Use
call_user_func() and call_user_func_array() instead.
- dl() is deprecated.
- The set_magic_quotes_runtime() function is now deprecated.
- mysql_listtables(), mysql_dropdb(), mysql_createdb(), mysql_list_tables(),
mysql_drop_db(), and mysql_create_db() are now deprecated.
- All ereg functions are now deprecated and emit E_DEPRECATED errors:
sql_regcase(), spliti(), split(), ereg_replace(), eregi(),
ereg_replace(), and ereg().
Use the PCRE family of functions (preg_*()) instead.
- mcrypt_generic_end() is deprecated.
- mysql_db_query() is deprecated.
- mysql_escape_string() is deprecated.
- session_register(), session_unregister(), and session_is_registered() are now
deprecated. Use the $_SESSION superglobal array instead.
- Comments starting with '#' are now deprecated in .INI files.
- The following INI directives will now emit an E_DEPRECATED warning
upon startup if they are activated:
- define_syslog_variables
- register_globals
- register_long_arrays
- safe_mode
- magic_quotes_gpc
- magic_quotes_runtime
- magic_quotes_sybase
- The is_dst parameter to mktime() is deprecated.
- Assigning the return value of "new" by reference is deprecated
- Call-time pass-by-reference has been deprecated
- Usage of {} to access string offsets is deprecated
- Passing locale category name as string to setlocale() is deprecated.
===============
6. Undeprecated
===============
- By popular request, is_a() is no longer marked deprecated.
- By popular request, is_a() is no longer deprecated.
==============
7. Extensions:
@@ -131,7 +218,7 @@ UPGRADE NOTES - PHP 5.3
a. moved out to PECL and actively maintained there
- fpdf
- fdf
- ming
- ncurses
@@ -141,26 +228,51 @@ UPGRADE NOTES - PHP 5.3
- fbsql
- msql
- sybase (use sybase_ct, which is still in PHP core)
- mhash (hash has full BC layer)
- mime_magic (use fileinfo, has full BC layer)
c. with changed behaviour
- hash: The SHA-224 hash algorithm is now supported.
- dns: dns_check_record() will now return an extra "entries" index,
containing the TXT elements.
- oci8a: Calling oci_close() on a persistent connection, or on a variable
that references a persistent connection going out of scope, will now
roll back any uncommitted transaction. You should explicitly commit or
rollback as needed.
Setting oci8.old_oci_close semantics=On in php.ini gives the old
behaviour.
- datetime: date/time functions will no longer use the TZ environment
variable to guess which timezone should be used.
- openssl: There is now support for OpenSSL digest and cipher functions.
- cURL now supports SSH
- hash: The SHA-224 and salsa hash algorithms are now supported.
- mbstring: Now supports CP850 encoding.
- oci8: Database Resident Connection Pooling (DRCP) and Fast Application
Notification (FAN) are now supported.
Oracle External Authentication is now supported (except on Windows).
The oci8 function oci_bind_by_name() now supports SQLT_AFC (aka the
CHAR datatype).
Calling oci_close() on a persistent connection, or when the variable
that references a persistent connection goes out of scope, will now
trigger a roll back of an uncommitted transaction. To avoid unexpected
behavior explicitly issue a commit or roll back as needed. The old
behavior can be enabled with the INI directive
oci8.old_oci_close_semantics.
- openssl: OpenSSL digest and cipher functions are now supported.
It is also now possible to access the internal values of DSA, RSA and
DH keys.
- session: Sessions will no longer store session-files in "/tmp" where
- session: Sessions will no longer store session-files in "/tmp" when
open_basedir restrictions apply, unless "/tmp" is explicitly added to
the list of allowed paths.
- SOAP: Now supports sending user-supplied HTTP headers.
- MySQLi: Now supports persistent connections by prepending the hostname
with "p:".
d. no longer possible to disable
- PCRE
@@ -171,6 +283,8 @@ UPGRADE NOTES - PHP 5.3
8. Changes in SAPI support
==========================
- A new "litespeed" SAPI is now available.
- FastCGI is now always enabled and can not be disabled. See sapi/cgi/CHANGES
for more details.
@@ -178,15 +292,17 @@ UPGRADE NOTES - PHP 5.3
repeated several times.
- CGI/FastCGI now has support for .htaccess style user-defined php.ini files.
See the new user_ini.filename and user_ini.cache_ttl INI directives.
============================
9. Changes in INI directives
============================
- zend.ze1_compatibility_mode has been removed.
- zend_extension_debug and zend_extension_ts have been removed. Always use the
zend_extension directive to load Zend Extensions.
- A new user initialization mechanism and config variables have been added:
user_ini.filename and user_ini.cache_ttl
- zend.ze1_compatibility_mode has been removed. If this INI directive is set to
on, then an E_ERROR is emitted at startup.
- There is now support for special sections: [PATH=/opt/httpd/www.example.com/]
and [HOST=www.example.com]. Directives set in these sections cannot be
@@ -198,18 +314,52 @@ UPGRADE NOTES - PHP 5.3
- It is now possible to use the full path to load modules using the "extension"
directive.
- "ini-variables" can now be used almost anywhere in a php.ini file.
- "INI variables" can now be used almost anywhere in a php.ini file.
- It is now possible to use alphanumeric or variable indices in ini option
- It is now possible to use alphanumeric or variable indices in INI option
arrays.
- open_basedir is now PHP_INI_ALL
- Runtime tightening of open_basedir restrictions is now possible.
- The default value of session.use_only_cookies has changed to "1".
- The default value of oci8.default_prefetch has been changed from 10 to 100.
- A new directive, request_order, controls the behavior of $_REQUEST
independently of variables_order.
- New INI directives:
- mail.add_x_header
- user_ini.filename
- user_ini.cache_ttl
- exit_on_timeout
- mysqli.allow_persistent
- mysqli.default_host
- mysqli.default_socket
- mysqli.allow_local_infile
- mysqli.cache_size
- oci8.connection_class
- oci8.events
- pdo_mysql.default_socket
- pdo_mysql.cache_size
- sqlite3.extension_dir
- mysql.default_socket
- mysql.allow_local_infile
- mysql.cache_size
- mysqlnd.collect_statistics
- mysqlnd.collect_memory_statistics
- mysqlnd.net_cmd_buffer_size
- mysqlnd.net_read_buffer_size
- mysqlnd.log_mask
====================
10. Syntax additions
====================
- NOWDOC is like HEREDOC but with single quotes:
- NOWDOC: Similar to HEREDOC, but with single quotes:
<<<'LABEL' ...
@@ -220,21 +370,92 @@ UPGRADE NOTES - PHP 5.3
No variables here...
LABEL;
- HEREDOC now supports wrapping the identifier with double-quotes, to complement
the NOWDOC syntax:
<<<"LABEL" ...
- The ?: operator has been introduced:
var_dump(0 ?: 'Hello!');
- Namespaces were added:
namespace my\name;
$obj = new \my\name\MyClass;
- Dynamic access to static methods is now possible:
$foo::myFunc();
- Exceptions can now be nested:
class MyCustomException extends Exception {}
try {
throw new MyCustomException("Something happend", 112);
} catch(Exception $e) {
throw new InvalidArgumentException("You are doing it wrong!", 911, $e);
}
- Exceptions can now be handled in destructors.
- A garbage collector has been added and is enabled by default.
===================
11. Windows support
===================
- The minimum Windows version is now Windows 2000. (Windows 98 and NT4 are no
longer supported).
- The minimum Windows version is now Windows 2000. (Windows 98, ME and NT4 are
no longer supported).
- PHP Windows binaries target i586 or later. i386 and i486 are not supported.
- Support for the IIS SAPI has been dropped. Use the FastCGI SAPI instead
(available for IIS5 and later)). FastCGI is the recommended way to use PHP
with IIS (see http://php.iis.net/).
- A new build is available based on the latest Visual C++ Compiler (VC9).
Its use is recommended with FastCGI or CLI. Apache's Windows binaries are not
compatible with VC9; however, you can use Apache Lounge's build
(http://apachelounge.com).
- The x64 binaries are for experimental usage only. They are not meant to be
used in production.
- A new site is available to download Windows releases as well as Windows-only
releases: http://windows.php.net. Windows-specific releases will be made to
fix security issues in the bundled libraries (libpng, openssl, etc.). Please
note that this site does not replace the main PHP site as a source of PHP
news, resources, or documentation.
- Windows support has been added for the following functions: getopt(),
imagecolorclosesthwb(), mcrypt_create_iv(), inet_ntop() and inet_pton().
imagecolorclosesthwb(), mcrypt_create_iv(), inet_ntop(), inet_pton(),
getmxrr(), checkdnsrr(), dns_get_record(), linkinfo(), readlink(),
symlink(), link(), fnmatch(), stream_socket_pair(), time_nanosleep(),
time_sleep_until(), and socket_create_pair().
- Crypt supports now all available algorithms on Windows (blowfish included).
- Improved portability of stat(), touch(), filemtime(), filesize() and related
functions (100% portable for the available data).
- It is now possible to create hard links on Windows using the link() function,
and symbolic links using the symlink() function. Hard links are available
as of Windows 2000 and symbolic links as of Windows Vista.
- The PDO_OCI php_pdo_oci8.dll library (for use with Oracle version 8 client
libraries) is no longer being built. Instead, use php_pdo_oci.dll (note no
'8') with Oracle 10 or 11 client libraries. Connection to other database
versions is still supported.
- For the OCI8 extension, a new library php_oci8_11g.dll is available in
addition to php_oci8.dll. Only one can be enabled at any time. Use
php_oci8.dll with Oracle 10.2 client libraries. Use php_oci8_11g.dll with
Oracle 11 client libraries. Connection to other database versions is still
supported.
- Firebird and SNMP support are no longer available on Windows. Firebird support
may be reintroduced in the future.
===================
12. New in PHP 5.3:
@@ -243,11 +464,13 @@ UPGRADE NOTES - PHP 5.3
a. New libraries
- mysqlnd is a new core library shipped with PHP. It is a PHP-specific
replacement for libmysql.
replacement for libmysql and is recommended for all installations for
increased performance.
b. New extensions
- fileinfo
- enchant
- fileinfo (replaces mime_magic)
- intl
- Phar
- SQLite3
@@ -257,7 +480,12 @@ UPGRADE NOTES - PHP 5.3
- glob:// stream wrapper
- phar:// stream wrapper for accessing phar archives
d. New functions
d. New stream filters
- "dechunk" (HTTP/1.1 chunked transfer encoding)
- The bz2.decompress filter now supports concatenation
e. New functions
- Core: gc_collect_cycles()
gc_enabled()
@@ -265,7 +493,6 @@ UPGRADE NOTES - PHP 5.3
gc_disable()
class_alias()
get_called_class()
get_extension_funcs()
forward_static_call()
forward_static_call_array()
str_getcsv()
@@ -279,15 +506,21 @@ UPGRADE NOTES - PHP 5.3
date_parse_from_format()
date_create_from_format()
date_get_last_errors()
timezone_version_get()
- INI: parse_ini_string()
- GMP: gmp_testbit()
- Hash: hash_copy()
- IMAP: imap_gc()
imap_utf8_to_mutf7()
imap_mutf7_to_utf8()
- JSON: json_last_error()
- libxml: libxml_disable_entity_loader
- MySQLi: mysqli_fetch_all()
mysqli_get_connection_stats()
mysqli_poll()
mysqli_reap_async_query()
- Network: gethostname()
header_remove()
- OpenSSL: openssl_random_pseudo_bytes()
- PCNTL: pcntl_signal_dispatch()
pcntl_sigprocmask()
@@ -295,24 +528,48 @@ UPGRADE NOTES - PHP 5.3
pcntl_sigtimedwait()
- PCRE: preg_filter()
- SHM: msg_queue_exists()
shm_has_var()
- Streams: stream_supports_lock()
stream_context_set_default()
stream_context_get_params()
- Userspace stream wrappers:
stream_cast()
stream_set_options()
e. New global constants
f. New global constants
- Core: E_DEPRECATED
E_USER_DEPRECATED
__DIR__
__NAMESPACE__
PHP_MAXPATHLEN
PHP_WINDOWS_VERSION_MAJOR
PHP_WINDOWS_VERSION_MINOR
PHP_WINDOWS_VERSION_BUILD
PHP_WINDOWS_VERSION_PLATFORM
PHP_WINDOWS_VERSION_SP_MAJOR
PHP_WINDOWS_VERSION_SP_MINOR
PHP_WINDOWS_VERSION_SUITEMASK
PHP_WINDOWS_VERSION_PRODUCTTYPE
PHP_WINDOWS_NT_DOMAIN_CONTROLLER
PHP_WINDOWS_NT_SERVER
PHP_WINDOWS_NT_WORKSTATION
- INI: INI_SCANNER_NORMAL
INI_SCANNER_RAW
- cURL CURLOPT_PROGRESSFUNCTION
- GD: IMG_FILTER_PIXELATE
- JSON: JSON_ERROR_NONE
JSON_ERROR_DEPTH
JSON_ERROR_STATE_MISMATCH
JSON_ERROR_CTRL_CHAR
JSON_ERROR_SYNTAX
JSON_FORCE_OBJECT
JSON_HEX_TAG
JSON_HEX_AMP
JSON_HEX_APOS
JSON_HEX_QUOT
- LDAP: LDAP_OPT_NETWORK_TIMEOUT
- libxml: LIBXML_LOADED_VERSION
- PCRE: PREG_BAD_UTF8_OFFSET_ERROR
- PCNTL: SIG_BLOCK
SIG_UNBLOCK
@@ -362,7 +619,7 @@ UPGRADE NOTES - PHP 5.3
BUS_ADRERR
BUS_OBJERR
f. New classes
g. New classes
- Date: DateInterval
DatePeriod
@@ -383,25 +640,28 @@ UPGRADE NOTES - PHP 5.3
RecursiveTreeIterator
MultipleIterator
g. New methods
h. New methods
- Date: DateTime::diff()
DateTime::add()
DateTime::sub()
DateTime::createFromFormat()
DateTime::getLastErrors()
- DOM: DOMNode::getLineNo()
- Exception: Exception::getPrevious()
- PDO_Firebird: PDO::setAttribute()
- Reflection: ReflectionProperty::setAccessible()
ReflectionFunction::getClosureThis()
ReflectionFunction::inNamespace()
ReflectionFunction::getNamespaceName()
ReflectionFunction::getShortName()
ReflectionClass::inNamespace()
ReflectionClass::getNamespaceName()
ReflectionClass::getShortName()
- SPL SplObjectStorage::addAll()
SplObjectStorage::removeAll()
- XSL: XSLTProcessor::setProfiling()
h. New class constants
i. New class constants
- PDO_Firebird: PDO::FB_ATTR_DATE_FORMAT
PDO::FB_ATTR_TIME_FORMAT
+32 -12
View File
@@ -62,18 +62,6 @@ unix.h \
stdlib.h \
dlfcn.h)
dnl Don't use mach-o/dyld.h on Darwin 8+, dl* is recommended by Apple from there on
dnl See http://developer.apple.com/documentation/DeveloperTools/Conceptual/MachOTopics/Articles/loading_code.html
case $host_alias in
*darwin[[89]]*)
;;
*)
AC_CHECK_HEADERS([ \
mach-o/dyld.h
],[],[][])
;;
esac
AC_TYPE_SIZE_T
AC_TYPE_SIGNAL
@@ -117,6 +105,38 @@ AC_CHECK_FUNCS(finite isfinite isinf isnan)
ZEND_FP_EXCEPT
ZEND_CHECK_FLOAT_PRECISION
dnl test whether double cast to long preserves least significant bits
AC_MSG_CHECKING(whether double cast to long preserves least significant bits)
AC_TRY_RUN([
#include <limits.h>
int main()
{
if (sizeof(long) == 4) {
double d = (double) LONG_MIN * LONG_MIN + 2e9;
if ((long) d == 2e9 && (long) -d == -2e9) {
exit(0);
}
} else if (sizeof(long) == 8) {
double correct = 18e18 - ((double) LONG_MIN * -2); /* Subtract ULONG_MAX + 1 */
if ((long) 18e18 == correct) { /* On 64-bit, only check between LONG_MAX and ULONG_MAX */
exit(0);
}
}
exit(1);
}
], [
AC_DEFINE([ZEND_DVAL_TO_LVAL_CAST_OK], 1, [Define if double cast to long preserves least significant bits])
AC_MSG_RESULT(yes)
], [
AC_MSG_RESULT(no)
], [
AC_MSG_RESULT(no)
])
])
+1
View File
@@ -3,6 +3,7 @@ if (function_exists("date_default_timezone_set")) {
date_default_timezone_set("UTC");
}
date_default_timezone_set('UTC');
function simple() {
$a = 0;
for ($i = 0; $i < 1000000; $i++)
+1 -1
View File
@@ -60,7 +60,7 @@ int(%d)
Warning: get_loaded_extensions() expects at most 1 parameter, 2 given in %s on line %d
NULL
Warning: Wrong parameter count for get_defined_constants() in %s on line %d
Warning: get_defined_constants() expects at most 1 parameter, 2 given in %s on line %d
NULL
string(5) "array"
string(5) "array"
+12 -11
View File
@@ -359,7 +359,8 @@ var_dump($global_var);
//Note: No error conditions relating to passing arugments can be tested
// because these are not functions but statements, it will result in syntax error.
echo "Done\n";
?>
===DONE===
--EXPECTF--
*** Testing unset(), empty() & isset() with scalar variables ***
-- Iteration 1 --
@@ -1185,11 +1186,11 @@ bool(true)
*** Testing unset(), emtpy() & isset() with resource variables ***
-- Iteration 1 --
resource(5) of type (stream)
resource(%d) of type (stream)
bool(true)
bool(false)
bool(true)
resource(5) of type (stream)
resource(%d) of type (stream)
bool(false)
bool(true)
bool(false)
@@ -1198,11 +1199,11 @@ bool(false)
Notice: Undefined variable: resource in %s on line %d
NULL
-- Iteration 2 --
resource(6) of type (stream)
resource(%d) of type (stream)
bool(true)
bool(false)
bool(true)
resource(6) of type (stream)
resource(%d) of type (stream)
bool(false)
bool(true)
bool(false)
@@ -1217,7 +1218,7 @@ bool(false)
bool(true)
*** Testing unset(), empty() & isset() with objects ***
object(Point)#1 (3) {
object(Point)#%d (3) {
["x"]=>
int(30)
["y"]=>
@@ -1239,7 +1240,7 @@ bool(false)
Notice: Undefined variable: lable in %s on line %d
bool(true)
object(Point)#1 (3) {
object(Point)#%d (3) {
["x"]=>
int(30)
["y"]=>
@@ -1247,7 +1248,7 @@ object(Point)#1 (3) {
["lable"]=>
string(6) "Point1"
}
object(Point)#1 (2) {
object(Point)#%d (2) {
["y"]=>
int(40)
["lable"]=>
@@ -1255,7 +1256,7 @@ object(Point)#1 (2) {
}
bool(false)
bool(true)
object(Point)#1 (0) {
object(Point)#%d (0) {
}
bool(true)
bool(false)
@@ -1276,7 +1277,7 @@ array(3) {
[2]=>
string(9) "testPoint"
}
object(Point)#1 (3) {
object(Point)#%d (3) {
["x"]=>
int(5)
["y"]=>
@@ -1329,4 +1330,4 @@ bool(false)
bool(false)
bool(true)
int(10)
Done
===DONE===
+4 -4
View File
@@ -18,17 +18,17 @@ var_dump($a->$b->$c[1]);
Notice: Undefined variable: a in %s on line %d
NULL
Notice: Undefined variable: c in %s on line %d
Notice: Undefined variable: %s in %s on line %d
Notice: Undefined variable: a in %s on line %d
Notice: Undefined variable: %s in %s on line %d
NULL
Notice: Undefined variable: a in %s on line %d
int(1)
Notice: Undefined variable: b in %s on line %d
Notice: Undefined variable: %s in %s on line %d
Notice: Undefined variable: a in %s on line %d
Notice: Undefined variable: %s in %s on line %d
int(0)
Notice: Undefined variable: a in %s on line %d
-34
View File
@@ -49,37 +49,3 @@ array(1) {
}
}
}
--UEXPECT--
array(1) {
[0]=>
object(stdClass)#1 (1) {
[u"a"]=>
object(stdClass)#2 (0) {
}
}
}
array(1) {
[0]=>
object(stdClass)#1 (2) {
[u"a"]=>
object(stdClass)#2 (0) {
}
[u"b"]=>
object(stdClass)#3 (0) {
}
}
}
array(1) {
[0]=>
object(stdClass)#1 (3) {
[u"a"]=>
object(stdClass)#2 (0) {
}
[u"b"]=>
object(stdClass)#3 (0) {
}
[u"c"]=>
object(stdClass)#2 (0) {
}
}
}
+3 -1
View File
@@ -41,12 +41,14 @@ $db = new hariCow;
var_dump($db);
?>
===DONE===
--EXPECTF--
Notice: Undefined variable: db in %sbug30162.php on line 35
NULL
object(hariCow)#1 (2) {
object(hariCow)#%d (2) {
["x"]=>
string(1) "x"
["y"]=>
string(1) "y"
}
===DONE===
+1 -1
View File
@@ -65,7 +65,7 @@ print "\nDone\n";
Notice: Uninitialized string offset: 0 in %s on line 12
Notice: Uninitialized string offset: -%d in %s on line 16
Notice: Uninitialized string offset: %i in %s on line 16
Notice: Uninitialized string offset: 4 in %s on line 28
+38
View File
@@ -0,0 +1,38 @@
--TEST--
bug #42143 (The constant NAN is reported as 0 on Windows build)
--CREDITS--
Venkat Raman Don
--FILE--
<?php
echo "Testing NAN:\n";
echo "NAN= ";
var_dump(NAN);
var_dump(tan(-1) == 123);
var_dump(cos(-100) == "PHP String");
var_dump(deg2rad(-5.6) == null);
var_dump(sqrt(-0.1) == false);
var_dump(sqrt(cos(M_PI)) == 0.1);
var_dump(NAN);
var_dump(is_nan(sqrt(-1.005)) == false);
var_dump(is_nan(floor(1)) == true);
var_dump(log10(-1) == log(-1));
var_dump(log10(-1) != log10(-1));
var_dump(is_finite(log10(-1)) == false);
var_dump(NAN == NAN);
?>
--EXPECT--
Testing NAN:
NAN= float(NAN)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
float(NAN)
bool(false)
bool(false)
bool(false)
bool(true)
bool(true)
bool(false)
+1
View File
@@ -1,4 +1,5 @@
--TEST--
Testing lambda function in set_exception_handler()
--FILE--
<?php
function au($class) {
+16
View File
@@ -0,0 +1,16 @@
--TEST--
Bug #47836 (array operator [] inconsistency when the array has PHP_INT_MAX index value)
--FILE--
<?php
$arr[PHP_INT_MAX] = 1;
$arr[] = 2;
var_dump($arr);
?>
--EXPECTF--
Warning: Cannot add element to the array as the next element is already occupied in %s on line 4
array(1) {
[%d]=>
int(1)
}
+38
View File
@@ -0,0 +1,38 @@
--TEST--
Bug #48215 - parent::method() calls __construct
--FILE--
<?php
class A
{
public function __construct() {
echo __METHOD__ . "\n";
}
protected function A()
{
echo __METHOD__ . "\n";
}
}
class B extends A
{
public function __construct() {
echo __METHOD__ . "\n";
parent::__construct();
}
public function A()
{
echo __METHOD__ . "\n";
parent::A();
}
}
$b = new B();
$b->A();
?>
===DONE===
--EXPECTF--
Strict Standards: Redefining already defined constructor for class A in %s on line %d
B::__construct
A::__construct
B::A
A::A
===DONE===
+22
View File
@@ -0,0 +1,22 @@
--TEST--
Bug #48215 - parent::method() calls __construct, case sensitive test
--FILE--
<?php
class a {
public function __CONSTRUCT() { echo __METHOD__ . "\n"; }
public function a() { echo __METHOD__ . "\n"; }
}
class b extends a {}
class c extends b {
function C() {
b::b();
}
}
$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
+32
View File
@@ -0,0 +1,32 @@
--TEST--
Bug #48228 (crash when exception is thrown while passing function arguments)
--FILE--
<?php
function do_throw() {
throw new Exception();
}
class aa
{
function check()
{
}
function dosome()
{
$this->check(do_throw());
}
}
$l_aa=new aa();
$l_aa->dosome();
?>
--EXPECTF--
Fatal error: Uncaught exception 'Exception' in %s
Stack trace:
#0 %s(%d): do_throw()
#1 %s(%d): aa->dosome()
#2 {main}
thrown in %s
+27
View File
@@ -0,0 +1,27 @@
--TEST--
Bug #48248 (SIGSEGV when access to private property via &__get)
--FILE--
<?php
class A
{
public function & __get($name)
{
return $this->test;
}
}
class B extends A
{
private $test;
}
$b = new B;
var_dump($b->test);
?>
--EXPECTF--
Notice: Undefined property: B::$test in %s on line %d
Notice: Only variable references should be returned by reference in %s on line %d
NULL
+30
View File
@@ -0,0 +1,30 @@
--TEST--
Bug #48408 (crash when exception is thrown while passing function arguments)
--FILE--
<?php
class B{
public function process($x){
return $x;
}
}
class C{
public function generate($x){
throw new Exception;
}
}
$b = new B;
$c = new C;
try{
$b->process($c->generate(0));
}
catch(Exception $e){
$c->generate(0);
}
?>
--EXPECTF--
Fatal error: Uncaught exception 'Exception' in %s
Stack trace:
#0 %s(%d): C->generate(0)
#1 {main}
thrown in %s
+67
View File
@@ -0,0 +1,67 @@
--TEST--
Bug #48409 (crash when exception is thrown while passing function arguments)
--FILE--
<?php
class ABCException extends Exception {}
class BBB
{
public function xyz($d, $x)
{
if ($x == 34) {
throw new ABCException;
}
return array('foo' => 'xyz');
}
}
class CCC
{
public function process($p)
{
return $p;
}
}
class AAA
{
public function func()
{
$b = new BBB;
$c = new CCC;
$i = 34;
$item = array('foo' => 'bar');
try {
$c->process($b->xyz($item['foo'], $i));
}
catch(ABCException $e) {
$b->xyz($item['foo'], $i);
}
} // end func();
}
class Runner
{
public function run($x)
{
try {
$x->func();
}
catch(ABCException $e) {
throw new Exception;
}
}
}
try {
$runner = new Runner;
$runner->run(new AAA);
}
catch(Exception $e) {
die('Exception thrown');
}
?>
--EXPECT--
Exception thrown
+13
View File
@@ -0,0 +1,13 @@
--TEST--
Bug #48428 (crash when exception is thrown while passing function arguments)
--FILE--
<?php
try {
function x() { throw new Exception("ERROR"); }
x(x());
} catch(Exception $e) {
echo($e -> getMessage());
}
?>
--EXPECT--
ERROR
+41
View File
@@ -0,0 +1,41 @@
--TEST--
Bug #48533 (__callStatic is not invoked for private/protected methods)
--FILE--
<?php
class foo {
private function a() {
var_dump(1);
}
public function b() {
var_dump(2);
}
protected function c() {
var_dump(3);
}
static function __callstatic($a, $b) {
var_dump('__callStatic::'. $a);
}
public function __call($a, $b) {
var_dump('__call::'. $a);
}
}
$x = new foo;
$x->a();
$x->b();
$x->c();
$x::a();
$x::b();
$x::c();
?>
--EXPECTF--
%unicode|string%(9) "__call::a"
int(2)
%unicode|string%(9) "__call::c"
%unicode|string%(15) "__callStatic::a"
Strict Standards: Non-static method foo::b() should not be called statically in %s on line %d
int(2)
%unicode|string%(15) "__callStatic::c"
+28
View File
@@ -0,0 +1,28 @@
--TEST--
Bug #48693 (Double declaration of __lambda_func when lambda wrongly formatted)
--FILE--
<?php
$x = create_function('', 'return 1; }');
$y = create_function('', 'function a() { }; return 2;');
$z = create_function('', '{');
$w = create_function('', 'return 3;');
var_dump(
$x,
$y(),
$z,
$w(),
$y != $z
);
?>
--EXPECTF--
Parse error: syntax error, unexpected '}' in %s(%d) : runtime-created function on line 1
Parse error: syntax error, unexpected $end in %s(%d) : runtime-created function on line 1
bool(false)
int(2)
bool(false)
int(3)
bool(true)
+53
View File
@@ -0,0 +1,53 @@
--TEST--
Bug #48770 (call_user_func_array() fails to call parent from inheriting class)
--XFAIL--
See Bug #48770
--FILE--
<?php
class A {
public function func($str) {
var_dump(__METHOD__ .': '. $str);
}
private function func2($str) {
var_dump(__METHOD__ .': '. $str);
}
protected function func3($str) {
var_dump(__METHOD__ .': '. $str);
}
private function func22($str) {
var_dump(__METHOD__ .': '. $str);
}
}
class B extends A {
public function func($str) {
static $avoid_crash = 0;
if ($avoid_crash++ == 1) {
print "This method shouldn't be called when using parent::func!\n";
return;
}
call_user_func_array(array($this, 'parent::func'), array($str));
}
private function func2($str) {
var_dump(__METHOD__ .': '. $str);
}
protected function func3($str) {
var_dump(__METHOD__ .': '. $str);
}
}
class C extends B {
public function func($str) {
parent::func($str);
}
}
$c = new C;
$c->func('This should work!');
?>
--EXPECTF--
%unicode|string%(26) "A::func: This should work!"
+54
View File
@@ -0,0 +1,54 @@
--TEST--
Bug #48770 (call_user_func_array() fails to call parent from inheriting class)
--XFAIL--
See Bug #48770
--FILE--
<?php
class A {
public function func($str) {
var_dump(__METHOD__ .': '. $str);
}
private function func2($str) {
var_dump(__METHOD__ .': '. $str);
}
protected function func3($str) {
var_dump(__METHOD__ .': '. $str);
}
private function func22($str) {
var_dump(__METHOD__ .': '. $str);
}
}
class B extends A {
public function func($str) {
call_user_func_array(array($this, 'parent::func2'), array($str));
call_user_func_array(array($this, 'parent::func3'), array($str));
call_user_func_array(array($this, 'parent::func22'), array($str));
call_user_func_array(array($this, 'parent::inexistent'), array($str));
}
private function func2($str) {
var_dump(__METHOD__ .': '. $str);
}
protected function func3($str) {
var_dump(__METHOD__ .': '. $str);
}
}
class C extends B {
public function func($str) {
parent::func($str);
}
}
$c = new C;
$c->func('This should work!');
?>
--EXPECTF--
%unicode|string%(27) "A::func2: This should work!"
%unicode|string%(27) "A::func3: This should work!"
Warning: call_user_func_array() expects parameter 1 to be a valid callback, cannot access private method A::func22() in %s on line %d
Warning: call_user_func_array() expects parameter 1 to be a valid callback, class 'A' does not have a method 'inexistent' in %s on line %d
+51
View File
@@ -0,0 +1,51 @@
--TEST--
Bug #48770 (call_user_func_array() fails to call parent from inheriting class)
--XFAIL--
See Bug #48770
--FILE--
<?php
class A {
public function func($str) {
var_dump(__METHOD__ .': '. $str);
}
private function func2($str) {
var_dump(__METHOD__ .': '. $str);
}
protected function func3($str) {
var_dump(__METHOD__ .': '. $str);
}
private function func22($str) {
var_dump(__METHOD__ .': '. $str);
}
}
class B extends A {
public function func($str) {
call_user_func_array(array($this, 'self::func2'), array($str));
call_user_func_array(array($this, 'self::func3'), array($str));
call_user_func_array(array($this, 'self::inexistent'), array($str));
}
private function func2($str) {
var_dump(__METHOD__ .': '. $str);
}
protected function func3($str) {
var_dump(__METHOD__ .': '. $str);
}
}
class C extends B {
public function func($str) {
parent::func($str);
}
}
$c = new C;
$c->func('This should work!');
?>
--EXPECTF--
%unicode|string%(27) "B::func2: This should work!"
%unicode|string%(27) "B::func3: This should work!"
Warning: call_user_func_array() expects parameter 1 to be a valid callback, class 'B' does not have a method 'inexistent' in %s on line %d
+24
View File
@@ -0,0 +1,24 @@
--TEST--
Bug #48899 (is_callable returns true even if method does not exist in parent class)
--FILE--
<?php
class ParentClass { }
class ChildClass extends ParentClass {
public function testIsCallable() {
var_dump(is_callable(array($this, 'parent::testIsCallable')));
}
public function testIsCallable2() {
var_dump(is_callable(array($this, 'static::testIsCallable2')));
}
}
$child = new ChildClass();
$child->testIsCallable();
$child->testIsCallable2();
?>
--EXPECT--
bool(false)
bool(true)
+16
View File
@@ -0,0 +1,16 @@
--TEST--
Bug #48912 (Namespace causes unexpected strict behaviour with extract())
--FILE--
<?php
namespace A;
function test()
{
extract(func_get_arg(0));
}
test(array('x' => 1));
echo "ok\n";
?>
--EXPECT--
ok
+26
View File
@@ -0,0 +1,26 @@
--TEST--
Bug #49269 (Ternary operator fails on Iterator object when used inside foreach declaration).
--FILE--
<?php
class TestObject implements Iterator
{
public $n = 0;
function valid()
{
return ($this->n < 3);
}
function current() {return $this->n;}
function next() {$this->n++;}
function key() { }
function rewind() {$this->n = 0;}
}
$array_object = new TestObject();
foreach ((true ? $array_object : $array_object) as $item) echo "$item\n";
?>
--EXPECT--
0
1
2
+28
View File
@@ -0,0 +1,28 @@
--TEST--
Bug #49908 (throwing exception in __autoload crashes when interface is not defined)
--FILE--
<?php
function __autoload($className) {
var_dump($className);
if ($className == 'Foo') {
class Foo implements Bar {};
} else {
throw new Exception($className);
}
}
new Foo;
?>
--EXPECTF--
%unicode|string%(3) "Foo"
%unicode|string%(3) "Bar"
Fatal error: Uncaught exception 'Exception' with message 'Bar' in %s:%d
Stack trace:
#0 %s(7): __autoload('Bar')
#1 %s(13): __autoload('Foo')
#2 {main}
thrown in %s on line %d
+1 -1
View File
@@ -27,4 +27,4 @@ ok
Strict Standards: Non-static method foo::aa() should not be called statically in %s on line %d
ok
Fatal error: Can not call constructor in %s on line %d
Fatal error: Cannot call constructor in %s on line %d
+35
View File
@@ -0,0 +1,35 @@
--TEST--
Testing call_user_func inside namespace
--FILE--
<?php
namespace testing {
function foobar($str) {
var_dump($str);
}
abstract class bar {
protected function prot($str) {
print "Shouldn't be called!\n";
}
}
class foo extends bar {
private function priv($str) {
print "Shouldn't be called!\n";
}
}
call_user_func(__NAMESPACE__ .'\foobar', 'foobar');
$class = __NAMESPACE__ .'\foo';
call_user_func(array(new $class, 'priv'), 'foobar');
call_user_func(array(new $class, 'prot'), 'foobar');
}
?>
--EXPECTF--
%string|unicode%(6) "foobar"
Warning: call_user_func() expects parameter 1 to be a valid callback, cannot access private method testing\foo::priv() in %s on line %d
Warning: call_user_func() expects parameter 1 to be a valid callback, cannot access protected method testing\foo::prot() in %s on line %d
+29
View File
@@ -0,0 +1,29 @@
--TEST--
Testing call_user_func() with autoload and passing invalid params
--FILE--
<?php
function __autoload($class) {
var_dump($class);
}
call_user_func(array('foo', 'bar'));
call_user_func(array('', 'bar'));
call_user_func(array($foo, 'bar'));
call_user_func(array($foo, ''));
?>
--EXPECTF--
%unicode|string%(3) "foo"
Warning: call_user_func() expects parameter 1 to be a valid callback, class 'foo' not found in %s on line %d
Warning: call_user_func() expects parameter 1 to be a valid callback, class '' not found in %s on line %d
Notice: Undefined variable: foo in %s on line %d
Warning: call_user_func() expects parameter 1 to be a valid callback, first array member is not a valid class name or object in %s on line %d
Notice: Undefined variable: foo in %s on line %d
Warning: call_user_func() expects parameter 1 to be a valid callback, first array member is not a valid class name or object in %s on line %d
+31
View File
@@ -0,0 +1,31 @@
--TEST--
Testing call_user_func() with closures
--FILE--
<?php
$foo = function() {
static $instance;
if (is_null($instance)) {
$instance = function () {
return 'OK!';
};
}
return $instance;
};
var_dump(call_user_func(array($foo, '__invoke'))->__invoke());
var_dump(call_user_func(function() use (&$foo) { return $foo; }, '__invoke'));
?>
--EXPECTF--
%unicode|string%(3) "OK!"
object(Closure)#%d (1) {
[%u|b%"static"]=>
array(1) {
[%u|b%"instance"]=>
object(Closure)#%d (0) {
}
}
}
+25
View File
@@ -0,0 +1,25 @@
--TEST--
Closure 033: Recursive var_dump on closures
--FILE--
<?php
$a = function () use(&$a) {};
var_dump($a);
?>
===DONE===
--EXPECTF--
object(Closure)#1 (1) {
["static"]=>
array(1) {
["a"]=>
&object(Closure)#1 (1) {
["static"]=>
array(1) {
["a"]=>
*RECURSION*
}
}
}
}
===DONE===
-6
View File
@@ -16,9 +16,3 @@ Warning: Constants may only evaluate to scalar values in %s on line %d
Notice: Use of undefined constant foo - assumed 'foo' in %s on line %d
string(%d) "foo"
resource(%d) of type (stream)
--UEXPECTF--
Warning: Constants may only evaluate to scalar values in %s on line %d
Notice: Use of undefined constant foo - assumed 'foo' in %s on line %d
unicode(%d) "foo"
resource(%d) of type (stream)
-13
View File
@@ -22,16 +22,3 @@ array(4) {
["key"]=>
int(0)
}
--UEXPECTF--
array(4) {
[1]=>
array(0) {
}
[u"value"]=>
array(0) {
}
[0]=>
int(0)
[u"key"]=>
int(0)
}
+30
View File
@@ -0,0 +1,30 @@
--TEST--
Testing Exception's methods
--FILE--
<?php
$x = new Exception;
$x->gettraceasstring(1);
$x->gettraceasstring();
$x->__tostring(1);
$x->gettrace(1);
$x->getline(1);
$x->getfile(1);
$x->getmessage(1);
$x->getcode(1);
?>
--EXPECTF--
Warning: Exception::getTraceAsString() expects exactly 0 parameters, 1 given in %s on line %d
Warning: Exception::__toString() expects exactly 0 parameters, 1 given in %s on line %d
Warning: Exception::getTrace() expects exactly 0 parameters, 1 given in %s on line %d
Warning: Exception::getLine() expects exactly 0 parameters, 1 given in %s on line %d
Warning: Exception::getFile() expects exactly 0 parameters, 1 given in %s on line %d
Warning: Exception::getMessage() expects exactly 0 parameters, 1 given in %s on line %d
Warning: Exception::getCode() expects exactly 0 parameters, 1 given in %s on line %d
+39
View File
@@ -0,0 +1,39 @@
--TEST--
function_exists function : basic functionality
--FILE--
<?php
/*
* proto bool function_exists(string function_name)
* Function is implemented in Zend/zend_builtin_functions.c
*/
echo "*** Testing function_exists() : basic functionality ***\n";
echo "Internal function: ";
var_dump(function_exists('function_exists'));
echo "User defined function: ";
function f() {}
var_dump(function_exists('f'));
echo "Case sensitivity: ";
var_dump(function_exists('F'));
echo "Non existent function: ";
var_dump(function_exists('g'));
echo "Method: ";
Class C {
static function f() {}
}
var_dump(function_exists('C::f'));
?>
===Done===
--EXPECT--
*** Testing function_exists() : basic functionality ***
Internal function: bool(true)
User defined function: bool(true)
Case sensitivity: bool(true)
Non existent function: bool(false)
Method: bool(false)
===Done===
+36
View File
@@ -0,0 +1,36 @@
--TEST--
Test function_exists() function : error conditions
--FILE--
<?php
/*
* proto bool function_exists(string function_name)
* Function is implemented in Zend/zend_builtin_functions.c
*/
echo "*** Testing function_exists() : error conditions ***\n";
$arg_0 = "ABC";
$extra_arg = 1;
echo "\nToo many arguments\n";
var_dump(function_exists($arg_0, $extra_arg));
echo "\nToo few arguments\n";
var_dump(function_exists());
?>
===Done===
--EXPECTF--
*** Testing function_exists() : error conditions ***
Too many arguments
Warning: function_exists() expects exactly 1 parameter, 2 given in %s on line %d
NULL
Too few arguments
Warning: function_exists() expects exactly 1 parameter, 0 given in %s on line %d
NULL
===Done===
+138
View File
@@ -0,0 +1,138 @@
--TEST--
Test function_exists() function : usage variations - test values for $str argument
--FILE--
<?php
/*
* proto bool function_exists(string function_name)
* Function is implemented in Zend/zend_builtin_functions.c
*/
echo "*** Testing function_exists() function: with unexpected inputs for 'str' argument ***\n";
//get an unset variable
$unset_var = 'string_val';
unset($unset_var);
//defining a class
class sample {
public function __toString() {
return "sample object";
}
}
//getting the resource
$file_handle = fopen(__FILE__, "r");
// array with different values for $str
$inputs = array (
// integer values
0,
1,
255,
256,
PHP_INT_MAX,
-PHP_INT_MAX,
// float values
10.5,
-20.5,
10.1234567e10,
// array values
array(),
array(0),
array(1, 2),
// boolean values
true,
false,
TRUE,
FALSE,
// null values
NULL,
null,
// objects
new sample(),
// resource
$file_handle,
// undefined variable
@$undefined_var,
// unset variable
@$unset_var
);
// loop through with each element of the $inputs array to test function_exists() function
$count = 1;
foreach($inputs as $input) {
echo "-- Iteration $count --\n";
var_dump( function_exists($input) );
$count ++;
}
fclose($file_handle); //closing the file handle
?>
===Done===
--EXPECTF--
*** Testing function_exists() function: with unexpected inputs for 'str' argument ***
-- Iteration 1 --
bool(false)
-- Iteration 2 --
bool(false)
-- Iteration 3 --
bool(false)
-- Iteration 4 --
bool(false)
-- Iteration 5 --
bool(false)
-- Iteration 6 --
bool(false)
-- Iteration 7 --
bool(false)
-- Iteration 8 --
bool(false)
-- Iteration 9 --
bool(false)
-- Iteration 10 --
Warning: function_exists() expects parameter 1 to be string, array given in %s on line %d
NULL
-- Iteration 11 --
Warning: function_exists() expects parameter 1 to be string, array given in %s on line %d
NULL
-- Iteration 12 --
Warning: function_exists() expects parameter 1 to be string, array given in %s on line %d
NULL
-- Iteration 13 --
bool(false)
-- Iteration 14 --
bool(false)
-- Iteration 15 --
bool(false)
-- Iteration 16 --
bool(false)
-- Iteration 17 --
bool(false)
-- Iteration 18 --
bool(false)
-- Iteration 19 --
bool(false)
-- Iteration 20 --
Warning: function_exists() expects parameter 1 to be string, resource given in %s on line %d
NULL
-- Iteration 21 --
bool(false)
-- Iteration 22 --
bool(false)
===Done===
+3 -1
View File
@@ -33,7 +33,7 @@ new C;
?>
--EXPECT--
array(5) {
array(6) {
["aaa"]=>
int(7)
["ccc"]=>
@@ -42,6 +42,8 @@ array(5) {
int(1)
["aa"]=>
int(4)
["bb"]=>
int(5)
["cc"]=>
int(6)
}
+3 -1
View File
@@ -44,5 +44,7 @@ array(1) {
["a"]=>
int(1)
}
array(0) {
array(1) {
["a"]=>
int(1)
}
@@ -0,0 +1,59 @@
--TEST--
get_defined_functions() function : basic functionality
--FILE--
<?php
/* Prototype : array get_defined_functions ( void )
* Description: Gets an array of all defined functions.
* Source code: Zend/zend_builtin_functions.c
*/
echo "*** Testing get_defined_functions() : basic functionality ***\n";
function foo() {}
// mixed case function
function HelloWorld() {}
Class C {
function f1() {}
static function f2() {}
}
$func = get_defined_functions();
if (!is_array($func)) {
echo "TEST FAILED: return type not an array\n";
}
if (!is_array($func["internal"])) {
echo "TEST FAILED: no element in result array with key 'internal'\n";
}
$internal = $func["internal"];
//check for a few core functions
if (!in_array("cos", $internal) || !in_array("strlen", $internal)) {
echo "TEST FAILED: missing elements from 'internal' array\n";
var_dump($internal);
}
if (!is_array($func["user"])) {
echo "TEST FAILED: no element in result array with key 'user'\n";
}
$user = $func["user"];
if (count($user) == 2 && in_array("foo", $user) && in_array("helloworld", $user)) {
echo "TEST PASSED\n";
} else {
echo "TEST FAILED: missing elements from 'user' array\n";
var_dump($user);
}
?>
===Done===
--EXPECT--
*** Testing get_defined_functions() : basic functionality ***
TEST PASSED
===Done===
@@ -0,0 +1,29 @@
--TEST--
Test get_defined_functions() function : error conditions
--FILE--
<?php
/* Prototype : array get_defined_functions ( void )
* Description: Gets an array of all defined functions.
* Source code: Zend/zend_builtin_functions.c
*/
echo "*** Testing get_defined_functions() : error conditions ***\n";
echo "\n-- Testing get_defined_functions() function with more than expected no. of arguments --\n";
$extra_arg = 10;
var_dump( get_defined_functions($extra_arg) );
?>
===Done===
--EXPECTF--
*** Testing get_defined_functions() : error conditions ***
-- Testing get_defined_functions() function with more than expected no. of arguments --
Warning: get_defined_functions() expects exactly 0 parameters, 1 given in %s on line %d
NULL
===Done===
-3
View File
@@ -26,6 +26,3 @@ $a->foo();
--EXPECT--
string(3) "bar"
bool(false)
--UEXPECT--
unicode(3) "bar"
bool(false)
+16
View File
@@ -0,0 +1,16 @@
--TEST--
Check if get_required_files works
--CREDITS--
Sebastian Schürmann
sschuermann@chip.de
Testfest 2009 Munich
--FILE--
<?php
$files = get_required_files();
var_dump($files);
?>
--EXPECTF--
array(1) {
[0]=>
%string|unicode%(%d)%s
}
+1 -1
View File
@@ -1,6 +1,6 @@
--TEST--
globals in global scope
--INIT--
--INI--
variables_order="egpcs"
--FILE--
<?php
+1 -1
View File
@@ -1,6 +1,6 @@
--TEST--
globals in local scope
--INIT--
--INI--
variables_order="egpcs"
--FILE--
<?php
+1 -1
View File
@@ -1,6 +1,6 @@
--TEST--
globals in local scope - 2
--INIT--
--INI--
variables_order="egpcs"
--FILE--
<?php
+1 -1
View File
@@ -1,6 +1,6 @@
--TEST--
globals in local scope - 3
--INIT--
--INI--
variables_order="egpcs"
--FILE--
<?php
+4 -4
View File
@@ -22,12 +22,12 @@ foreach ($doubles as $d) {
echo "Done\n";
?>
--EXPECTF--
int(9223372036854775807)
int(9223372036854775807)
int(9223372036854775807)
--EXPECT--
int(9223372036854775807)
int(-9223372036854775808)
int(-9223372036854775808)
int(0)
int(-9223372036854775808)
int(-9223372036854775808)
int(-9223372036854775808)
Done
+5 -5
View File
@@ -20,10 +20,10 @@ foreach ($doubles as $d) {
echo "Done\n";
?>
--EXPECTF--
int(-2147483648)
int(-2147483648)
int(-2147483648)
int(-2147483648)
--EXPECT--
int(-2147483648)
int(2147483647)
int(2147483638)
int(2147483548)
int(2147482648)
Done
+1 -1
View File
@@ -11,4 +11,4 @@ class foo {
?>
--EXPECTF--
Warning: The magic method __unset() must have public visibility and can not be static in %s on line %d
Warning: The magic method __unset() must have public visibility and cannot be static in %s on line %d
+1 -1
View File
@@ -11,4 +11,4 @@ class foo {
?>
--EXPECTF--
Warning: The magic method __unset() must have public visibility and can not be static in %s on line %d
Warning: The magic method __unset() must have public visibility and cannot be static in %s on line %d
+1 -1
View File
@@ -11,4 +11,4 @@ class foo {
?>
--EXPECTF--
Warning: The magic method __unset() must have public visibility and can not be static in %s on line %d
Warning: The magic method __unset() must have public visibility and cannot be static in %s on line %d
+1 -1
View File
@@ -9,4 +9,4 @@ interface a {
?>
--EXPECTF--
Warning: The magic method __call() must have public visibility and can not be static in %s on line %d
Warning: The magic method __call() must have public visibility and cannot be static in %s on line %d
+1 -1
View File
@@ -9,6 +9,6 @@ abstract class b {
?>
--EXPECTF--
Warning: The magic method __set() must have public visibility and can not be static in %s on line %d
Warning: The magic method __set() must have public visibility and cannot be static in %s on line %d
Fatal error: Method b::__set() must take exactly 2 arguments in %s on line %d
+1 -1
View File
@@ -14,6 +14,6 @@ class a extends b {
?>
--EXPECTF--
Warning: The magic method __set() must have public visibility and can not be static in %s on line %d
Warning: The magic method __set() must have public visibility and cannot be static in %s on line %d
Fatal error: Access level to a::__set() must be public (as in class b) in %s on line %d
+1 -1
View File
@@ -10,6 +10,6 @@ class a {
?>
--EXPECTF--
Warning: The magic method __toString() must have public visibility and can not be static in %s on line %d
Warning: The magic method __toString() must have public visibility and cannot be static in %s on line %d
Fatal error: Method a::__tostring() cannot take arguments in %s on line %d
-2
View File
@@ -7,5 +7,3 @@ namespace test\foo;
var_dump(__NAMESPACE__);
--EXPECT--
string(8) "test\foo"
--UEXPECT--
unicode(8) "test\foo"
-2
View File
@@ -5,5 +5,3 @@
var_dump(__NAMESPACE__);
--EXPECT--
string(0) ""
--UEXPECT--
unicode(0) ""
+18
View File
@@ -0,0 +1,18 @@
--TEST--
Crash when function parameter modified via unexpected reference
--FILE--
<?php
function my_errorhandler($errno,$errormsg) {
global $my_var;
$my_var = 0;
return true;
}
set_error_handler("my_errorhandler");
$my_var = str_repeat("A",64);
$data = call_user_func_array("explode",array(new StdClass(), &$my_var));
$my_var=array(1,2,3);
$data = call_user_func_array("implode",array(&$my_var, new StdClass()));
echo "Done.\n";
?>
--EXPECTF--
Done.
-2
View File
@@ -1,7 +1,5 @@
--TEST--
unset() CV 7 (indirect unset() of global variable in import_request_variables())
--SKIPIF--
<?php if (php_sapi_name()=='cli') echo 'skip'; ?>
--GET--
x=2
--FILE--
+11 -5
View File
@@ -863,7 +863,7 @@ void zend_deactivate_modules(TSRMLS_D) /* {{{ */
EG(opline_ptr) = NULL; /* we're no longer executing anything */
zend_try {
zend_hash_apply(&module_registry, (apply_func_t) module_registry_cleanup TSRMLS_CC);
zend_hash_reverse_apply(&module_registry, (apply_func_t) module_registry_cleanup TSRMLS_CC);
} zend_end_try();
}
/* }}} */
@@ -1067,9 +1067,15 @@ ZEND_API void zend_error(int type, const char *format, ...) /* {{{ */
if (!EG(active_symbol_table)) {
zend_rebuild_symbol_table(TSRMLS_C);
}
Z_ARRVAL_P(z_context) = EG(active_symbol_table);
Z_TYPE_P(z_context) = IS_ARRAY;
zval_copy_ctor(z_context);
/* during shutdown the symbol table table can be still null */
if (!EG(active_symbol_table)) {
Z_TYPE_P(z_context) = IS_NULL;
} else {
Z_ARRVAL_P(z_context) = EG(active_symbol_table);
Z_TYPE_P(z_context) = IS_ARRAY;
zval_copy_ctor(z_context);
}
params = (zval ***) emalloc(sizeof(zval **)*5);
params[0] = &z_error_type;
@@ -1133,7 +1139,7 @@ ZEND_API void zend_error(int type, const char *format, ...) /* {{{ */
}
/* }}} */
#if defined(__GNUC__) && !defined(__INTEL_COMPILER) && !defined(DARWIN) && !defined(__hpux) && !defined(_AIX) && !defined(__osf__)
#if defined(__GNUC__) && __GNUC__ >= 3 && !defined(__INTEL_COMPILER) && !defined(DARWIN) && !defined(__hpux) && !defined(_AIX) && !defined(__osf__)
void zend_error_noreturn(int type, const char *format, ...) __attribute__ ((alias("zend_error"),noreturn));
#endif
+15 -22
View File
@@ -34,8 +34,6 @@
#define END_EXTERN_C()
#endif
#include <stdio.h>
/*
* general definitions
*/
@@ -67,6 +65,8 @@
/* all HAVE_XXX test have to be after the include of zend_config above */
#include <stdio.h>
#ifdef HAVE_UNIX_H
# include <unix.h>
#endif
@@ -79,18 +79,7 @@
# include <dlfcn.h>
#endif
#if HAVE_MACH_O_DYLD_H
#include <mach-o/dyld.h>
/* MH_BUNDLE loading functions for Mac OS X / Darwin */
void *zend_mh_bundle_load (char* bundle_path);
int zend_mh_bundle_unload (void *bundle_handle);
void *zend_mh_bundle_symbol(void *bundle_handle, const char *symbol_name);
const char *zend_mh_bundle_error(void);
#endif /* HAVE_MACH_O_DYLD_H */
#if defined(HAVE_LIBDL) && !defined(HAVE_MACH_O_DYLD_H) && !defined(ZEND_WIN32)
#if defined(HAVE_LIBDL) && !defined(ZEND_WIN32)
# ifndef RTLD_LAZY
# define RTLD_LAZY 1 /* Solaris 1, FreeBSD's (2.1.7.1 and older) */
@@ -116,13 +105,6 @@ const char *zend_mh_bundle_error(void);
# define DL_ERROR dlerror
# define DL_HANDLE void *
# define ZEND_EXTENSIONS_SUPPORT 1
#elif defined(HAVE_MACH_O_DYLD_H)
# define DL_LOAD(libname) zend_mh_bundle_load(libname)
# define DL_UNLOAD zend_mh_bundle_unload
# define DL_FETCH_SYMBOL(h,s) zend_mh_bundle_symbol(h,s)
# define DL_ERROR zend_mh_bundle_error
# define DL_HANDLE void *
# define ZEND_EXTENSIONS_SUPPORT 1
#elif defined(ZEND_WIN32)
# define DL_LOAD(libname) LoadLibrary(libname)
# define DL_FETCH_SYMBOL GetProcAddress
@@ -192,6 +174,12 @@ char *alloca ();
# define ZEND_FASTCALL
#endif
#if defined(__GNUC__) && ZEND_GCC_VERSION >= 3400
#else
# define __restrict__
#endif
#define restrict __restrict__
#if (HAVE_ALLOCA || (defined (__GNUC__) && __GNUC__ >= 2)) && !(defined(ZTS) && defined(ZEND_WIN32)) && !(defined(ZTS) && defined(NETWARE)) && !(defined(ZTS) && defined(HPUX)) && !defined(DARWIN)
# define ZEND_ALLOCA_MAX_SIZE (32 * 1024)
# define ALLOCA_FLAG(name) \
@@ -286,7 +274,7 @@ static const char long_min_digits[] = "9223372036854775808";
#define INTERNAL_FUNCTION_PARAMETERS int ht, zval *return_value, zval **return_value_ptr, zval *this_ptr, int return_value_used TSRMLS_DC
#define INTERNAL_FUNCTION_PARAM_PASSTHRU ht, return_value, return_value_ptr, this_ptr, return_value_used TSRMLS_CC
#if defined(__GNUC__) && !defined(__INTEL_COMPILER) && !defined(DARWIN) && !defined(__hpux) && !defined(_AIX) && !defined(__osf__)
#if defined(__GNUC__) && __GNUC__ >= 3 && !defined(__INTEL_COMPILER) && !defined(DARWIN) && !defined(__hpux) && !defined(_AIX) && !defined(__osf__)
void zend_error_noreturn(int type, const char *format, ...) __attribute__ ((noreturn));
#else
# define zend_error_noreturn zend_error
@@ -361,7 +349,12 @@ struct _zval_struct {
#define Z_SET_ISREF_TO(z, isref) Z_SET_ISREF_TO_P(&(z), isref)
#if defined(__GNUC__)
#if __GNUC__ >= 3
#define zend_always_inline inline __attribute__((always_inline))
#else
#define zend_always_inline inline
#endif
#elif defined(_MSC_VER)
#define zend_always_inline __forceinline
#else
+30 -10
View File
@@ -313,6 +313,7 @@ static char *zend_parse_arg_impl(int arg_num, zval **arg, va_list *va, char **sp
switch (c) {
case 'l':
case 'L':
{
long *p = va_arg(*va, long *);
switch (Z_TYPE_PP(arg)) {
@@ -324,14 +325,33 @@ static char *zend_parse_arg_impl(int arg_num, zval **arg, va_list *va, char **sp
if ((type = is_numeric_string(Z_STRVAL_PP(arg), Z_STRLEN_PP(arg), p, &d, -1)) == 0) {
return "long";
} else if (type == IS_DOUBLE) {
*p = (long) d;
if (c == 'L') {
if (d > LONG_MAX) {
*p = LONG_MAX;
break;
} else if (d < LONG_MIN) {
*p = LONG_MIN;
break;
}
}
*p = zend_dval_to_lval(d);
}
}
break;
case IS_DOUBLE:
if (c == 'L') {
if (Z_DVAL_PP(arg) > LONG_MAX) {
*p = LONG_MAX;
break;
} else if (Z_DVAL_PP(arg) < LONG_MIN) {
*p = LONG_MIN;
break;
}
}
case IS_NULL:
case IS_LONG:
case IS_DOUBLE:
case IS_BOOL:
convert_to_long_ex(arg);
*p = Z_LVAL_PP(arg);
@@ -1018,13 +1038,13 @@ ZEND_API void zend_update_class_constants(zend_class_entry *class_type TSRMLS_DC
Z_SET_ISREF_PP(q);
zend_hash_add(CE_STATIC_MEMBERS(class_type), str_index, str_length, (void**)q, sizeof(zval*), NULL);
} else {
zval *q;
zval *r;
ALLOC_ZVAL(q);
*q = **p;
INIT_PZVAL(q);
zval_copy_ctor(q);
zend_hash_add(CE_STATIC_MEMBERS(class_type), str_index, str_length, (void**)&q, sizeof(zval*), NULL);
ALLOC_ZVAL(r);
*r = **p;
INIT_PZVAL(r);
zval_copy_ctor(r);
zend_hash_add(CE_STATIC_MEMBERS(class_type), str_index, str_length, (void**)&r, sizeof(zval*), NULL);
}
zend_hash_move_forward_ex(&class_type->default_static_members, &pos);
}
@@ -2094,7 +2114,7 @@ void module_destructor(zend_module_entry *module) /* {{{ */
zend_unregister_functions(module->functions, -1, NULL TSRMLS_CC);
}
#if HAVE_LIBDL || defined(HAVE_MACH_O_DYLD_H)
#if HAVE_LIBDL
#if !(defined(NETWARE) && defined(APACHE_1_BUILD))
if (module->handle) {
DL_UNLOAD(module->handle);
@@ -2499,7 +2519,7 @@ static int zend_is_callable_check_func(int check_flags, zval *callable, zend_fca
}
} else {
get_function_via_handler:
if (fcc->object_ptr) {
if (fcc->object_ptr && fcc->calling_scope == ce_org) {
if (Z_OBJ_HT_P(fcc->object_ptr)->get_method) {
fcc->function_handler = Z_OBJ_HT_P(fcc->object_ptr)->get_method(&fcc->object_ptr, mname, mlen TSRMLS_CC);
if (fcc->function_handler) {
+1 -1
View File
@@ -90,7 +90,7 @@ typedef struct _zend_fcall_info_cache {
#define ZEND_NS_RAW_FENTRY(ns, zend_name, name, arg_info, flags) ZEND_RAW_FENTRY(ZEND_NS_NAME(ns, zend_name), name, arg_info, flags)
#define ZEND_NS_RAW_NAMED_FE(ns, zend_name, name, arg_info) ZEND_NS_RAW_FENTRY(ns, #zend_name, name, arg_info, 0)
#define ZEND_NS_NAMED_FE(ns, zend_name, name, arg_info)
#define ZEND_NS_NAMED_FE(ns, zend_name, name, arg_info) ZEND_NS_FENTRY(ns, #zend_name, name, arg_info, 0)
#define ZEND_NS_FE(ns, name, arg_info) ZEND_NS_FENTRY(ns, name, ZEND_FN(name), arg_info, 0)
#define ZEND_NS_DEP_FE(ns, name, arg_info) ZEND_NS_FENTRY(ns, name, ZEND_FN(name), arg_info, ZEND_ACC_DEPRECATED)
#define ZEND_NS_FALIAS(ns, name, alias, arg_info) ZEND_NS_FENTRY(ns, name, ZEND_FN(alias), arg_info, 0)
+11 -18
View File
@@ -512,20 +512,7 @@ static unsigned int _zend_mm_cookie = 0;
/* optimized access */
#define ZEND_MM_FREE_BLOCK_SIZE(b) (b)->info._size
#ifndef ZEND_MM_ALIGNMENT
# define ZEND_MM_ALIGNMENT 8
# define ZEND_MM_ALIGNMENT_LOG2 3
#elif ZEND_MM_ALIGNMENT < 4
# undef ZEND_MM_ALIGNMENT
# undef ZEND_MM_ALIGNMENT_LOG2
# define ZEND_MM_ALIGNMENT 4
# define ZEND_MM_ALIGNMENT_LOG2 2
#endif
#define ZEND_MM_ALIGNMENT_MASK ~(ZEND_MM_ALIGNMENT-1)
/* Aligned header size */
#define ZEND_MM_ALIGNED_SIZE(size) ((size + ZEND_MM_ALIGNMENT - 1) & ZEND_MM_ALIGNMENT_MASK)
#define ZEND_MM_ALIGNED_HEADER_SIZE ZEND_MM_ALIGNED_SIZE(sizeof(zend_mm_block))
#define ZEND_MM_ALIGNED_FREE_HEADER_SIZE ZEND_MM_ALIGNED_SIZE(sizeof(zend_mm_small_free_block))
#define ZEND_MM_MIN_ALLOC_BLOCK_SIZE ZEND_MM_ALIGNED_SIZE(ZEND_MM_ALIGNED_HEADER_SIZE + END_MAGIC_SIZE)
@@ -709,12 +696,14 @@ static inline unsigned int zend_mm_low_bit(size_t _size)
unsigned int n;
unsigned int index = 0;
do {
n = offset[_size & 15];
n = offset[_size & 15];
while (n == 4) {
_size >>= 4;
index += n;
} while (n == 4);
return index;
n = offset[_size & 15];
}
return index + n;
#endif
}
@@ -2496,7 +2485,11 @@ ZEND_API size_t zend_memory_usage(int real_usage TSRMLS_DC)
if (real_usage) {
return AG(mm_heap)->real_size;
} else {
return AG(mm_heap)->size;
size_t usage = AG(mm_heap)->size;
#if ZEND_MM_CACHE
usage -= AG(mm_heap)->cached;
#endif
return usage;
}
}
+15 -1
View File
@@ -27,6 +27,20 @@
#include "../TSRM/TSRM.h"
#include "zend.h"
#ifndef ZEND_MM_ALIGNMENT
# define ZEND_MM_ALIGNMENT 8
# define ZEND_MM_ALIGNMENT_LOG2 3
#elif ZEND_MM_ALIGNMENT < 4
# undef ZEND_MM_ALIGNMENT
# undef ZEND_MM_ALIGNMENT_LOG2
# define ZEND_MM_ALIGNMENT 4
# define ZEND_MM_ALIGNMENT_LOG2 2
#endif
#define ZEND_MM_ALIGNMENT_MASK ~(ZEND_MM_ALIGNMENT-1)
#define ZEND_MM_ALIGNED_SIZE(size) (((size) + ZEND_MM_ALIGNMENT - 1) & ZEND_MM_ALIGNMENT_MASK)
typedef struct _zend_leak_info {
void *addr;
size_t size;
@@ -89,7 +103,7 @@ inline static void * __zend_malloc(size_t len)
inline static void * __zend_calloc(size_t nmemb, size_t len)
{
void *tmp = _safe_malloc(nmemb, len, 0);
memset(tmp, 0, len);
memset(tmp, 0, nmemb * len);
return tmp;
}
+68 -24
View File
@@ -629,6 +629,7 @@ 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;
@@ -638,6 +639,34 @@ ZEND_FUNCTION(define)
case_sensitive = 0;
}
/* 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);
}
repeat:
switch (Z_TYPE_P(val)) {
case IS_LONG:
@@ -718,7 +747,7 @@ ZEND_FUNCTION(get_class)
zend_uint name_len = 0;
int dup;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|o", &obj) == FAILURE) {
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|o!", &obj) == FAILURE) {
RETURN_FALSE;
}
@@ -890,27 +919,22 @@ static void add_class_vars(zend_class_entry *ce, HashTable *properties, zval *re
while (zend_hash_get_current_data_ex(properties, (void **) &prop, &pos) == SUCCESS) {
char *key, *class_name, *prop_name;
uint key_len;
ulong num_index, h;
ulong num_index;
int prop_name_len = 0;
zval *prop_copy;
zend_property_info *property_info;
zval zprop_name;
zend_hash_get_current_key_ex(properties, &key, &key_len, &num_index, 0, &pos);
zend_hash_move_forward_ex(properties, &pos);
zend_unmangle_property_name(key, key_len-1, &class_name, &prop_name);
prop_name_len = strlen(prop_name);
h = zend_get_hash_value(prop_name, prop_name_len+1);
if (zend_hash_quick_find(&ce->properties_info, prop_name, prop_name_len+1, h, (void **) &property_info) == FAILURE) {
continue;
}
if (property_info->flags & ZEND_ACC_SHADOW) {
continue;
} else if ((property_info->flags & ZEND_ACC_PRIVATE) && EG(scope) != ce) {
continue;
} else if ((property_info->flags & ZEND_ACC_PROTECTED) && zend_check_protected(ce, EG(scope)) == 0) {
ZVAL_STRINGL(&zprop_name, prop_name, prop_name_len, 0);
property_info = zend_get_property_info(ce, &zprop_name, 1 TSRMLS_CC);
if (!property_info || property_info == &EG(std_property_info)) {
continue;
}
@@ -1678,7 +1702,7 @@ ZEND_FUNCTION(get_defined_vars)
ZEND_FUNCTION(create_function)
{
char *eval_code, *function_name, *function_args, *function_code;
int function_name_length, function_args_len, function_code_len;
int eval_code_length, function_name_length, function_args_len, function_code_len;
int retval;
char *eval_name;
@@ -1686,10 +1710,29 @@ ZEND_FUNCTION(create_function)
return;
}
zend_spprintf(&eval_code, 0, "function " LAMBDA_TEMP_FUNCNAME "(%s){%s}", function_args, function_code);
eval_code = (char *) emalloc(sizeof("function " LAMBDA_TEMP_FUNCNAME)
+function_args_len
+2 /* for the args parentheses */
+2 /* for the curly braces */
+function_code_len);
eval_code_length = sizeof("function " LAMBDA_TEMP_FUNCNAME "(") - 1;
memcpy(eval_code, "function " LAMBDA_TEMP_FUNCNAME "(", eval_code_length);
memcpy(eval_code + eval_code_length, function_args, function_args_len);
eval_code_length += function_args_len;
eval_code[eval_code_length++] = ')';
eval_code[eval_code_length++] = '{';
memcpy(eval_code + eval_code_length, function_code, function_code_len);
eval_code_length += function_code_len;
eval_code[eval_code_length++] = '}';
eval_code[eval_code_length] = '\0';
eval_name = zend_make_compiled_string_description("runtime-created function" TSRMLS_CC);
retval = zend_eval_string(eval_code, NULL, eval_name TSRMLS_CC);
retval = zend_eval_stringl(eval_code, eval_code_length, NULL, eval_name TSRMLS_CC);
efree(eval_code);
efree(eval_name);
@@ -1704,14 +1747,15 @@ ZEND_FUNCTION(create_function)
function_add_ref(&new_function);
function_name = (char *) emalloc(sizeof("0lambda_")+MAX_LENGTH_OF_LONG);
function_name[0] = '\0';
do {
sprintf(function_name, "%clambda_%d", 0, ++EG(lambda_count));
function_name_length = strlen(function_name+1)+1;
function_name_length = 1 + sprintf(function_name + 1, "lambda_%d", ++EG(lambda_count));
} while (zend_hash_add(EG(function_table), function_name, function_name_length+1, &new_function, sizeof(zend_function), NULL)==FAILURE);
zend_hash_del(EG(function_table), LAMBDA_TEMP_FUNCNAME, sizeof(LAMBDA_TEMP_FUNCNAME));
RETURN_STRINGL(function_name, function_name_length, 0);
} else {
zend_hash_del(EG(function_table), LAMBDA_TEMP_FUNCNAME, sizeof(LAMBDA_TEMP_FUNCNAME));
RETURN_FALSE;
}
}
@@ -1805,19 +1849,19 @@ ZEND_FUNCTION(get_loaded_extensions)
/* }}} */
/* {{{ proto array get_defined_constants([mixed categorize])
/* {{{ proto array get_defined_constants([bool categorize])
Return an array containing the names and values of all defined constants */
ZEND_FUNCTION(get_defined_constants)
{
int argc = ZEND_NUM_ARGS();
if (argc != 0 && argc != 1) {
ZEND_WRONG_PARAM_COUNT();
zend_bool categorize = 0;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|b", &categorize) == FAILURE) {
return;
}
array_init(return_value);
if (argc) {
if (categorize) {
HashPosition pos;
zend_constant *val;
int module_number;
+43 -32
View File
@@ -37,6 +37,7 @@
typedef struct _zend_closure {
zend_object std;
zend_function func;
HashTable *debug_info;
} zend_closure;
/* non-static since it needs to be referenced */
@@ -179,6 +180,11 @@ static void zend_closure_free_storage(void *object TSRMLS_DC) /* {{{ */
destroy_op_array(&closure->func.op_array TSRMLS_CC);
}
if (closure->debug_info != NULL) {
zend_hash_destroy(closure->debug_info);
efree(closure->debug_info);
}
efree(closure);
}
/* }}} */
@@ -222,48 +228,53 @@ int zend_closure_get_closure(zval *obj, zend_class_entry **ce_ptr, zend_function
static HashTable *zend_closure_get_debug_info(zval *object, int *is_temp TSRMLS_DC) /* {{{ */
{
zend_closure *closure = (zend_closure *)zend_object_store_get_object(object TSRMLS_CC);
HashTable *rv;
zval *val;
struct _zend_arg_info *arg_info = closure->func.common.arg_info;
*is_temp = 1;
ALLOC_HASHTABLE(rv);
zend_hash_init(rv, 1, NULL, ZVAL_PTR_DTOR, 0);
if (closure->func.type == ZEND_USER_FUNCTION && closure->func.op_array.static_variables) {
HashTable *static_variables = closure->func.op_array.static_variables;
MAKE_STD_ZVAL(val);
array_init(val);
zend_hash_copy(Z_ARRVAL_P(val), static_variables, (copy_ctor_func_t)zval_add_ref, NULL, sizeof(zval*));
zend_symtable_update(rv, "static", sizeof("static"), (void *) &val, sizeof(zval *), NULL);
*is_temp = 0;
if (closure->debug_info == NULL) {
ALLOC_HASHTABLE(closure->debug_info);
zend_hash_init(closure->debug_info, 1, NULL, ZVAL_PTR_DTOR, 0);
}
if (closure->debug_info->nApplyCount == 0) {
if (closure->func.type == ZEND_USER_FUNCTION && closure->func.op_array.static_variables) {
HashTable *static_variables = closure->func.op_array.static_variables;
MAKE_STD_ZVAL(val);
array_init(val);
zend_hash_copy(Z_ARRVAL_P(val), static_variables, (copy_ctor_func_t)zval_add_ref, NULL, sizeof(zval*));
zend_symtable_update(closure->debug_info, "static", sizeof("static"), (void *) &val, sizeof(zval *), NULL);
}
if (arg_info) {
zend_uint i, required = closure->func.common.required_num_args;
if (arg_info) {
zend_uint i, required = closure->func.common.required_num_args;
MAKE_STD_ZVAL(val);
array_init(val);
MAKE_STD_ZVAL(val);
array_init(val);
for (i = 0; i < closure->func.common.num_args; i++) {
char *name, *info;
int name_len, info_len;
if (arg_info->name) {
name_len = zend_spprintf(&name, 0, "%s$%s",
arg_info->pass_by_reference ? "&" : "",
arg_info->name);
} else {
name_len = zend_spprintf(&name, 0, "%s$param%d",
arg_info->pass_by_reference ? "&" : "",
i + 1);
for (i = 0; i < closure->func.common.num_args; i++) {
char *name, *info;
int name_len, info_len;
if (arg_info->name) {
name_len = zend_spprintf(&name, 0, "%s$%s",
arg_info->pass_by_reference ? "&" : "",
arg_info->name);
} else {
name_len = zend_spprintf(&name, 0, "%s$param%d",
arg_info->pass_by_reference ? "&" : "",
i + 1);
}
info_len = zend_spprintf(&info, 0, "%s",
i >= required ? "<optional>" : "<required>");
add_assoc_stringl_ex(val, name, name_len + 1, info, info_len, 0);
efree(name);
arg_info++;
}
info_len = zend_spprintf(&info, 0, "%s",
i >= required ? "<optional>" : "<required>");
add_assoc_stringl_ex(val, name, name_len + 1, info, info_len, 0);
efree(name);
arg_info++;
zend_symtable_update(closure->debug_info, "parameter", sizeof("parameter"), (void *) &val, sizeof(zval *), NULL);
}
zend_symtable_update(rv, "parameter", sizeof("parameter"), (void *) &val, sizeof(zval *), NULL);
}
return rv;
return closure->debug_info;
}
/* }}} */
+369 -319
View File
File diff suppressed because it is too large. Load diff
+1 -1
View File
@@ -582,7 +582,7 @@ void init_op(zend_op *op TSRMLS_DC);
int get_next_op_number(zend_op_array *op_array);
int print_class(zend_class_entry *class_entry TSRMLS_DC);
void print_op_array(zend_op_array *op_array, int optimizations);
int pass_two(zend_op_array *op_array TSRMLS_DC);
ZEND_API int pass_two(zend_op_array *op_array TSRMLS_DC);
zend_brk_cont_element *get_next_brk_cont_element(zend_op_array *op_array);
void zend_do_first_catch(znode *open_parentheses TSRMLS_DC);
void zend_initialize_try_catch_element(const znode *try_token TSRMLS_DC);
+14 -2
View File
@@ -487,9 +487,14 @@ static int _build_trace_string(zval **frame TSRMLS_DC, int num_args, va_list arg
ZEND_METHOD(exception, getTraceAsString)
{
zval *trace;
char *res = estrdup(""), **str = &res, *s_tmp;
char *res, **str, *s_tmp;
int res_len = 0, *len = &res_len, num = 0;
DEFAULT_0_PARAMS;
res = estrdup("");
str = &res;
trace = zend_read_property(default_exception_ce, getThis(), "trace", sizeof("trace")-1, 1 TSRMLS_CC);
zend_hash_apply_with_arguments(Z_ARRVAL_P(trace) TSRMLS_CC, (apply_func_args_t)_build_trace_string, 3, str, len, &num);
@@ -508,6 +513,9 @@ ZEND_METHOD(exception, getTraceAsString)
ZEND_METHOD(exception, getPrevious)
{
zval *previous;
DEFAULT_0_PARAMS;
previous = zend_read_property(default_exception_ce, getThis(), "previous", sizeof("previous")-1, 1 TSRMLS_CC);
RETURN_ZVAL(previous, 1, 0);
}
@@ -529,10 +537,14 @@ int zend_spprintf(char **message, int max_len, char *format, ...) /* {{{ */
ZEND_METHOD(exception, __toString)
{
zval message, file, line, *trace, *exception;
char *str = estrndup("", 0), *prev_str;
char *str, *prev_str;
int len = 0;
zend_fcall_info fci;
zval fname;
DEFAULT_0_PARAMS;
str = estrndup("", 0);
exception = getThis();
ZVAL_STRINGL(&fname, "gettraceasstring", sizeof("gettraceasstring")-1, 1);
+2 -3
View File
@@ -823,10 +823,9 @@ fetch_string_dim:
}
}
break;
case IS_DOUBLE: {
DVAL_TO_LVAL(Z_DVAL_P(dim), index);
case IS_DOUBLE:
index = zend_dval_to_lval(Z_DVAL_P(dim));
goto num_index;
}
case IS_RESOURCE:
zend_error(E_STRICT, "Resource ID#%ld used as offset, casting to integer (%ld)", Z_LVAL_P(dim), Z_LVAL_P(dim));
/* Fall Through */
+74 -12
View File
@@ -73,7 +73,9 @@ static inline void safe_free_zval_ptr_rel(zval *p ZEND_FILE_LINE_DC ZEND_FILE_LI
ZEND_API int zend_lookup_class(const char *name, int name_length, zend_class_entry ***ce TSRMLS_DC);
ZEND_API int zend_lookup_class_ex(const char *name, int name_length, int use_autoload, zend_class_entry ***ce TSRMLS_DC);
ZEND_API int zend_eval_string(char *str, zval *retval_ptr, char *string_name TSRMLS_DC);
ZEND_API int zend_eval_stringl(char *str, int str_len, zval *retval_ptr, char *string_name TSRMLS_DC);
ZEND_API int zend_eval_string_ex(char *str, zval *retval_ptr, char *string_name, int handle_exceptions TSRMLS_DC);
ZEND_API int zend_eval_stringl_ex(char *str, int str_len, zval *retval_ptr, char *string_name, int handle_exceptions TSRMLS_DC);
static inline int i_zend_is_true(zval *op)
{
@@ -142,9 +144,11 @@ struct _zend_vm_stack {
void **top;
void **end;
zend_vm_stack prev;
void *elements[1];
};
#define ZEND_VM_STACK_ELEMETS(stack) \
((void**)(((char*)(stack)) + ZEND_MM_ALIGNED_SIZE(sizeof(struct _zend_vm_stack))))
#define ZEND_VM_STACK_GROW_IF_NEEDED(count) \
do { \
if (UNEXPECTED((count) > \
@@ -154,10 +158,10 @@ struct _zend_vm_stack {
} while (0)
static inline zend_vm_stack zend_vm_stack_new_page(int count) {
zend_vm_stack page = (zend_vm_stack)emalloc(sizeof(*page)+sizeof(page->elements[0])*(count-1));
zend_vm_stack page = (zend_vm_stack)emalloc(ZEND_MM_ALIGNED_SIZE(sizeof(*page)) + sizeof(void*) * count);
page->top = page->elements;
page->end = page->elements + count;
page->top = ZEND_VM_STACK_ELEMETS(page);
page->end = page->top + count;
page->prev = NULL;
return page;
}
@@ -205,7 +209,7 @@ static inline void *zend_vm_stack_pop(TSRMLS_D)
{
void *el = *(--EG(argument_stack)->top);
if (UNEXPECTED(EG(argument_stack)->top == EG(argument_stack)->elements)) {
if (UNEXPECTED(EG(argument_stack)->top == ZEND_VM_STACK_ELEMETS(EG(argument_stack)))) {
zend_vm_stack p = EG(argument_stack);
EG(argument_stack) = p->prev;
efree(p);
@@ -219,15 +223,32 @@ static inline void *zend_vm_stack_alloc(size_t size TSRMLS_DC)
size = (size + (sizeof(void*) - 1)) / sizeof(void*);
ZEND_VM_STACK_GROW_IF_NEEDED((int)size);
/* the following comparison must be optimized out at compile time */
if (ZEND_MM_ALIGNMENT > sizeof(void*)) {
int extra = (ZEND_MM_ALIGNMENT - ((zend_uintptr_t)EG(argument_stack)->top & (ZEND_MM_ALIGNMENT - 1))) / sizeof(void*);
if (UNEXPECTED(size + extra + ZEND_MM_ALIGNED_SIZE(sizeof(void*)) / sizeof(void*) >
EG(argument_stack)->end - EG(argument_stack)->top)) {
zend_vm_stack_extend(size TSRMLS_CC);
} else {
void **old_top = EG(argument_stack)->top;
EG(argument_stack)->top += extra;
/* store old top on the stack */
*EG(argument_stack)->top = (void*)old_top;
EG(argument_stack)->top += ZEND_MM_ALIGNED_SIZE(sizeof(void*)) / sizeof(void*);
}
} else {
ZEND_VM_STACK_GROW_IF_NEEDED((int)size);
}
ret = (void*)EG(argument_stack)->top;
EG(argument_stack)->top += size;
return ret;
}
static inline void zend_vm_stack_free(void *ptr TSRMLS_DC)
static inline void zend_vm_stack_free_int(void *ptr TSRMLS_DC)
{
if (UNEXPECTED(EG(argument_stack)->elements == (void**)ptr)) {
if (UNEXPECTED(ZEND_VM_STACK_ELEMETS(EG(argument_stack)) == (void**)ptr)) {
zend_vm_stack p = EG(argument_stack);
EG(argument_stack) = p->prev;
@@ -237,10 +258,28 @@ static inline void zend_vm_stack_free(void *ptr TSRMLS_DC)
}
}
static inline void zend_vm_stack_free(void *ptr TSRMLS_DC)
{
if (UNEXPECTED(ZEND_VM_STACK_ELEMETS(EG(argument_stack)) == (void**)ptr)) {
zend_vm_stack p = EG(argument_stack);
EG(argument_stack) = p->prev;
efree(p);
} else {
/* the following comparison must be optimized out at compile time */
if (ZEND_MM_ALIGNMENT > sizeof(void*)) {
ptr = (void*)(((char*)ptr) - ZEND_MM_ALIGNED_SIZE(sizeof(void*)));
EG(argument_stack)->top = *(void***)ptr;
} else {
EG(argument_stack)->top = (void**)ptr;
}
}
}
static inline void** zend_vm_stack_push_args(int count TSRMLS_DC)
{
if (UNEXPECTED(EG(argument_stack)->top - EG(argument_stack)->elements < count) ||
if (UNEXPECTED(EG(argument_stack)->top - ZEND_VM_STACK_ELEMETS(EG(argument_stack)) < count) ||
UNEXPECTED(EG(argument_stack)->top == EG(argument_stack)->end)) {
zend_vm_stack p = EG(argument_stack);
@@ -251,14 +290,14 @@ static inline void** zend_vm_stack_push_args(int count TSRMLS_DC)
while (count-- > 0) {
void *data = *(--p->top);
if (UNEXPECTED(p->top == p->elements)) {
if (UNEXPECTED(p->top == ZEND_VM_STACK_ELEMETS(p))) {
zend_vm_stack r = p;
EG(argument_stack)->prev = p->prev;
p = p->prev;
efree(r);
}
*(EG(argument_stack)->elements + count) = data;
*(ZEND_VM_STACK_ELEMETS(EG(argument_stack)) + count) = data;
}
return EG(argument_stack)->top++;
}
@@ -276,7 +315,7 @@ static inline void zend_vm_stack_clear_multiple(TSRMLS_D)
*p = NULL;
zval_ptr_dtor(&q);
}
zend_vm_stack_free(p TSRMLS_CC);
zend_vm_stack_free_int(p TSRMLS_CC);
}
static inline zval** zend_vm_stack_get_arg(int requested_arg TSRMLS_DC)
@@ -290,6 +329,27 @@ static inline zval** zend_vm_stack_get_arg(int requested_arg TSRMLS_DC)
return (zval**)p - arg_count + requested_arg - 1;
}
static inline void zend_arg_types_stack_2_pop(zend_ptr_stack *stack, zval **object, zend_function **fbc)
{
void *a, *b;
zend_ptr_stack_2_pop(stack, &a, &b);
*object = (zval *) a;
*fbc = (zend_function *) b;
}
static inline void zend_arg_types_stack_3_pop(zend_ptr_stack *stack, zend_class_entry **called_scope, zval **object, zend_function **fbc)
{
void *a, *b, *c;
zend_ptr_stack_3_pop(stack, &a, &b, &c);
*called_scope = (zend_class_entry *) a;
*object = (zval *) b;
*fbc = (zend_function *) c;
}
void execute_new_code(TSRMLS_D);
@@ -328,6 +388,8 @@ ZEND_API zval** zend_get_compiled_variable_value(const zend_execute_data *execut
#define ZEND_USER_OPCODE_CONTINUE 0 /* execute next opcode */
#define ZEND_USER_OPCODE_RETURN 1 /* exit from executor (return from function) */
#define ZEND_USER_OPCODE_DISPATCH 2 /* call original opcode handler */
#define ZEND_USER_OPCODE_ENTER 3 /* enter into new op_array without recursion */
#define ZEND_USER_OPCODE_LEAVE 4 /* return to calling op_array within the same executor */
#define ZEND_USER_OPCODE_DISPATCH_TO 0x100 /* call original handler of returned opcode */
+32 -8
View File
@@ -662,7 +662,7 @@ ZEND_API int zval_update_constant_ex(zval **pp, void *arg, zend_class_entry *sco
ret = zend_hash_update_current_key_ex(Z_ARRVAL_P(p), HASH_KEY_IS_LONG, NULL, 0, Z_LVAL(const_value), HASH_UPDATE_KEY_IF_BEFORE, NULL);
break;
case IS_DOUBLE:
ret = zend_hash_update_current_key_ex(Z_ARRVAL_P(p), HASH_KEY_IS_LONG, NULL, 0, (long)Z_DVAL(const_value), HASH_UPDATE_KEY_IF_BEFORE, NULL);
ret = zend_hash_update_current_key_ex(Z_ARRVAL_P(p), HASH_KEY_IS_LONG, NULL, 0, zend_dval_to_lval(Z_DVAL(const_value)), HASH_UPDATE_KEY_IF_BEFORE, NULL);
break;
case IS_NULL:
ret = zend_hash_update_current_key_ex(Z_ARRVAL_P(p), HASH_KEY_IS_STRING, "", 1, 0, HASH_UPDATE_KEY_IF_BEFORE, NULL);
@@ -837,6 +837,12 @@ int zend_call_function(zend_fcall_info *fci, zend_fcall_info_cache *fci_cache TS
for (i=0; i<fci->param_count; i++) {
zval *param;
if(EX(function_state).function->type == ZEND_INTERNAL_FUNCTION
&& !ARG_SHOULD_BE_SENT_BY_REF(EX(function_state).function, i + 1)
&& PZVAL_IS_REF(*fci->params[i])) {
SEPARATE_ZVAL(fci->params[i]);
}
if (ARG_SHOULD_BE_SENT_BY_REF(EX(function_state).function, i + 1)
&& !PZVAL_IS_REF(*fci->params[i])) {
@@ -1116,7 +1122,7 @@ ZEND_API int zend_lookup_class(const char *name, int name_length, zend_class_ent
}
/* }}} */
ZEND_API int zend_eval_string(char *str, zval *retval_ptr, char *string_name TSRMLS_DC) /* {{{ */
ZEND_API int zend_eval_stringl(char *str, int str_len, zval *retval_ptr, char *string_name TSRMLS_DC) /* {{{ */
{
zval pv;
zend_op_array *new_op_array;
@@ -1125,15 +1131,14 @@ ZEND_API int zend_eval_string(char *str, zval *retval_ptr, char *string_name TSR
int retval;
if (retval_ptr) {
int l = strlen(str);
Z_STRLEN(pv) = l + sizeof("return ;") - 1;
Z_STRLEN(pv) = str_len + sizeof("return ;") - 1;
Z_STRVAL(pv) = emalloc(Z_STRLEN(pv) + 1);
memcpy(Z_STRVAL(pv), "return ", sizeof("return ") - 1);
memcpy(Z_STRVAL(pv) + sizeof("return ") - 1, str, l);
memcpy(Z_STRVAL(pv) + sizeof("return ") - 1, str, str_len);
Z_STRVAL(pv)[Z_STRLEN(pv) - 1] = ';';
Z_STRVAL(pv)[Z_STRLEN(pv)] = '\0';
} else {
Z_STRLEN(pv) = strlen(str);
Z_STRLEN(pv) = str_len;
Z_STRVAL(pv) = str;
}
Z_TYPE(pv) = IS_STRING;
@@ -1149,6 +1154,7 @@ ZEND_API int zend_eval_string(char *str, zval *retval_ptr, char *string_name TSR
zval *local_retval_ptr=NULL;
zval **original_return_value_ptr_ptr = EG(return_value_ptr_ptr);
zend_op **original_opline_ptr = EG(opline_ptr);
int orig_interactive = CG(interactive);
EG(return_value_ptr_ptr) = &local_retval_ptr;
EG(active_op_array) = new_op_array;
@@ -1156,9 +1162,11 @@ ZEND_API int zend_eval_string(char *str, zval *retval_ptr, char *string_name TSR
if (!EG(active_symbol_table)) {
zend_rebuild_symbol_table(TSRMLS_C);
}
CG(interactive) = 0;
zend_execute(new_op_array TSRMLS_CC);
CG(interactive) = orig_interactive;
if (local_retval_ptr) {
if (retval_ptr) {
COPY_PZVAL_TO_ZVAL(*retval_ptr, local_retval_ptr);
@@ -1188,11 +1196,17 @@ ZEND_API int zend_eval_string(char *str, zval *retval_ptr, char *string_name TSR
}
/* }}} */
ZEND_API int zend_eval_string_ex(char *str, zval *retval_ptr, char *string_name, int handle_exceptions TSRMLS_DC) /* {{{ */
ZEND_API int zend_eval_string(char *str, zval *retval_ptr, char *string_name TSRMLS_DC) /* {{{ */
{
return zend_eval_stringl(str, strlen(str), retval_ptr, string_name TSRMLS_CC);
}
/* }}} */
ZEND_API int zend_eval_stringl_ex(char *str, int str_len, zval *retval_ptr, char *string_name, int handle_exceptions TSRMLS_DC) /* {{{ */
{
int result;
result = zend_eval_string(str, retval_ptr, string_name TSRMLS_CC);
result = zend_eval_stringl(str, str_len, retval_ptr, string_name TSRMLS_CC);
if (handle_exceptions && EG(exception)) {
zend_exception_error(EG(exception), E_ERROR TSRMLS_CC);
result = FAILURE;
@@ -1201,10 +1215,17 @@ ZEND_API int zend_eval_string_ex(char *str, zval *retval_ptr, char *string_name,
}
/* }}} */
ZEND_API int zend_eval_string_ex(char *str, zval *retval_ptr, char *string_name, int handle_exceptions TSRMLS_DC) /* {{{ */
{
return zend_eval_stringl_ex(str, strlen(str), retval_ptr, string_name, handle_exceptions TSRMLS_CC);
}
/* }}} */
void execute_new_code(TSRMLS_D) /* {{{ */
{
zend_op *opline, *end;
zend_op *ret_opline;
int orig_interactive;
if (!(CG(active_op_array)->fn_flags & ZEND_ACC_INTERACTIVE)
|| CG(active_op_array)->backpatch_count>0
@@ -1260,7 +1281,10 @@ void execute_new_code(TSRMLS_D) /* {{{ */
EG(return_value_ptr_ptr) = NULL;
EG(active_op_array) = CG(active_op_array);
orig_interactive = CG(interactive);
CG(interactive) = 0;
zend_execute(CG(active_op_array) TSRMLS_CC);
CG(interactive) = orig_interactive;
if (EG(exception)) {
zend_exception_error(EG(exception), E_ERROR TSRMLS_CC);
-61
View File
@@ -217,67 +217,6 @@ ZEND_API zend_extension *zend_get_extension(const char *extension_name)
return NULL;
}
/*
* Support for dynamic loading of MH_BUNDLEs on Darwin / Mac OS X
*
*/
#if HAVE_MACH_O_DYLD_H
void *zend_mh_bundle_load(char* bundle_path)
{
NSObjectFileImage bundle_image;
NSModule bundle_handle;
NSSymbol bundle_init_nssymbol;
void (*bundle_init)(void);
if (NSCreateObjectFileImageFromFile(bundle_path, &bundle_image) != NSObjectFileImageSuccess) {
return NULL;
}
bundle_handle = NSLinkModule(bundle_image, bundle_path, NSLINKMODULE_OPTION_NONE);
NSDestroyObjectFileImage(bundle_image);
/* call the init function of the bundle */
bundle_init_nssymbol = NSLookupSymbolInModule(bundle_handle, "__init");
if (bundle_init_nssymbol != NULL) {
bundle_init = NSAddressOfSymbol(bundle_init_nssymbol);
bundle_init();
}
return bundle_handle;
}
int zend_mh_bundle_unload(void *bundle_handle)
{
NSSymbol bundle_fini_nssymbol;
void (*bundle_fini)(void);
/* call the fini function of the bundle */
bundle_fini_nssymbol = NSLookupSymbolInModule(bundle_handle, "__fini");
if (bundle_fini_nssymbol != NULL) {
bundle_fini = NSAddressOfSymbol(bundle_fini_nssymbol);
bundle_fini();
}
return (int) NSUnLinkModule(bundle_handle, NULL);
}
void *zend_mh_bundle_symbol(void *bundle_handle, const char *symbol_name)
{
NSSymbol symbol;
symbol = NSLookupSymbolInModule(bundle_handle, symbol_name);
return NSAddressOfSymbol(symbol);
}
const char *zend_mh_bundle_error(void)
{
/* Witness the state of the art error reporting */
return NULL;
}
#endif /* HAVE_MACH_O_DYLD_H */
/*
* Local variables:
* tab-width: 4
+1 -1
View File
@@ -28,7 +28,7 @@
/* The first number is the engine version and the rest is the date.
* This way engine 2/3 API no. is always greater than engine 1 API no..
*/
#define ZEND_EXTENSION_API_NO 220090115
#define ZEND_EXTENSION_API_NO 220090626
typedef struct _zend_extension_version_info {
int zend_extension_api_no;
+2 -2
View File
@@ -376,7 +376,7 @@ ZEND_API int _zend_hash_index_update_or_next_insert(HashTable *ht, ulong h, void
UPDATE_DATA(ht, p, pData, nDataSize);
HANDLE_UNBLOCK_INTERRUPTIONS();
if ((long)h >= (long)ht->nNextFreeElement) {
ht->nNextFreeElement = h + 1;
ht->nNextFreeElement = h < LONG_MAX ? h + 1 : LONG_MAX;
}
if (pDest) {
*pDest = p->pData;
@@ -404,7 +404,7 @@ ZEND_API int _zend_hash_index_update_or_next_insert(HashTable *ht, ulong h, void
HANDLE_UNBLOCK_INTERRUPTIONS();
if ((long)h >= (long)ht->nNextFreeElement) {
ht->nNextFreeElement = h + 1;
ht->nNextFreeElement = h < LONG_MAX ? h + 1 : LONG_MAX;
}
ht->nNumOfElements++;
ZEND_HASH_IF_FULL_DO_RESIZE(ht);
+6 -3
View File
@@ -367,11 +367,14 @@ static inline int zend_symtable_exists(HashTable *ht, const char *arKey, uint nK
return zend_hash_exists(ht, arKey, nKeyLength);
}
static inline int zend_symtable_update_current_key(HashTable *ht, const char *arKey, uint nKeyLength, int mode)
static inline int zend_symtable_update_current_key_ex(HashTable *ht, const char *arKey, uint nKeyLength, int mode, HashPosition *pos)
{
ZEND_HANDLE_NUMERIC(arKey, nKeyLength, zend_hash_update_current_key_ex(ht, HASH_KEY_IS_LONG, NULL, 0, idx, mode, NULL));
return zend_hash_update_current_key_ex(ht, HASH_KEY_IS_STRING, arKey, nKeyLength, 0, mode, NULL);
ZEND_HANDLE_NUMERIC(arKey, nKeyLength, zend_hash_update_current_key_ex(ht, HASH_KEY_IS_LONG, NULL, 0, idx, mode, pos));
return zend_hash_update_current_key_ex(ht, HASH_KEY_IS_STRING, arKey, nKeyLength, 0, mode, pos);
}
#define zend_symtable_update_current_key(ht,arKey,nKeyLength,mode) \
zend_symtable_update_current_key_ex(ht, arKey, nKeyLength, mode, NULL)
#endif /* ZEND_HASH_H */
+12 -3
View File
@@ -46,15 +46,21 @@ static int zend_remove_ini_entries(zend_ini_entry *ini_entry, int *module_number
static int zend_restore_ini_entry_cb(zend_ini_entry *ini_entry, int stage TSRMLS_DC) /* {{{ */
{
int result = FAILURE;
if (ini_entry->modified) {
if (ini_entry->on_modify) {
zend_try {
/* even if on_modify bails out, we have to continue on with restoring,
since there can be allocated variables that would be freed on MM shutdown
and would lead to memory corruption later ini entry is modified again */
ini_entry->on_modify(ini_entry, ini_entry->orig_value, ini_entry->orig_value_length, ini_entry->mh_arg1, ini_entry->mh_arg2, ini_entry->mh_arg3, stage TSRMLS_CC);
result = ini_entry->on_modify(ini_entry, ini_entry->orig_value, ini_entry->orig_value_length, ini_entry->mh_arg1, ini_entry->mh_arg2, ini_entry->mh_arg3, stage TSRMLS_CC);
} zend_end_try();
}
if (stage == ZEND_INI_STAGE_RUNTIME && result == FAILURE) {
/* runtime failure is OK */
return 1;
}
if (ini_entry->value != ini_entry->orig_value) {
efree(ini_entry->value);
}
@@ -309,8 +315,11 @@ ZEND_API int zend_restore_ini_entry(char *name, uint name_length, int stage) /*
}
if (EG(modified_ini_directives)) {
zend_restore_ini_entry_cb(ini_entry, stage TSRMLS_CC);
zend_hash_del(EG(modified_ini_directives), name, name_length);
if (zend_restore_ini_entry_cb(ini_entry, stage TSRMLS_CC) == 0) {
zend_hash_del(EG(modified_ini_directives), name, name_length);
} else {
return FAILURE;
}
}
return SUCCESS;
+2338 -2347
View File
File diff suppressed because it is too large. Load diff
+68 -24
View File
@@ -54,7 +54,9 @@
#define YYSTATE YYGETCONDITION()
#define yytext ((char*)SCNG(yy_text))
#define yyleng SCNG(yy_leng)
#define yyless(x) YYCURSOR = yytext + x
#define yyless(x) do { YYCURSOR = (unsigned char*)yytext + x; \
yyleng = (unsigned int)x; } while(0)
/* #define yymore() goto yymore_restart */
/* perform sanity check. If this message is triggered you should
@@ -156,12 +158,28 @@ static void yy_scan_buffer(char *str, unsigned int len TSRMLS_DC)
/* {{{ init_ini_scanner()
*/
static void init_ini_scanner(TSRMLS_D)
static int init_ini_scanner(int scanner_mode, zend_file_handle *fh TSRMLS_DC)
{
/* Sanity check */
if (scanner_mode != ZEND_INI_SCANNER_NORMAL && scanner_mode != ZEND_INI_SCANNER_RAW) {
zend_error(E_WARNING, "Invalid scanner mode");
return FAILURE;
}
SCNG(lineno) = 1;
SCNG(scanner_mode) = ZEND_INI_SCANNER_NORMAL;
SCNG(scanner_mode) = scanner_mode;
SCNG(yy_in) = fh;
if (fh != NULL) {
ini_filename = zend_strndup(fh->filename, strlen(fh->filename));
} else {
ini_filename = NULL;
}
zend_stack_init(&SCNG(state_stack));
BEGIN(INITIAL);
return SUCCESS;
}
/* }}} */
@@ -199,15 +217,14 @@ int zend_ini_open_file_for_scanning(zend_file_handle *fh, int scanner_mode TSRML
char *buf;
size_t size;
if (zend_stream_fixup(fh, &buf, &size TSRMLS_CC) == FAILURE) {
if (zend_stream_fixup(fh, &buf, &size TSRMLS_CC) == FAILURE ||
init_ini_scanner(scanner_mode, fh TSRMLS_CC) == FAILURE
) {
return FAILURE;
}
init_ini_scanner(TSRMLS_C);
SCNG(scanner_mode) = scanner_mode;
SCNG(yy_in) = fh;
yy_scan_buffer(buf, size TSRMLS_CC);
ini_filename = zend_strndup(fh->filename, strlen(fh->filename));
return SUCCESS;
}
/* }}} */
@@ -218,11 +235,12 @@ int zend_ini_prepare_string_for_scanning(char *str, int scanner_mode TSRMLS_DC)
{
int len = strlen(str);
init_ini_scanner(TSRMLS_C);
SCNG(scanner_mode) = scanner_mode;
SCNG(yy_in) = NULL;
if (init_ini_scanner(scanner_mode, NULL TSRMLS_CC) == FAILURE) {
return FAILURE;
}
yy_scan_buffer(str, len TSRMLS_CC);
ini_filename = NULL;
return SUCCESS;
}
/* }}} */
@@ -308,19 +326,18 @@ NEWLINE ("\r"|"\n"|"\r\n")
TABS_AND_SPACES [ \t]
WHITESPACE [ \t]+
CONSTANT [a-zA-Z][a-zA-Z0-9_]*
LABEL [a-zA-Z0-9_][a-zA-Z0-9*._-]*
LABEL [^=\n\r\t ;|&$~(){}!"\[]+
TOKENS [:,.\[\]"'()|^&+-/*=%$!~<>?@{}]
OPERATORS [&|~()!]
DOLLAR_CURLY "${"
SECTION_RAW_CHARS [^\]\n\r]
SINGLE_QUOTED_CHARS [^']
RAW_VALUE_CHARS [^=\n\r;]
RAW_VALUE_CHARS [^\n\r;]
LITERAL_DOLLAR ("$"([^{\000]|("\\"{ANY_CHAR})))
VALUE_CHARS ([^$= \t\n\r;&|~()!"'\000]|{LITERAL_DOLLAR})
SECTION_VALUE_CHARS ([^$\n\r;"'\]\\]|("\\"{ANY_CHAR})|{LITERAL_DOLLAR})
DOUBLE_QUOTES_CHARS ([^$"\\]|("\\"[^"])|{LITERAL_DOLLAR}|"\\"["][^\r\n])
<!*> := yyleng = YYCURSOR - SCNG(yy_text);
@@ -453,20 +470,47 @@ DOUBLE_QUOTES_CHARS ([^$"\\]|("\\"[^"])|{LITERAL_DOLLAR}|"\\"["][^\r\n])
return '"';
}
<ST_DOUBLE_QUOTES>{DOUBLE_QUOTES_CHARS}+("\\"["])? { /* Escape double quoted string contents */
if(yyleng > 1 && yytext[yyleng-1] == '"' && yytext[yyleng-2] == '\\') {
yyless(yyleng-1);
yyleng--;
}
zend_ini_escape_string(ini_lval, yytext, yyleng, '"' TSRMLS_CC);
return TC_QUOTED_STRING;
}
<ST_DOUBLE_QUOTES>["]{TABS_AND_SPACES}* { /* Double quoted '"' string ends */
yy_pop_state(TSRMLS_C);
return '"';
}
<ST_DOUBLE_QUOTES>[^] { /* Escape double quoted string contents */
if (YYCURSOR > YYLIMIT) {
return 0;
}
while (YYCURSOR < YYLIMIT) {
switch (*YYCURSOR++) {
case '"':
if (YYCURSOR < YYLIMIT && YYCURSOR[-2] == '\\' && *YYCURSOR != '\r' && *YYCURSOR != '\n') {
continue;
}
break;
case '$':
if (*YYCURSOR == '{') {
break;
}
continue;
case '\\':
if (YYCURSOR < YYLIMIT && *YYCURSOR != '"') {
YYCURSOR++;
}
/* fall through */
default:
continue;
}
YYCURSOR--;
break;
}
yyleng = YYCURSOR - SCNG(yy_text);
zend_ini_escape_string(ini_lval, yytext, yyleng, '"' TSRMLS_CC);
return TC_QUOTED_STRING;
}
<ST_SECTION_VALUE,ST_VALUE,ST_OFFSET>{WHITESPACE} {
RETURN_TOKEN(TC_WHITESPACE, yytext, yyleng);
}
+1 -1
View File
@@ -1,4 +1,4 @@
/* Generated by re2c 0.13.6.dev on Mon Feb 2 19:23:18 2009 */
/* Generated by re2c 0.13.5 on Fri Aug 7 18:29:12 2009 */
#line 3 "Zend/zend_ini_scanner_defs.h"
enum YYCONDTYPE {
Loaded 100 of 2688 files, more files were not shown because too many files have changed in this diff. Show more