mirror of
https://github.com/bdnugget/php-src.git
synced 2026-11-18 06:26:37 +00:00
Compare commits
63
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
95e8cd6d25 | ||
|
|
b5c273c916 | ||
|
|
cdcfd12108 | ||
|
|
432f0d1380 | ||
|
|
9fea178a1b | ||
|
|
7b06c28ea2 | ||
|
|
122d4aee9c | ||
|
|
c3cc057418 | ||
|
|
e9c850b1a3 | ||
|
|
6dba114cfd | ||
|
|
f9333d925c | ||
|
|
2b94eccbd2 | ||
|
|
f937a5ac8d | ||
|
|
60926976a1 | ||
|
|
1a95b4a034 | ||
|
|
c6126625e0 | ||
|
|
c631df654b | ||
|
|
b62a6be2ac | ||
|
|
b40451bb33 | ||
|
|
0f74febfad | ||
|
|
fdd16ecd9b | ||
|
|
78cf3608a6 | ||
|
|
f7a4997e48 | ||
|
|
25819c72da | ||
|
|
692e2b7d8b | ||
|
|
22c6c9ac87 | ||
|
|
419ad36db8 | ||
|
|
35381b7f40 | ||
|
|
6425b074be | ||
|
|
3897a8a32a | ||
|
|
957f2e9e5e | ||
|
|
03042693bc | ||
|
|
fc0f16cb5c | ||
|
|
36a817b592 | ||
|
|
04d802a79e | ||
|
|
362b334456 | ||
|
|
a2e7c6d2f0 | ||
|
|
1ed8a4d6d6 | ||
|
|
9058ae8ef0 | ||
|
|
1a57cb01e6 | ||
|
|
883aa84f8a | ||
|
|
2fc07dcac4 | ||
|
|
1aa6a85609 | ||
|
|
e1855006a0 | ||
|
|
8263990a67 | ||
|
|
23dfb5f6f7 | ||
|
|
94655dc8d2 | ||
|
|
6392009183 | ||
|
|
49873a87aa | ||
|
|
65eb7558ba | ||
|
|
6cba66fa78 | ||
|
|
7772923062 | ||
|
|
78f24c74c0 | ||
|
|
83d52ff5e9 | ||
|
|
d8f010ee63 | ||
|
|
b00125dd99 | ||
|
|
e7590db152 | ||
|
|
cdee41505c | ||
|
|
7e262e737d | ||
|
|
d12e89e730 | ||
|
|
a0a40fa408 | ||
|
|
1613a7561c | ||
|
|
4d593727a2 |
No files matched your search
+17
-13
@@ -79,25 +79,29 @@ PHP_TEST_SHARED_EXTENSIONS = ` \
|
||||
. $$i; $(top_srcdir)/build/shtool echo -n -- " -d $(ZEND_EXT_TYPE)=$(top_builddir)/modules/$$dlname"; \
|
||||
done; \
|
||||
fi`
|
||||
PHP_DEPRECATED_DIRECTIVES_REGEX = '^(define_syslog_variables|register_(globals|long_arrays)?|safe_mode|magic_quotes_(gpc|runtime|sybase)?|(zend_)?extension(_debug)?(_ts)?)[\t\ ]*='
|
||||
|
||||
test: all
|
||||
-@if test ! -z "$(PHP_EXECUTABLE)" && test -x "$(PHP_EXECUTABLE)"; then \
|
||||
INI_FILE=`$(PHP_EXECUTABLE) -d 'display_errors=stderr' -r 'echo php_ini_loaded_file();' 2> /dev/null`; \
|
||||
if test "$$INI_FILE"; then \
|
||||
$(EGREP) -h -v $(PHP_DEPRECATED_DIRECTIVES_REGEX) "$$INI_FILE" > $(top_builddir)/tmp-php.ini; \
|
||||
else \
|
||||
echo > $(top_builddir)/tmp-php.ini; \
|
||||
fi; \
|
||||
INI_SCANNED_PATH=`$(PHP_EXECUTABLE) -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 $(PHP_DEPRECATED_DIRECTIVES_REGEX) "$$INI_SCANNED_PATH"/*.ini >> $(top_builddir)/tmp-php.ini; \
|
||||
fi; \
|
||||
TEST_PHP_EXECUTABLE=$(PHP_EXECUTABLE) \
|
||||
TEST_PHP_SRCDIR=$(top_srcdir) \
|
||||
CC="$(CC)" \
|
||||
$(PHP_EXECUTABLE) -n -c $(top_builddir)/tmp-php.ini $(PHP_TEST_SETTINGS) $(top_srcdir)/run-tests.php -n -c $(top_builddir)/tmp-php.ini -d extension_dir=$(top_builddir)/modules/ $(PHP_TEST_SHARED_EXTENSIONS) $(TESTS); \
|
||||
$(PHP_EXECUTABLE) $(PHP_TEST_SETTINGS) $(top_srcdir)/run-tests.php -d extension_dir=modules/ $(PHP_TEST_SHARED_EXTENSIONS) tests/; \
|
||||
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 '^(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 '^(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) \
|
||||
CC="$(CC)" \
|
||||
$(top_builddir)/$(SAPI_CLI_PATH) -n -c $(top_builddir)/tmp-php.ini $(PHP_TEST_SETTINGS) $(top_srcdir)/run-tests.php -n -c $(top_builddir)/tmp-php.ini -d extension_dir=$(top_builddir)/modules/ $(PHP_TEST_SHARED_EXTENSIONS) $(TESTS); \
|
||||
else \
|
||||
echo "ERROR: Cannot run tests without CLI sapi."; \
|
||||
fi
|
||||
|
||||
@@ -1,218 +1,29 @@
|
||||
PHP NEWS
|
||||
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
||||
22 Dec 2009, PHP 5.3.2 RC 1
|
||||
- Upgraded bundled sqlite to version 3.6.21. (Ilia)
|
||||
- Upgraded bundled PCRE to version 8.00. (Scott)
|
||||
|
||||
- Changed gmp_strval() to use full range from 2 to 62, and -2 to -36. FR #50283
|
||||
(David Soria Parra)
|
||||
- Changed "post_max_size" php.ini directive to allow unlimited post size by
|
||||
setting it to 0. (Rasmus)
|
||||
|
||||
- Added INTERNALDATE support to imap_append. (nick at mailtrust dot com)
|
||||
- Added support for SHA-256 and SHA-512 to php's crypt. (Pierre)
|
||||
- Added realpath_cache_size() and realpath_cache_get() functions. (Stas)
|
||||
- Added FILTER_FLAG_STRIP_BACKTICK option to the filter extension. (Ilia)
|
||||
- Added protection for $_SESSION from interrupt corruption and improved
|
||||
"session.save_path" check. (Stas)
|
||||
- Added LIBXML_PARSEHUGE constant to override the maximum text size of a
|
||||
single text node when using libxml2.7.3+. (Kalle)
|
||||
- Added ReflectionMethod::setAccessible() for invoking non-public methods
|
||||
through the Reflection API. (Sebastian)
|
||||
- Added Collator::getSortKey for intl extension. (Stas)
|
||||
- Added support for CURLOPT_POSTREDIR. FR #49571. (Sriram Natarajan)
|
||||
- Added support for CURLOPT_CERTINFO. FR #49253.
|
||||
(Linus Nielsen Feltzing <linus@haxx.se>)
|
||||
- Added client-side server name indication support in openssl. (Arnaud)
|
||||
|
||||
- Improved fix for bug #50006 (Segfault caused by uksort()). (Stas)
|
||||
|
||||
- Fixed mysqlnd hang when queries exactly 16777214 bytes long are sent. (Andrey)
|
||||
- Fixed incorrect decoding of 5-byte BIT sequences in mysqlnd. (Andrey)
|
||||
- Fixed error_log() to be binary safe when using message_type 3. (Jani)
|
||||
- Fixed unnecessary invocation of setitimer when timeouts have been disabled.
|
||||
(Arvind Srinivasan)
|
||||
- Fixed memory leak in extension loading when an error occurs on Windows.
|
||||
(Pierre)
|
||||
|
||||
- Fixed bug #50540 (Crash while running ldap_next_reference test cases).
|
||||
(Sriram)
|
||||
- Fixed bug #50508 (compile failure: Conflicting HEADER type declarations).
|
||||
(Jani)
|
||||
- Fixed bug #50496 (Use of <stdbool.h> is valid only in a c99 compilation
|
||||
environment. (Sriram)
|
||||
- Fixed bug #50464 (declare encoding doesn't work within an included file).
|
||||
(Felipe)
|
||||
- Fixed bug #50458 (PDO::FETCH_FUNC fails with Closures). (Felipe, Pierrick)
|
||||
- Fixed bug #50445 (PDO-ODBC stored procedure call from Solaris 64-bit causes
|
||||
seg fault). (davbrown4 at yahoo dot com, Felipe)
|
||||
- Fixed bug #50394 (Reference argument converted to value in __call). (Stas)
|
||||
- Fixed bug #50351 (performance regression handling objects, ten times slower
|
||||
in 5.3 than in 5.2). (Dmitry)
|
||||
- Fixed bug #50392 (date_create_from_format() enforces 6 digits for 'u'
|
||||
format character). (Ilia)
|
||||
- Fixed bug #50345 (nanosleep not detected properly on some solaris versions).
|
||||
(Jani)
|
||||
- Fixed bug #50340 (php.ini parser does not allow spaces in ini keys). (Jani)
|
||||
- Fixed bug #50334 (crypt ignores sha512 prefix). (Pierre)
|
||||
- Fixed bug #50323 (Allow use of ; in values via ;; in PDO DSN).
|
||||
(Ilia, Pierrick)
|
||||
- Fixed bug #50285 (xmlrpc does not preserve keys in encoded indexed arrays).
|
||||
(Felipe)
|
||||
- Fixed bug #50282 (xmlrpc_encode_request() changes object into array in
|
||||
calling function). (Felipe)
|
||||
- Fixed bug #50267 (get_browser(null) does not use HTTP_USER_AGENT). (Jani)
|
||||
- Fixed bug #50266 (conflicting types for llabs). (Jani)
|
||||
- Fixed bug #50261 (Crash When Calling Parent Constructor with
|
||||
call_user_func()). (Dmitry)
|
||||
- Fixed bug #50255 (isset() and empty() silently casts array to object).
|
||||
(Felipe)
|
||||
- Fixed bug #50240 (pdo_mysql.default_socket in php.ini shouldn't used
|
||||
if it is empty). (foutrelis at gmail dot com, Ilia)
|
||||
- Fixed bug #50231 (Socket path passed using --with-mysql-sock is ignored when
|
||||
mysqlnd is enabled). (Jani)
|
||||
- Fixed bug #50219 (soap call Segmentation fault on a redirected url).
|
||||
(Pierrick)
|
||||
- Fixed bug #50212 (crash by ldap_get_option() with LDAP_OPT_NETWORK_TIMEOUT).
|
||||
(Ilia, shigeru_kitazaki at cybozu dot co dot jp)
|
||||
- Fixed bug #50209 (Compiling with libedit cannot find readline.h).
|
||||
(tcallawa at redhat dot com)
|
||||
- Fixed bug #50207 (segmentation fault when concatenating very large strings on
|
||||
64bit linux). (Ilia)
|
||||
- Fixed bug #50196 (stream_copy_to_stream() produces warning when source is
|
||||
not file). (Stas)
|
||||
- Fixed bug #50195 (pg_copy_to() fails when table name contains schema. (Ilia)
|
||||
- Fixed bug #50185 (ldap_get_entries() return false instead of an empty array
|
||||
when there is no error). (Jani)
|
||||
- Fixed bug #50174 (Incorrectly matched docComment). (Felipe)
|
||||
- Fixed bug #50168 (FastCGI fails with wrong error on HEAD request to
|
||||
non-existant file). (Dmitry)
|
||||
- Fixed bug #50162 (Memory leak when fetching timestamp column from Oracle
|
||||
database). (Felipe)
|
||||
- Fixed bug #50159 (wrong working directory in symlinked files). (Dmitry)
|
||||
- Fixed bug #50158 (FILTER_VALIDATE_EMAIL fails with valid addresses
|
||||
containing = or ?). (Pierrick)
|
||||
- Fixed bug #50152 (ReflectionClass::hasProperty behaves like isset() not
|
||||
property_exists). (Felipe)
|
||||
- Fixed bug #50146 (property_exists: Closure object cannot have properties).
|
||||
(Felipe)
|
||||
- Fixed bug #50145 (crash while running bug35634.phpt). (Felipe)
|
||||
- Fixed bug #50140 (With default compilation option, php symbols are unresolved
|
||||
for nsapi). (Uwe Schindler)
|
||||
- Fixed bug #50087 (NSAPI performance improvements). (Uwe Schindler)
|
||||
- Fixed bug #50073 (parse_url() incorrect when ? in fragment). (Ilia)
|
||||
- Fixed bug #50023 (pdo_mysql doesn't use PHP_MYSQL_UNIX_SOCK_ADDR). (Ilia)
|
||||
- Fixed bug #50005 (Throwing through Reflection modified Exception object
|
||||
makes segmentation fault). (Felipe)
|
||||
- Fixed bug #49990 (SNMP3 warning message about security level printed twice).
|
||||
(Jani)
|
||||
- Fixed bug #49985 (pdo_pgsql prepare() re-use previous aborted
|
||||
transaction). (ben dot pineau at gmail dot com, Ilia, Matteo)
|
||||
- Fixed bug #49938 (Phar::isBuffering() returns inverted value). (Greg)
|
||||
- Fixed bug #49936 (crash with ftp stream in php_stream_context_get_option()).
|
||||
(Pierrick)
|
||||
- Fixed bug #49921 (Curl post upload functions changed). (Ilia)
|
||||
- Fixed bug #49866 (Making reference on string offsets crashes PHP). (Dmitry)
|
||||
- Fixed bug #49855 (import_request_variables() always returns NULL). (Ilia,
|
||||
sjoerd at php dot net)
|
||||
- Fixed bug #49851, #50451 (http wrapper breaks on 1024 char long headers).
|
||||
(Ilia)
|
||||
- Fixed bug #49800 (SimpleXML allow (un)serialize() calls without warning).
|
||||
(Ilia, wmeler at wp-sa dot pl)
|
||||
- Fixed bug #49719 (ReflectionClass::hasProperty returns true for a private
|
||||
property in base class). (Felipe)
|
||||
- Fixed bug #49677 (ini parser crashes with apache2 and using ${something}
|
||||
ini variables). (Jani)
|
||||
- Fixed bug #49660 (libxml 2.7.3+ limits text nodes to 10MB). (Felipe)
|
||||
- Fixed bug #49647 (DOMUserData does not exist). (Rob)
|
||||
- Fixed bug #49521 (PDO fetchObject sets values before calling constructor).
|
||||
(Pierrick)
|
||||
- Fixed bug #49472 (Constants defined in Interfaces can be overridden).
|
||||
(Felipe)
|
||||
- Fixed bug #49244 (Floating point NaN cause garbage characters). (Sjoerd)
|
||||
- Fixed bug #49224 (Compile error due to old DNS functions on AIX systems).
|
||||
(Scott)
|
||||
- Fixed bug #49174 (crash when extending PDOStatement and trying to set
|
||||
queryString property). (Felipe)
|
||||
- Fixed bug #47848 (importNode doesn't preserve attribute namespaces). (Rob)
|
||||
- Fixed bug #46478 (htmlentities() uses obsolete mapping table for character
|
||||
entity references). (Moriyoshi)
|
||||
- Fixed bug #45599 (strip_tags() truncates rest of string with invalid
|
||||
attribute). (Ilia, hradtke)
|
||||
- Fixed bug #45120 (PDOStatement->execute() returns true then false for same
|
||||
statement). (Pierrick)
|
||||
- Fixed bug #34852 (Failure in odbc_exec() using oracle-supplied odbc
|
||||
driver). (tim dot tassonis at trivadis dot com)
|
||||
|
||||
19 Nov 2009, PHP 5.3.1
|
||||
20 Oct 2009, PHP 5.3.1 RC2
|
||||
- Upgraded bundled sqlite to version 3.6.19. (Scott)
|
||||
- Updated timezone database to version 2009.17 (2009q). (Derick)
|
||||
|
||||
- Changed ini file directives [PATH=](on Win32) and [HOST=](on all) to be case
|
||||
insensitive. (garretts)
|
||||
|
||||
- Restored shebang line check to CGI sapi (not checked by scanner anymore).
|
||||
(Jani)
|
||||
|
||||
- Added "max_file_uploads" INI directive, which can be set to limit the
|
||||
number of file uploads per-request to 20 by default, to prevent possible
|
||||
DOS via temporary file exhaustion. (Ilia)
|
||||
- Added missing sanity checks around exif processing. (Ilia)
|
||||
- Added error constant when json_encode() detects an invalid UTF-8 sequence.
|
||||
(Scott)
|
||||
- Added support for ACL on Windows for thread safe SAPI (Apache2 for example)
|
||||
and fix its support on NTS. (Pierre)
|
||||
|
||||
- Improved symbolic, mounted volume and junctions support for realpath on
|
||||
Windows. (Pierre)
|
||||
- Improved readlink on Windows, suppress \??\ and use the drive syntax only.
|
||||
(Pierre)
|
||||
- Improved dns_get_record() AAAA support on windows. Always available when
|
||||
IPv6 is support is installed, format is now the same than on unix. (Pierre)
|
||||
- Improved the DNS functions on OSX to use newer APIs, also use Bind 9 API
|
||||
where available on other platforms. (Scott)
|
||||
- Improved shared extension loading on OSX to use the standard Unix dlopen()
|
||||
API. (Scott)
|
||||
|
||||
- Fixed crash in com_print_typeinfo when an invalid typelib is given. (Pierre)
|
||||
- Fixed a safe_mode bypass in tempnam() identified by Grzegorz Stachowiak.
|
||||
(Rasmus)
|
||||
- Fixed a open_basedir bypass in posix_mkfifo() identified by Grzegorz
|
||||
Stachowiak. (Rasmus)
|
||||
- Fixed certificate validation inside php_openssl_apply_verification_policy
|
||||
(Ryan Sleevi, Ilia)
|
||||
|
||||
- Fixed crash in SQLiteDatabase::ArrayQuery() and SQLiteDatabase::SingleQuery()
|
||||
when calling using Reflection. (Felipe)
|
||||
- Fixed crash when instantiating PDORow and PDOStatement through Reflection.
|
||||
(Felipe)
|
||||
- Fixed sanity check for the color index in imagecolortransparent. (Pierre)
|
||||
- Fixed scandir/readdir when used mounted points on Windows. (Pierre)
|
||||
- Fixed zlib.deflate compress filter to actually accept level parameter. (Jani)
|
||||
- Fixed leak on error in popen/exec (and related functions) on Windows.
|
||||
(Pierre)
|
||||
- Fixed possible bad caching of symlinked directories in the realpath cache
|
||||
on Windows. (Pierre)
|
||||
- Fixed atime and mtime in stat related functions on Windows. (Pierre)
|
||||
- Fixed spl_autoload_unregister/spl_autoload_functions wrt. Closures and
|
||||
Functors. (Christian Seiler)
|
||||
- Fixed open_basedir circumvention for "mail.log" ini directive.
|
||||
(Maksymilian Arciemowicz, Stas)
|
||||
- Fixed signature generation/validation for zip archives in ext/phar. (Greg)
|
||||
- Fixed memory leak in stream_is_local(). (Felipe, Tony)
|
||||
- Fixed BC break in mime_content_type(), removes the content encoding. (Scott)
|
||||
- Changed ini file directives [PATH=](on Win32) and [HOST=](on all) to be case
|
||||
insensitive (garretts)
|
||||
- Restored shebang line check to CGI sapi (not checked by scanner anymore).
|
||||
(Jani)
|
||||
- Added support for ACL on Windows for thread safe SAPI (Apache2 for example)
|
||||
and fix its support on NTS. (Pierre)
|
||||
- Improve symbolic, mounted volume and junctions support for realpath on
|
||||
Windows. (Pierre)
|
||||
|
||||
- Fixed PECL bug #16842 (oci_error return false when NO_DATA_FOUND is raised).
|
||||
(Chris Jones)
|
||||
|
||||
- Fixed bug #50063 (safe_mode_include_dir fails). (Johannes, christian at
|
||||
elmerot dot se)
|
||||
- Fixed bug #50052 (Different Hashes on Windows and Linux on wrong Salt size).
|
||||
(Pierre)
|
||||
- Fixed bug #49986 (Missing ICU DLLs on windows package). (Pierre)
|
||||
- Fixed bug #49910 (no support for ././@LongLink for long filenames in phar
|
||||
tar support). (Greg)
|
||||
- Fixed bug #49908 (throwing exception in __autoload crashes when interface
|
||||
is not defined). (Felipe)
|
||||
- Fixed bug #49847 (exec() fails to return data inside 2nd parameter, given
|
||||
output lines >4095 bytes). (Ilia)
|
||||
- Fixed bug #49809 (time_sleep_until() is not available on OpenSolaris). (Jani)
|
||||
@@ -234,10 +45,51 @@ PHP NEWS
|
||||
(Ilia)
|
||||
- Fixed bug #49447 (php engine need to correctly check for socket API
|
||||
return status on windows). (Sriram Natarajan)
|
||||
- Fixed bug #48909 (Segmentation fault in mysqli_stmt_execute()). (Andrey)
|
||||
- Fixed bug #48805 (IPv6 socket transport is not working). (Ilia)
|
||||
- Fixed bug #48754 (mysql_close() crash php when no handle specified).
|
||||
(Johannes, Andrey)
|
||||
- Fixed bug #40013 (php_uname() does not return nodename on Netware (Guenter
|
||||
Knauf)
|
||||
- Fixed PECL bug #16842 (oci_error return false when NO_DATA_FOUND is raised).
|
||||
(Chris Jones)
|
||||
|
||||
03 Sep 2009, PHP 5.3.1 RC1
|
||||
- Upgraded bundled sqlite to version 3.6.17. (Scott)
|
||||
|
||||
- Added missing sanity checks around exif processing. (Ilia)
|
||||
- Added error constant when json_encode() detects an invalid UTF-8 sequence.
|
||||
(Scott)
|
||||
|
||||
- Improved readlink on Windows, suppress \??\ and use the drive syntax only.
|
||||
(Pierre)
|
||||
- Improved dns_get_record() AAAA support on windows. Always available when
|
||||
IPv6 is support is installed, format is now the same than on unix. (Pierre)
|
||||
- Improved the DNS functions on OSX to use newer APIs, also use Bind 9 API
|
||||
where available on other platforms. (Scott)
|
||||
- Improved shared extension loading on OSX to use the standard Unix dlopen()
|
||||
API. (Scott)
|
||||
|
||||
- Fixed sanity check for the color index in imagecolortransparent. (Pierre)
|
||||
- Fixed scandir/readdir when used mounted points on Windows. (Pierre)
|
||||
- Fixed zlib.deflate compress filter to actually accept level parameter. (Jani)
|
||||
- Fixed leak on error in popen/exec (and related functions) on Windows.
|
||||
(Pierre)
|
||||
- Fixed possible bad caching of symlinked directories in the realpath cache
|
||||
on Windows. (Pierre)
|
||||
- Fixed atime and mtime in stat related functions on Windows. (Pierre)
|
||||
- Fixed spl_autoload_unregister/spl_autoload_functions wrt. Closures and
|
||||
Functors. (Christian Seiler)
|
||||
- Fixed open_basedir circumvention for "mail.log" ini directive.
|
||||
(Maksymilian Arciemowicz, Stas)
|
||||
- Fixed signature generation/validation for zip archives in ext/phar. (Greg)
|
||||
- Fixed memory leak in stream_is_local(). (Felipe, Tony)
|
||||
- Fixed BC break in mime_content_type(), removes the content encoding. (Scott)
|
||||
|
||||
- Fixed bug #49391 (ldap.c utilizing deprecated ldap_modify_s). (Ilia)
|
||||
- Fixed bug #49372 (segfault in php_curl_option_curl). (Pierre)
|
||||
- Fixed bug #49361 (wordwrap() wraps incorrectly on end of line boundaries).
|
||||
(Ilia, code-it at mail dot ru)
|
||||
- Fixed bug #49372 (segfault in php_curl_option_curl). (Pierre)
|
||||
- Fixed bug #49306 (inside pdo_mysql default socket settings are ignored).
|
||||
(Ilia)
|
||||
- Fixed bug #49289 (bcmath module doesn't compile with phpize configure).
|
||||
@@ -252,15 +104,12 @@ PHP NEWS
|
||||
- Fixed bug #49183 (dns_get_record does not return NAPTR records). (Pierre)
|
||||
- Fixed bug #49144 (Import of schema from different host transmits original
|
||||
authentication details). (Dmitry)
|
||||
- Fixed bug #49142 (crash when exception thrown from __tostring()).
|
||||
(David Soria Parra)
|
||||
- Fixed bug #49132 (posix_times returns false without error).
|
||||
(phpbugs at gunnu dot us)
|
||||
- Fixed bug #49125 (Error in dba_exists C code). (jdornan at stanford dot edu)
|
||||
- Fixed bug #49122 (undefined reference to mysqlnd_stmt_next_result on compile
|
||||
with --with-mysqli and MySQL 6.0). (Jani)
|
||||
- Fixed bug #49108 (2nd scan_dir produces segfault). (Felipe)
|
||||
- Fixed bug #49098 (mysqli segfault on error). (Rasmus)
|
||||
- Fixed bug #49095 (proc_get_status['exitcode'] fails on win32). (Felipe)
|
||||
- Fixed bug #49092 (ReflectionFunction fails to work with functions in fully
|
||||
qualified namespaces). (Kalle, Jani)
|
||||
@@ -282,14 +131,14 @@ PHP NEWS
|
||||
- Fixed bug #49027 (mysqli_options() doesn't work when using mysqlnd). (Andrey)
|
||||
- Fixed bug #49026 (proc_open() can bypass safe_mode_protected_env_vars
|
||||
restrictions). (Ilia)
|
||||
- Fixed bug #49012 (phar tar signature algorithm reports as Unknown (0) in
|
||||
getSignature() call). (Greg)
|
||||
- Fixed bug #49020 (phar misinterprets ustar long filename standard).
|
||||
(Greg)
|
||||
- Fixed bug #49018 (phar tar stores long filenames wit prefix/name reversed).
|
||||
(Greg)
|
||||
- Fixed bug #49014 (dechunked filter broken when serving more than 8192 bytes
|
||||
in a chunk). (andreas dot streichardt at globalpark dot com, Ilia)
|
||||
- Fixed bug #49012 (phar tar signature algorithm reports as Unknown (0) in
|
||||
getSignature() call). (Greg)
|
||||
- Fixed bug #49000 (PHP CLI in Interactive mode (php -a) crashes
|
||||
when including files from function). (Stas)
|
||||
- Fixed bug #48994 (zlib.output_compression does not output HTTP headers when
|
||||
@@ -303,16 +152,14 @@ PHP NEWS
|
||||
(naf at altlinux dot ru, Felipe)
|
||||
- Fixed bug #48912 (Namespace causes unexpected strict behaviour with
|
||||
extract()). (Dmitry)
|
||||
- Fixed bug #48909 (Segmentation fault in mysqli_stmt_execute()). (Andrey)
|
||||
- Fixed bug #48899 (is_callable returns true even if method does not exist in
|
||||
parent class). (Felipe)
|
||||
- Fixed bug #48893 (Problems compiling with Curl). (Felipe)
|
||||
- Fixed bug #48880 (Random Appearing open_basedir problem). (Rasmus, Gwynne)
|
||||
- Fixed bug #48872 (string.c: errors: duplicate case values). (Kalle)
|
||||
- Fixed bug #48854 (array_merge_recursive modifies arrays after first one).
|
||||
(Felipe)
|
||||
- Fixed bug #48805 (IPv6 socket transport is not working). (Ilia)
|
||||
- Fixed bug #48802 (printf() returns incorrect outputted length). (Jani)
|
||||
- Fixed bug #48880 (Random Appearing open_basedir problem). (Rasmus, Gwynne)
|
||||
- Fixed bug #48791 (open office files always reported as corrupted). (Greg)
|
||||
- Fixed bug #48788 (RecursiveDirectoryIterator doesn't descend into symlinked
|
||||
directories). (Ilia)
|
||||
@@ -326,9 +173,6 @@ PHP NEWS
|
||||
gmail dot com, Pierre)
|
||||
- Fixed bug #48762 (IPv6 address filter still rejects valid address). (Felipe)
|
||||
- Fixed bug #48757 (ReflectionFunction::invoke() parameter issues). (Kalle)
|
||||
- Fixed bug #48754 (mysql_close() crash php when no handle specified).
|
||||
(Johannes, Andrey)
|
||||
- Fixed bug #48752 (Crash during date parsing with invalid date). (Pierre)
|
||||
- Fixed bug #48746 (Unable to browse directories within Junction Points).
|
||||
(Pierre, Kanwaljeet Singla)
|
||||
- Fixed bug #48745 (mysqlnd: mysql_num_fields returns wrong column count for
|
||||
@@ -385,15 +229,12 @@ PHP NEWS
|
||||
in fopen). (Jani)
|
||||
- Fixed bug #42434 (ImageLine w/ antialias = 1px shorter). (wojjie at gmail dot
|
||||
com, Kalle)
|
||||
- Fixed bug #40013 (php_uname() does not return nodename on Netware (Guenter
|
||||
Knauf)
|
||||
- Fixed bug #38091 (Mail() does not use FQDN when sending SMTP helo).
|
||||
(Kalle, Rick Yorgason)
|
||||
- Fixed bug #28038 (Sent incorrect RCPT TO commands to SMTP server) (Garrett)
|
||||
- Fixed bug #27051 (Impersonation with FastCGI does not exec process as
|
||||
impersonated user). (Pierre)
|
||||
|
||||
|
||||
30 Jun 2009, PHP 5.3.0
|
||||
- Upgraded bundled PCRE to version 7.9. (Nuno)
|
||||
- Upgraded bundled sqlite to version 3.6.15. (Scott)
|
||||
|
||||
+79
-109
@@ -1,136 +1,106 @@
|
||||
Submitting Patches to PHP
|
||||
=========================
|
||||
Submitting Patch for PHP
|
||||
========================
|
||||
|
||||
This document describes how to submit a patch for PHP. Creating a
|
||||
patch for PHP is easy!
|
||||
This document describes how to submit a patch for PHP. Since you are
|
||||
reading this document, you are willing to submit a patch for PHP.
|
||||
Please keep reading! Submitting a patch for PHP is easy. The hard
|
||||
part is making it acceptable for inclusion into our repository. :-)
|
||||
|
||||
You don't need any login accounts or special access to download,
|
||||
build, debug and begin submitting PHP code, tests or documentation for
|
||||
inclusion in PHP. Once you've followed this README and had several
|
||||
patches accepted, PHP commit privileges are often quickly granted.
|
||||
How to create patch?
|
||||
--------------------
|
||||
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.
|
||||
|
||||
An excellent article to read first is:
|
||||
http://phpadvent.org/2008/less-whining-more-coding-by-elizabeth-smith
|
||||
Read CODING_STANDARDS file before you start working.
|
||||
|
||||
Now you are ready to create a patch. Modify source to fix a bug in PHP or
|
||||
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
|
||||
"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
|
||||
with your patch. Making new test script is very easy. It also helps us
|
||||
to understand what you have been fixed or added to PHP.
|
||||
|
||||
|
||||
Prework
|
||||
-------
|
||||
If you are fixing broken functionality then create a bug or identify
|
||||
an existing bug at http://bugs.php.net/. This can be used to track
|
||||
the patch progress and prevent your changes getting lost in the PHP
|
||||
mail archives.
|
||||
Tips for creating patch
|
||||
-----------------------
|
||||
If you would like to fix multiple bugs. It is easier for us if you
|
||||
could create 1 patch for 1 bug, but this is not strictly required.
|
||||
Note though that you might get little response, if your patch is
|
||||
too hard to review.
|
||||
|
||||
If your code change is large then first discuss it with the extension
|
||||
maintainer and/or a development mail list. Extension maintainers can
|
||||
be found in the EXTENSIONS file in the PHP source. Use the
|
||||
internals@lists.php.net mail list to discuss changes to the base PHP
|
||||
code. Use pecl-dev@lists.php.net for changes to code that is only
|
||||
available from PECL (http://pecl.php.net/). Use pear-dev@lists.php.net
|
||||
for PEAR modules (http://pear.php.net/). Mail list subscription is
|
||||
explained on http://www.php.net/mailing-lists.php.
|
||||
If you would like change/add many lines, it is better to ask module
|
||||
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 a PHP or PECL patch affects user-functionality or makes significant
|
||||
internal changes then create a simple RFC on http://wiki.php.net/rfc
|
||||
before starting discussion. This RFC can be used for initial
|
||||
discussion and later for documentation. Wiki accounts can be requested
|
||||
on http://wiki.php.net/start?do=register
|
||||
|
||||
There are several IRC channels where PHP developers are often
|
||||
available to discuss questions. They include #php.pecl on the EFNet
|
||||
network and #php-dev-win on FreeNode.
|
||||
If you are new to SVN (Subversion), visit
|
||||
http://svnbook.red-bean.com/ for details.
|
||||
|
||||
|
||||
How to create your patch
|
||||
------------------------
|
||||
PHP uses Subversion (SVN) for revision control. Read
|
||||
http://www.php.net/svn.php for help on using SVN to get and build PHP
|
||||
source code. We recommend using a Sparse Directory checkout described
|
||||
in http://wiki.php.net/vcs/svnfaq. If you are new to SVN, read
|
||||
http://svnbook.red-bean.com.
|
||||
|
||||
Generally we ask that patches work on the current stable PHP
|
||||
development branch and on "trunk".
|
||||
|
||||
Read CODING_STANDARDS before you start working.
|
||||
|
||||
After modifying the source see README.TESTING and
|
||||
http://qa.php.net/write-test.php for how to test. Submitting test
|
||||
scripts helps us to understand what functionality has changed. It is
|
||||
important for the stability and maintainability of PHP that tests are
|
||||
comprehensive.
|
||||
|
||||
After testing is finished, create a patch file using the command:
|
||||
|
||||
svn diff > your_patch.txt
|
||||
|
||||
For ease of review and later troubleshooting, submit individual
|
||||
patches for each bug or feature.
|
||||
Check list for submitting patch
|
||||
-------------------------------
|
||||
- Did you run "make test" to check if your patch didn't break
|
||||
other features?
|
||||
- Did you compile PHP with --enable-debug and check the PHP and
|
||||
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 update SVN source before you take final patch?
|
||||
- Did you read the patch again?
|
||||
|
||||
|
||||
Checklist for submitting your patch
|
||||
-----------------------------------
|
||||
- Update SVN source just before running your final 'diff' and
|
||||
before testing.
|
||||
- Run "make test" to check your patch doesn't break other features.
|
||||
- Rebuild PHP with --enable-debug (which will show some kinds of
|
||||
memory errors) and check the PHP and web server error logs after
|
||||
running the PHP tests.
|
||||
- Rebuild PHP with --enable-maintainer-zts to check your patch compiles
|
||||
on multi-threaded web servers.
|
||||
- Create test scripts for use with "make test".
|
||||
- Add in-line comments and/or have external documentation ready.
|
||||
- Review the patch once more just before submitting it.
|
||||
Where to send your patch?
|
||||
-------------------------
|
||||
If you are patching C source, send the patch to internals@lists.php.net.
|
||||
If you are patching a module, you should also send the patch to the
|
||||
maintainer. Official module maintainers are listed in EXTENSION file
|
||||
in source.
|
||||
|
||||
If you are patching PEAR, send the patch to pear-dev@lists.php.net.
|
||||
|
||||
Where to send your patch
|
||||
------------------------
|
||||
If you are patching PHP C source then email the patch to
|
||||
internals@lists.php.net
|
||||
Please add the prefix "[PATCH]" to your email subject and make sure
|
||||
to include the patch as a MIME attachment even if it is short.
|
||||
|
||||
If you patching a PECL extension then send the patch to
|
||||
pecl-dev@lists.php.net
|
||||
NOTE: only MIME attachments of type 'text/*' are accepted. The
|
||||
easiest way to accomplish this, is to make the extension
|
||||
'.txt'.
|
||||
|
||||
If you are patching PEAR then send the patch to
|
||||
pear-dev@lists.php.net
|
||||
Test scripts should be included in the same email.
|
||||
Explain what has been fixed/added/changed by your patch.
|
||||
|
||||
The mail can be CC'd to the extension maintainer (see EXTENSIONS).
|
||||
|
||||
Please make the subject prefix "[PATCH]".
|
||||
|
||||
Include the patch as an attachment. Note: only MIME attachments of
|
||||
type 'text/*' are accepted. The easiest way to accomplish this is to
|
||||
make the file extension '.txt'.
|
||||
|
||||
Explain what has been fixed/added/changed by your patch. Test scripts
|
||||
should be included in the email.
|
||||
|
||||
Include the bug id(s) which can be closed by your patch.
|
||||
|
||||
Finally, update any open bugs and add a link to the source of your
|
||||
patch.
|
||||
Finally, add the bug Id(s) which can be closed by your patch, if any.
|
||||
|
||||
|
||||
What happens after you submit your patch
|
||||
----------------------------------------
|
||||
If your patch is easy to review and obviously has no side-effects,
|
||||
it might be committed relatively quickly.
|
||||
----------------------------------------
|
||||
If your patch is easy to review and has obviously no side-effects,
|
||||
it might take up to a few hours until someone commits it.
|
||||
|
||||
Because PHP is a volunteer-driven effort more complex patches will
|
||||
require patience on your side. If you do not receive feedback in a few
|
||||
days, consider resubmitting the patch. Before doing this think about
|
||||
Because this is a volunteer-driven effort, more complex patches will
|
||||
require more patience on your side.
|
||||
|
||||
If you did not receive any feedback in a few days, please consider
|
||||
resubmitting the description of your patch, along-side with
|
||||
these questions:
|
||||
|
||||
- Did I review the mail list archives to see if these kind of
|
||||
changes had been discussed before?
|
||||
- Did I explain my patch clearly?
|
||||
- Is my patch too hard to review? Because of which factors?
|
||||
- Are there any unwanted white space changes?
|
||||
- Is my patch too hard to review? Because of which factors?
|
||||
- Should I split it up in multiple parts?
|
||||
- Are there any unwanted whitespace changes?
|
||||
|
||||
|
||||
What happens when your patch is applied
|
||||
---------------------------------------
|
||||
What happens when your patch is applied?
|
||||
----------------------------------------
|
||||
Your name will be included together with your email address in the SVN
|
||||
commit log. If your patch affects end users, a brief description
|
||||
commit log. If your patch affects end-users, a brief description
|
||||
and your name might be added to the NEWS file.
|
||||
|
||||
Thank you for patching PHP!
|
||||
|
||||
Thank you for submitting patch for PHP!
|
||||
+2
-36
@@ -590,22 +590,6 @@ CWD_API realpath_cache_bucket* realpath_cache_lookup(const char *path, int path_
|
||||
}
|
||||
/* }}} */
|
||||
|
||||
CWD_API int realpath_cache_size(TSRMLS_D)
|
||||
{
|
||||
return CWDG(realpath_cache_size);
|
||||
}
|
||||
|
||||
CWD_API int realpath_cache_max_buckets(TSRMLS_D)
|
||||
{
|
||||
return (sizeof(CWDG(realpath_cache)) / sizeof(CWDG(realpath_cache)[0]));
|
||||
}
|
||||
|
||||
CWD_API realpath_cache_bucket** realpath_cache_get_buckets(TSRMLS_D)
|
||||
{
|
||||
return CWDG(realpath_cache);
|
||||
}
|
||||
|
||||
|
||||
#undef LINK_MAX
|
||||
#define LINK_MAX 32
|
||||
|
||||
@@ -999,7 +983,6 @@ CWD_API int virtual_file_ex(cwd_state *state, const char *path, verify_path_func
|
||||
time_t t;
|
||||
int ret;
|
||||
int add_slash;
|
||||
void *tmp;
|
||||
TSRMLS_FETCH();
|
||||
|
||||
if (path_length == 0 || path_length >= MAXPATHLEN-1) {
|
||||
@@ -1144,16 +1127,7 @@ verify:
|
||||
|
||||
CWD_STATE_COPY(&old_state, state);
|
||||
state->cwd_length = path_length;
|
||||
|
||||
tmp = realloc(state->cwd, state->cwd_length+1);
|
||||
if (tmp == NULL) {
|
||||
#if VIRTUAL_CWD_DEBUG
|
||||
fprintf (stderr, "Out of memory\n");
|
||||
#endif
|
||||
return 1;
|
||||
}
|
||||
state->cwd = (char *) tmp;
|
||||
|
||||
state->cwd = (char *) realloc(state->cwd, state->cwd_length+1);
|
||||
memcpy(state->cwd, resolved_path, state->cwd_length+1);
|
||||
if (verify_path(state)) {
|
||||
CWD_STATE_FREE(state);
|
||||
@@ -1165,15 +1139,7 @@ verify:
|
||||
}
|
||||
} else {
|
||||
state->cwd_length = path_length;
|
||||
tmp = realloc(state->cwd, state->cwd_length+1);
|
||||
if (tmp == NULL) {
|
||||
#if VIRTUAL_CWD_DEBUG
|
||||
fprintf (stderr, "Out of memory\n");
|
||||
#endif
|
||||
return 1;
|
||||
}
|
||||
state->cwd = (char *) tmp;
|
||||
|
||||
state->cwd = (char *) realloc(state->cwd, state->cwd_length+1);
|
||||
memcpy(state->cwd, resolved_path, state->cwd_length+1);
|
||||
ret = 0;
|
||||
}
|
||||
|
||||
@@ -238,9 +238,6 @@ extern virtual_cwd_globals cwd_globals;
|
||||
CWD_API void realpath_cache_clean(TSRMLS_D);
|
||||
CWD_API void realpath_cache_del(const char *path, int path_len TSRMLS_DC);
|
||||
CWD_API realpath_cache_bucket* realpath_cache_lookup(const char *path, int path_len, time_t t TSRMLS_DC);
|
||||
CWD_API int realpath_cache_size(TSRMLS_D);
|
||||
CWD_API int realpath_cache_max_buckets(TSRMLS_D);
|
||||
CWD_API realpath_cache_bucket** realpath_cache_get_buckets(TSRMLS_D);
|
||||
|
||||
/* The actual macros to be used in programs using TSRM
|
||||
* If the program defines VIRTUAL_DIR it will use the
|
||||
|
||||
+4
-3
@@ -111,7 +111,7 @@ char * tsrm_win32_get_path_sid_key(const char *pathname TSRMLS_DC)
|
||||
char *bucket_key = NULL;
|
||||
|
||||
if (!pSid) {
|
||||
bucket_key = (char *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, strlen(pathname) + 1);
|
||||
bucket_key = (char *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, strlen(pathname));
|
||||
if (!bucket_key) {
|
||||
return NULL;
|
||||
}
|
||||
@@ -123,14 +123,14 @@ char * tsrm_win32_get_path_sid_key(const char *pathname TSRMLS_DC)
|
||||
return NULL;
|
||||
}
|
||||
|
||||
bucket_key = (char *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, strlen(pathname) + strlen(ptcSid) + 1);
|
||||
bucket_key = (char *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, strlen(pathname) + strlen(ptcSid));
|
||||
if (!bucket_key) {
|
||||
LocalFree(ptcSid);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
memcpy(bucket_key, ptcSid, strlen(ptcSid));
|
||||
memcpy(bucket_key + strlen(ptcSid), pathname, strlen(pathname) + 1);
|
||||
memcpy(bucket_key + strlen(ptcSid), pathname, strlen(pathname));
|
||||
|
||||
LocalFree(ptcSid);
|
||||
return bucket_key;
|
||||
@@ -518,6 +518,7 @@ TSRM_API FILE *popen_ex(const char *command, const char *type, const char *cwd,
|
||||
if (err == ERROR_NO_TOKEN) {
|
||||
asuser = FALSE;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
cmd = (char*)malloc(strlen(command)+strlen(TWG(comspec))+sizeof(" /c ")+2);
|
||||
|
||||
@@ -30,7 +30,7 @@ ppp
|
||||
|
||||
echo "$htm\n";
|
||||
?>
|
||||
--EXPECT--
|
||||
--EXPECT---
|
||||
abc
|
||||
abc
|
||||
abc
|
||||
@@ -1,27 +0,0 @@
|
||||
--TEST--
|
||||
Bug #49472 (Constants defined in Interfaces can be overridden)
|
||||
--FILE--
|
||||
<?php
|
||||
|
||||
interface ia {
|
||||
const c = 'Sea';
|
||||
const y = 2;
|
||||
}
|
||||
|
||||
class Foo implements ia {
|
||||
}
|
||||
|
||||
class FooBar extends Foo implements ia {
|
||||
const x = 1;
|
||||
const c = 'Ocean';
|
||||
|
||||
public function show() {
|
||||
return ia::c;
|
||||
}
|
||||
}
|
||||
|
||||
new FooBar;
|
||||
|
||||
?>
|
||||
--EXPECTF--
|
||||
Fatal error: Cannot inherit previously-inherited or override constant c from interface ia in %s on line %d
|
||||
@@ -1,10 +0,0 @@
|
||||
--TEST--
|
||||
Bug #49866 (Making reference on string offsets crashes PHP)
|
||||
--FILE--
|
||||
<?php
|
||||
$a = "string";
|
||||
$b = &$a[1];
|
||||
$b = "f";
|
||||
echo $a;
|
||||
--EXPECTF--
|
||||
Fatal error: Cannot create references to/from string offsets nor overloaded objects in %sbug49866.php on line 3
|
||||
@@ -1,28 +0,0 @@
|
||||
--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,19 +0,0 @@
|
||||
--TEST--
|
||||
Bug #50005 (Throwing through Reflection modified Exception object makes segmentation fault)
|
||||
--FILE--
|
||||
<?php
|
||||
|
||||
class a extends exception {
|
||||
public function __construct() {
|
||||
$this->file = null;
|
||||
}
|
||||
}
|
||||
|
||||
throw new a;
|
||||
|
||||
?>
|
||||
--EXPECTF--
|
||||
Fatal error: Uncaught exception 'a' in :%d
|
||||
Stack trace:
|
||||
#0 {main}
|
||||
thrown in Unknown on line %d
|
||||
@@ -1,20 +0,0 @@
|
||||
--TEST--
|
||||
Bug #50146 (property_exists: Closure object cannot have properties)
|
||||
--FILE--
|
||||
<?php
|
||||
|
||||
$obj = function(){};
|
||||
|
||||
var_dump(property_exists($obj,'foo'));
|
||||
|
||||
$ref = new ReflectionObject($obj);
|
||||
var_dump($ref->hasProperty('b'));
|
||||
|
||||
var_dump(isset($obj->a));
|
||||
|
||||
?>
|
||||
--EXPECTF--
|
||||
bool(false)
|
||||
bool(false)
|
||||
|
||||
Catchable fatal error: Closure object cannot have properties in %s on line %d
|
||||
@@ -1,33 +0,0 @@
|
||||
--TEST--
|
||||
Bug #50174 (Incorrectly matched docComment)
|
||||
--SKIPIF--
|
||||
<?php if (!extension_loaded('reflection') || !extension_loaded('spl')) print "skip"; ?>
|
||||
--FILE--
|
||||
<?php
|
||||
|
||||
class TestClass
|
||||
{
|
||||
/** const comment */
|
||||
const C = 0;
|
||||
|
||||
function x() {}
|
||||
}
|
||||
|
||||
$rm = new ReflectionMethod('TestClass', 'x');
|
||||
var_dump($rm->getDocComment());
|
||||
|
||||
class TestClass2
|
||||
{
|
||||
/** const comment */
|
||||
const C = 0;
|
||||
|
||||
public $x;
|
||||
}
|
||||
|
||||
$rp = new ReflectionProperty('TestClass2', 'x');
|
||||
var_dump($rp->getDocComment());
|
||||
|
||||
?>
|
||||
--EXPECT--
|
||||
bool(false)
|
||||
bool(false)
|
||||
@@ -1,30 +0,0 @@
|
||||
--TEST--
|
||||
Bug #50255 (isset() and empty() silently casts array to object)
|
||||
--FILE--
|
||||
<?php
|
||||
|
||||
$arr = array('foo' => 'bar');
|
||||
|
||||
print "isset\n";
|
||||
var_dump(isset($arr->foo));
|
||||
var_dump(isset($arr->bar));
|
||||
var_dump(isset($arr['foo']));
|
||||
var_dump(isset($arr['bar']));
|
||||
print "empty\n";
|
||||
var_dump(empty($arr->foo));
|
||||
var_dump(empty($arr->bar));
|
||||
var_dump(empty($arr['foo']));
|
||||
var_dump(empty($arr['bar']));
|
||||
|
||||
?>
|
||||
--EXPECT--
|
||||
isset
|
||||
bool(false)
|
||||
bool(false)
|
||||
bool(true)
|
||||
bool(false)
|
||||
empty
|
||||
bool(true)
|
||||
bool(true)
|
||||
bool(false)
|
||||
bool(true)
|
||||
@@ -1,38 +0,0 @@
|
||||
--TEST--
|
||||
Bug #50261 (Crash When Calling Parent Constructor with call_user_func())
|
||||
--FILE--
|
||||
<?php
|
||||
|
||||
class testClass {
|
||||
function testClass($x) {
|
||||
echo __METHOD__, " (". $x . ")\n";
|
||||
}
|
||||
}
|
||||
|
||||
class testClass2 extends testClass {
|
||||
function __construct() {
|
||||
static $x = 0;
|
||||
|
||||
if ($x) {
|
||||
print "Infinite loop...\n";
|
||||
} else {
|
||||
$x++;
|
||||
|
||||
parent::__construct(1);
|
||||
testclass::__construct(2);
|
||||
call_user_func(array('parent', '__construct'), 3);
|
||||
call_user_func(array('testclass', '__construct'), 4);
|
||||
call_user_func(array('testclass', 'testclass'), 5);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
new testClass2;
|
||||
|
||||
?>
|
||||
--EXPECT--
|
||||
testClass::testClass (1)
|
||||
testClass::testClass (2)
|
||||
testClass::testClass (3)
|
||||
testClass::testClass (4)
|
||||
testClass::testClass (5)
|
||||
@@ -1,24 +0,0 @@
|
||||
--TEST--
|
||||
Bug #50394: Reference argument converted to value in __call
|
||||
--FILE--
|
||||
<?php
|
||||
function inc( &$x ) { $x++; }
|
||||
|
||||
class Proxy {
|
||||
function __call( $name, $args ) {
|
||||
echo "$name called!\n";
|
||||
call_user_func_array( 'inc', $args );
|
||||
}
|
||||
}
|
||||
|
||||
$arg = 1;
|
||||
$args = array( &$arg );
|
||||
$proxy = new Proxy;
|
||||
call_user_func_array( array( $proxy, 'bar' ), $args );
|
||||
call_user_func_array( array( $proxy, 'bar' ), array(&$arg) );
|
||||
var_dump($arg);
|
||||
--EXPECT--
|
||||
bar called!
|
||||
bar called!
|
||||
int(3)
|
||||
|
||||
@@ -1,18 +0,0 @@
|
||||
--TEST--
|
||||
Calling non-static method with call_user_func()
|
||||
--FILE--
|
||||
<?php
|
||||
|
||||
class foo {
|
||||
public function teste() {
|
||||
$this->a = 1;
|
||||
}
|
||||
}
|
||||
|
||||
call_user_func(array('foo', 'teste'));
|
||||
|
||||
?>
|
||||
--EXPECTF--
|
||||
Strict Standards: call_user_func() expects parameter 1 to be a valid callback, non-static method foo::teste() should not be called statically in %s on line %d
|
||||
|
||||
Fatal error: Using $this when not in object context in %s on line %d
|
||||
@@ -1,35 +0,0 @@
|
||||
--TEST--
|
||||
Passing Closure as parameter to an non-existent function
|
||||
--FILE--
|
||||
<?php
|
||||
|
||||
class foo {
|
||||
public static function __callstatic($x, $y) {
|
||||
var_dump($x,$y);
|
||||
return 1;
|
||||
}
|
||||
|
||||
public function teste() {
|
||||
return foo::x(function &($a=1,$b) { });
|
||||
}
|
||||
}
|
||||
|
||||
var_dump(call_user_func(array('foo', 'teste')));
|
||||
|
||||
?>
|
||||
--EXPECTF--
|
||||
Strict Standards: call_user_func() expects parameter 1 to be a valid callback, non-static method foo::teste() should not be called statically in %s on line %d
|
||||
%string|unicode%(1) "x"
|
||||
array(1) {
|
||||
[0]=>
|
||||
object(Closure)#%d (1) {
|
||||
["parameter"]=>
|
||||
array(2) {
|
||||
["$a"]=>
|
||||
string(10) "<required>"
|
||||
["$b"]=>
|
||||
string(10) "<required>"
|
||||
}
|
||||
}
|
||||
}
|
||||
int(1)
|
||||
@@ -1,18 +0,0 @@
|
||||
--TEST--
|
||||
Check call to non-ref function with call-time refs
|
||||
--FILE--
|
||||
<?php
|
||||
function my_errorhandler($errno,$errormsg) {
|
||||
global $my_var;
|
||||
$my_var=0x12345;
|
||||
echo $errormsg."\n";
|
||||
return true;
|
||||
}
|
||||
$oldhandler = set_error_handler("my_errorhandler");
|
||||
$my_var = str_repeat("A",64);
|
||||
$data = call_user_func_array("substr_replace",array(&$my_var, new StdClass(),1));
|
||||
echo "OK!";
|
||||
--EXPECT--
|
||||
Object of class stdClass could not be converted to string
|
||||
Object of class stdClass to string conversion
|
||||
OK!
|
||||
@@ -1,31 +0,0 @@
|
||||
--TEST--
|
||||
Testing recursion detection with Closures
|
||||
--FILE--
|
||||
<?php
|
||||
|
||||
$x = function () use (&$x) {
|
||||
$h = function () use ($x) {
|
||||
var_dump($x);
|
||||
return 1;
|
||||
};
|
||||
return $h();
|
||||
};
|
||||
|
||||
var_dump($x());
|
||||
|
||||
?>
|
||||
--EXPECTF--
|
||||
object(Closure)#%d (1) {
|
||||
["static"]=>
|
||||
array(1) {
|
||||
[%u|b%"x"]=>
|
||||
&object(Closure)#%d (1) {
|
||||
["static"]=>
|
||||
array(1) {
|
||||
[%u|b%"x"]=>
|
||||
*RECURSION*
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
int(1)
|
||||
@@ -16,5 +16,5 @@ class test implements test1, test2 {
|
||||
|
||||
echo "Done\n";
|
||||
?>
|
||||
--EXPECTF--
|
||||
Fatal error: Cannot inherit previously-inherited or override constant FOO from interface test2 in %s on line %d
|
||||
--EXPECTF--
|
||||
Fatal error: Cannot inherit previously-inherited constant FOO from interface test2 in %s on line %d
|
||||
@@ -15,4 +15,4 @@ class foobar implements foo {
|
||||
}
|
||||
?>
|
||||
--EXPECTF--
|
||||
Fatal error: Cannot inherit previously-inherited or override constant foo from interface foo in %s on line %d
|
||||
Fatal error: Cannot inherit previously-inherited constant foo from interface foo in %s on line %d
|
||||
@@ -19,7 +19,7 @@ echo $HTTP_SESSION_VARS;
|
||||
echo "\nok\n";
|
||||
?>
|
||||
--EXPECTF--
|
||||
Warning: Directive 'register_long_arrays' is deprecated in PHP %d.%d and greater in Unknown on line 0
|
||||
PHP Warning: Directive 'register_long_arrays' is deprecated in PHP %d.%d and greater in Unknown on line 0
|
||||
ok
|
||||
|
||||
Warning: session_start(): Cannot send session cookie - headers already sent by (output started at %sunset_cv05.php on line %d
|
||||
|
||||
@@ -19,7 +19,7 @@ echo $x;
|
||||
echo "ok\n";
|
||||
?>
|
||||
--EXPECTF--
|
||||
Warning: Directive 'register_globals' is deprecated in PHP %d.%d and greater in Unknown on line 0
|
||||
PHP Warning: Directive 'register_globals' is deprecated in PHP %d.%d and greater in Unknown on line 0
|
||||
1
|
||||
|
||||
Deprecated: Function session_register() is deprecated in %s on line %d
|
||||
|
||||
+3
-9
@@ -1067,15 +1067,9 @@ ZEND_API void zend_error(int type, const char *format, ...) /* {{{ */
|
||||
if (!EG(active_symbol_table)) {
|
||||
zend_rebuild_symbol_table(TSRMLS_C);
|
||||
}
|
||||
|
||||
/* 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);
|
||||
}
|
||||
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;
|
||||
|
||||
@@ -710,11 +710,6 @@ END_EXTERN_C()
|
||||
FREE_ZVAL(pzv); \
|
||||
} \
|
||||
INIT_PZVAL(&(zv));
|
||||
|
||||
#define MAKE_COPY_ZVAL(ppzv, pzv) \
|
||||
*(pzv) = **(ppzv); \
|
||||
zval_copy_ctor((pzv)); \
|
||||
INIT_PZVAL((pzv));
|
||||
|
||||
#define REPLACE_ZVAL_VALUE(ppzv_dest, pzv_src, copy) { \
|
||||
int is_ref, refcount; \
|
||||
|
||||
+10
-48
@@ -2335,13 +2335,12 @@ ZEND_API int zend_disable_class(char *class_name, uint class_name_length TSRMLS_
|
||||
}
|
||||
/* }}} */
|
||||
|
||||
static int zend_is_callable_check_class(const char *name, int name_len, zend_fcall_info_cache *fcc, int *strict_class, char **error TSRMLS_DC) /* {{{ */
|
||||
static int zend_is_callable_check_class(const char *name, int name_len, zend_fcall_info_cache *fcc, char **error TSRMLS_DC) /* {{{ */
|
||||
{
|
||||
int ret = 0;
|
||||
zend_class_entry **pce;
|
||||
char *lcname = zend_str_tolower_dup(name, name_len);
|
||||
|
||||
*strict_class = 0;
|
||||
if (name_len == sizeof("self") - 1 &&
|
||||
!memcmp(lcname, "self", sizeof("self") - 1)) {
|
||||
if (!EG(scope)) {
|
||||
@@ -2366,7 +2365,6 @@ static int zend_is_callable_check_class(const char *name, int name_len, zend_fca
|
||||
if (!fcc->object_ptr) {
|
||||
fcc->object_ptr = EG(This);
|
||||
}
|
||||
*strict_class = 1;
|
||||
ret = 1;
|
||||
}
|
||||
} else if (name_len == sizeof("static") - 1 &&
|
||||
@@ -2379,7 +2377,6 @@ static int zend_is_callable_check_class(const char *name, int name_len, zend_fca
|
||||
if (!fcc->object_ptr) {
|
||||
fcc->object_ptr = EG(This);
|
||||
}
|
||||
*strict_class = 1;
|
||||
ret = 1;
|
||||
}
|
||||
} else if (zend_lookup_class_ex(name, name_len, 1, &pce TSRMLS_CC) == SUCCESS) {
|
||||
@@ -2394,7 +2391,6 @@ static int zend_is_callable_check_class(const char *name, int name_len, zend_fca
|
||||
} else {
|
||||
fcc->called_scope = fcc->object_ptr ? Z_OBJCE_P(fcc->object_ptr) : fcc->calling_scope;
|
||||
}
|
||||
*strict_class = 1;
|
||||
ret = 1;
|
||||
} else {
|
||||
if (error) zend_spprintf(error, 0, "class '%.*s' not found", name_len, name);
|
||||
@@ -2405,7 +2401,7 @@ static int zend_is_callable_check_class(const char *name, int name_len, zend_fca
|
||||
/* }}} */
|
||||
|
||||
|
||||
static int zend_is_callable_check_func(int check_flags, zval *callable, zend_fcall_info_cache *fcc, int strict_class, char **error TSRMLS_DC) /* {{{ */
|
||||
static int zend_is_callable_check_func(int check_flags, zval *callable, zend_fcall_info_cache *fcc, char **error TSRMLS_DC) /* {{{ */
|
||||
{
|
||||
zend_class_entry *ce_org = fcc->calling_scope;
|
||||
int retval = 0;
|
||||
@@ -2463,7 +2459,7 @@ static int zend_is_callable_check_func(int check_flags, zval *callable, zend_fca
|
||||
EG(scope) = ce_org;
|
||||
}
|
||||
|
||||
if (!zend_is_callable_check_class(Z_STRVAL_P(callable), clen, fcc, &strict_class, error TSRMLS_CC)) {
|
||||
if (!zend_is_callable_check_class(Z_STRVAL_P(callable), clen, fcc, error TSRMLS_CC)) {
|
||||
EG(scope) = last_scope;
|
||||
return 0;
|
||||
}
|
||||
@@ -2490,15 +2486,7 @@ static int zend_is_callable_check_func(int check_flags, zval *callable, zend_fca
|
||||
}
|
||||
|
||||
lmname = zend_str_tolower_dup(mname, mlen);
|
||||
if (strict_class &&
|
||||
fcc->calling_scope &&
|
||||
mlen == sizeof(ZEND_CONSTRUCTOR_FUNC_NAME)-1 &&
|
||||
!memcmp(lmname, ZEND_CONSTRUCTOR_FUNC_NAME, sizeof(ZEND_CONSTRUCTOR_FUNC_NAME))) {
|
||||
fcc->function_handler = fcc->calling_scope->constructor;
|
||||
if (fcc->function_handler) {
|
||||
retval = 1;
|
||||
}
|
||||
} else if (zend_hash_find(ftable, lmname, mlen+1, (void**)&fcc->function_handler) == SUCCESS) {
|
||||
if (zend_hash_find(ftable, lmname, mlen+1, (void**)&fcc->function_handler) == SUCCESS) {
|
||||
retval = 1;
|
||||
if ((fcc->function_handler->op_array.fn_flags & ZEND_ACC_CHANGED) &&
|
||||
EG(scope) &&
|
||||
@@ -2532,36 +2520,11 @@ static int zend_is_callable_check_func(int check_flags, zval *callable, zend_fca
|
||||
} else {
|
||||
get_function_via_handler:
|
||||
if (fcc->object_ptr && fcc->calling_scope == ce_org) {
|
||||
if (strict_class && ce_org->__call) {
|
||||
fcc->function_handler = emalloc(sizeof(zend_internal_function));
|
||||
fcc->function_handler->internal_function.type = ZEND_INTERNAL_FUNCTION;
|
||||
fcc->function_handler->internal_function.module = ce_org->module;
|
||||
fcc->function_handler->internal_function.handler = zend_std_call_user_call;
|
||||
fcc->function_handler->internal_function.arg_info = NULL;
|
||||
fcc->function_handler->internal_function.num_args = 0;
|
||||
fcc->function_handler->internal_function.scope = ce_org;
|
||||
fcc->function_handler->internal_function.fn_flags = ZEND_ACC_CALL_VIA_HANDLER;
|
||||
fcc->function_handler->internal_function.function_name = estrndup(mname, mlen);
|
||||
fcc->function_handler->internal_function.pass_rest_by_reference = 0;
|
||||
fcc->function_handler->internal_function.return_reference = ZEND_RETURN_VALUE;
|
||||
call_via_handler = 1;
|
||||
retval = 1;
|
||||
} else if (Z_OBJ_HT_P(fcc->object_ptr)->get_method) {
|
||||
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) {
|
||||
if (strict_class &&
|
||||
(!fcc->function_handler->common.scope ||
|
||||
!instanceof_function(ce_org, fcc->function_handler->common.scope TSRMLS_CC))) {
|
||||
if ((fcc->function_handler->common.fn_flags & ZEND_ACC_CALL_VIA_HANDLER) != 0) {
|
||||
if (fcc->function_handler->type != ZEND_OVERLOADED_FUNCTION) {
|
||||
efree(fcc->function_handler->common.function_name);
|
||||
}
|
||||
efree(fcc->function_handler);
|
||||
}
|
||||
} else {
|
||||
retval = 1;
|
||||
call_via_handler = (fcc->function_handler->common.fn_flags & ZEND_ACC_CALL_VIA_HANDLER) != 0;
|
||||
}
|
||||
retval = 1;
|
||||
call_via_handler = (fcc->function_handler->common.fn_flags & ZEND_ACC_CALL_VIA_HANDLER) != 0;
|
||||
}
|
||||
}
|
||||
} else if (fcc->calling_scope) {
|
||||
@@ -2717,7 +2680,7 @@ ZEND_API zend_bool zend_is_callable_ex(zval *callable, zval *object_ptr, uint ch
|
||||
return 1;
|
||||
}
|
||||
|
||||
ret = zend_is_callable_check_func(check_flags, callable, fcc, 0, error TSRMLS_CC);
|
||||
ret = zend_is_callable_check_func(check_flags, callable, fcc, error TSRMLS_CC);
|
||||
if (fcc == &fcc_local &&
|
||||
fcc->function_handler &&
|
||||
((fcc->function_handler->type == ZEND_INTERNAL_FUNCTION &&
|
||||
@@ -2735,7 +2698,6 @@ ZEND_API zend_bool zend_is_callable_ex(zval *callable, zval *object_ptr, uint ch
|
||||
{
|
||||
zval **method = NULL;
|
||||
zval **obj = NULL;
|
||||
int strict_class = 0;
|
||||
|
||||
if (zend_hash_num_elements(Z_ARRVAL_P(callable)) == 2) {
|
||||
zend_hash_index_find(Z_ARRVAL_P(callable), 0, (void **) &obj);
|
||||
@@ -2763,7 +2725,7 @@ ZEND_API zend_bool zend_is_callable_ex(zval *callable, zval *object_ptr, uint ch
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (!zend_is_callable_check_class(Z_STRVAL_PP(obj), Z_STRLEN_PP(obj), fcc, &strict_class, error TSRMLS_CC)) {
|
||||
if (!zend_is_callable_check_class(Z_STRVAL_PP(obj), Z_STRLEN_PP(obj), fcc, error TSRMLS_CC)) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -2795,7 +2757,7 @@ ZEND_API zend_bool zend_is_callable_ex(zval *callable, zval *object_ptr, uint ch
|
||||
}
|
||||
}
|
||||
|
||||
ret = zend_is_callable_check_func(check_flags, *method, fcc, strict_class, error TSRMLS_CC);
|
||||
ret = zend_is_callable_check_func(check_flags, *method, fcc, error TSRMLS_CC);
|
||||
if (fcc == &fcc_local &&
|
||||
fcc->function_handler &&
|
||||
((fcc->function_handler->type == ZEND_INTERNAL_FUNCTION &&
|
||||
|
||||
@@ -152,9 +152,7 @@ static zval **zend_closure_get_property_ptr_ptr(zval *object, zval *member TSRML
|
||||
|
||||
static int zend_closure_has_property(zval *object, zval *member, int has_set_exists TSRMLS_DC) /* {{{ */
|
||||
{
|
||||
if (has_set_exists != 2) {
|
||||
ZEND_CLOSURE_PROPERTY_ERROR();
|
||||
}
|
||||
ZEND_CLOSURE_PROPERTY_ERROR();
|
||||
return 0;
|
||||
}
|
||||
/* }}} */
|
||||
|
||||
+4
-24
@@ -161,7 +161,6 @@ void zend_init_compiler_data_structures(TSRMLS_D) /* {{{ */
|
||||
CG(encoding_detector) = NULL;
|
||||
CG(encoding_converter) = NULL;
|
||||
CG(encoding_oddlen) = NULL;
|
||||
CG(encoding_declared) = 0;
|
||||
#endif /* ZEND_MULTIBYTE */
|
||||
}
|
||||
/* }}} */
|
||||
@@ -2876,8 +2875,8 @@ static zend_bool do_inherit_constant_check(HashTable *child_constants_table, con
|
||||
zval **old_constant;
|
||||
|
||||
if (zend_hash_quick_find(child_constants_table, hash_key->arKey, hash_key->nKeyLength, hash_key->h, (void**)&old_constant) == SUCCESS) {
|
||||
if (*old_constant != *parent_constant) {
|
||||
zend_error(E_COMPILE_ERROR, "Cannot inherit previously-inherited or override constant %s from interface %s", hash_key->arKey, iface->name);
|
||||
if (*old_constant != *parent_constant) {
|
||||
zend_error(E_COMPILE_ERROR, "Cannot inherit previously-inherited constant %s from interface %s", hash_key->arKey, iface->name);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
@@ -2885,16 +2884,6 @@ static zend_bool do_inherit_constant_check(HashTable *child_constants_table, con
|
||||
}
|
||||
/* }}} */
|
||||
|
||||
static int do_interface_constant_check(zval **val TSRMLS_DC, int num_args, va_list args, const zend_hash_key *key) /* {{{ */
|
||||
{
|
||||
zend_class_entry **iface = va_arg(args, zend_class_entry**);
|
||||
|
||||
do_inherit_constant_check(&(*iface)->constants_table, (const zval **) val, key, *iface);
|
||||
|
||||
return ZEND_HASH_APPLY_KEEP;
|
||||
}
|
||||
/* }}} */
|
||||
|
||||
ZEND_API void zend_do_implement_interface(zend_class_entry *ce, zend_class_entry *iface TSRMLS_DC) /* {{{ */
|
||||
{
|
||||
zend_uint i, ignore = 0;
|
||||
@@ -2913,10 +2902,7 @@ ZEND_API void zend_do_implement_interface(zend_class_entry *ce, zend_class_entry
|
||||
}
|
||||
}
|
||||
}
|
||||
if (ignore) {
|
||||
/* Check for attempt to redeclare interface constants */
|
||||
zend_hash_apply_with_arguments(&ce->constants_table TSRMLS_CC, (apply_func_args_t) do_interface_constant_check, 1, &iface);
|
||||
} else {
|
||||
if (!ignore) {
|
||||
if (ce->num_interfaces >= current_iface_num) {
|
||||
if (ce->type == ZEND_INTERNAL_CLASS) {
|
||||
ce->interfaces = (zend_class_entry **) realloc(ce->interfaces, sizeof(zend_class_entry *) * (++current_iface_num));
|
||||
@@ -3672,12 +3658,6 @@ void zend_do_declare_class_constant(znode *var_name, const znode *value TSRMLS_D
|
||||
zend_error(E_COMPILE_ERROR, "Cannot redefine class constant %s::%s", CG(active_class_entry)->name, var_name->u.constant.value.str.val);
|
||||
}
|
||||
FREE_PNODE(var_name);
|
||||
|
||||
if (CG(doc_comment)) {
|
||||
efree(CG(doc_comment));
|
||||
CG(doc_comment) = NULL;
|
||||
CG(doc_comment_len) = 0;
|
||||
}
|
||||
}
|
||||
/* }}} */
|
||||
|
||||
@@ -4664,7 +4644,7 @@ void zend_do_declare_stmt(znode *var, znode *val TSRMLS_DC) /* {{{ */
|
||||
--num;
|
||||
}
|
||||
|
||||
if (num > 0) {
|
||||
if (num > 0 || CG(encoding_declared)) {
|
||||
zend_error(E_COMPILE_ERROR, "Encoding declaration pragma must be the very first statement in the script");
|
||||
}
|
||||
}
|
||||
|
||||
+1
-1
@@ -228,7 +228,7 @@ static inline void *zend_vm_stack_alloc(size_t size TSRMLS_DC)
|
||||
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*) >
|
||||
(zend_uintptr_t)EG(argument_stack)->end - (zend_uintptr_t)EG(argument_stack)->top)) {
|
||||
EG(argument_stack)->end - EG(argument_stack)->top)) {
|
||||
zend_vm_stack_extend(size TSRMLS_CC);
|
||||
} else {
|
||||
void **old_top = EG(argument_stack)->top;
|
||||
|
||||
@@ -837,8 +837,7 @@ 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
|
||||
&& (EX(function_state).function->common.fn_flags & ZEND_ACC_CALL_VIA_HANDLER) == 0
|
||||
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]);
|
||||
@@ -1482,7 +1481,7 @@ void zend_unset_timeout(TSRMLS_D) /* {{{ */
|
||||
}
|
||||
#else
|
||||
# ifdef HAVE_SETITIMER
|
||||
if (EG(timeout_seconds)) {
|
||||
{
|
||||
struct itimerval no_timeout;
|
||||
|
||||
no_timeout.it_value.tv_sec = no_timeout.it_value.tv_usec = no_timeout.it_interval.tv_sec = no_timeout.it_interval.tv_usec = 0;
|
||||
|
||||
+2292
-2402
File diff suppressed because it is too large.
Load diff
+1
-27
@@ -105,17 +105,6 @@ ZEND_API ts_rsrc_id ini_scanner_globals_id;
|
||||
ZEND_API zend_ini_scanner_globals ini_scanner_globals;
|
||||
#endif
|
||||
|
||||
/* Eat leading whitespace */
|
||||
#define EAT_LEADING_WHITESPACE() \
|
||||
while (yytext[0]) { \
|
||||
if (yytext[0] == ' ' || yytext[0] == '\t') { \
|
||||
SCNG(yy_text)++; \
|
||||
yyleng--; \
|
||||
} else { \
|
||||
break; \
|
||||
} \
|
||||
}
|
||||
|
||||
/* Eat trailing whitespace + extra char */
|
||||
#define EAT_TRAILING_WHITESPACE_EX(ch) \
|
||||
while (yyleng > 0 && ( \
|
||||
@@ -337,7 +326,7 @@ NEWLINE ("\r"|"\n"|"\r\n")
|
||||
TABS_AND_SPACES [ \t]
|
||||
WHITESPACE [ \t]+
|
||||
CONSTANT [a-zA-Z][a-zA-Z0-9_]*
|
||||
LABEL [^=\n\r\t;|&$~(){}!"\[]+
|
||||
LABEL [^=\n\r\t ;|&$~(){}!"\[]+
|
||||
TOKENS [:,.\[\]"'()|^&+-/*=%$!~<>?@{}]
|
||||
OPERATORS [&|~()!]
|
||||
DOLLAR_CURLY "${"
|
||||
@@ -378,9 +367,6 @@ SECTION_VALUE_CHARS ([^$\n\r;"'\]\\]|("\\"{ANY_CHAR})|{LITERAL_DOLLAR})
|
||||
}
|
||||
|
||||
<INITIAL>{LABEL}"["{TABS_AND_SPACES}* { /* Start of option with offset */
|
||||
/* Eat leading whitespace */
|
||||
EAT_LEADING_WHITESPACE();
|
||||
|
||||
/* Eat trailing whitespace and [ */
|
||||
EAT_TRAILING_WHITESPACE_EX('[');
|
||||
|
||||
@@ -401,12 +387,6 @@ SECTION_VALUE_CHARS ([^$\n\r;"'\]\\]|("\\"{ANY_CHAR})|{LITERAL_DOLLAR})
|
||||
}
|
||||
|
||||
<ST_VARNAME>{LABEL} { /* Variable name */
|
||||
/* Eat leading whitespace */
|
||||
EAT_LEADING_WHITESPACE();
|
||||
|
||||
/* Eat trailing whitespace */
|
||||
EAT_TRAILING_WHITESPACE();
|
||||
|
||||
RETURN_TOKEN(TC_VARNAME, yytext, yyleng);
|
||||
}
|
||||
|
||||
@@ -424,12 +404,6 @@ SECTION_VALUE_CHARS ([^$\n\r;"'\]\\]|("\\"{ANY_CHAR})|{LITERAL_DOLLAR})
|
||||
}
|
||||
|
||||
<INITIAL>{LABEL} { /* Get option name */
|
||||
/* Eat leading whitespace */
|
||||
EAT_LEADING_WHITESPACE();
|
||||
|
||||
/* Eat trailing whitespace */
|
||||
EAT_TRAILING_WHITESPACE();
|
||||
|
||||
RETURN_TOKEN(TC_LABEL, yytext, yyleng);
|
||||
}
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
/* Generated by re2c 0.13.5 on Tue Dec 8 12:24:52 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 {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
/* Generated by re2c 0.13.5 on Mon Nov 16 23:30:01 2009 */
|
||||
/* Generated by re2c 0.13.5 on Mon May 04 19:38:30 2009 */
|
||||
#line 1 "Zend/zend_language_scanner.l"
|
||||
/*
|
||||
+----------------------------------------------------------------------+
|
||||
@@ -685,12 +685,12 @@ ZEND_API int zend_multibyte_read_script(unsigned char *buf, size_t n TSRMLS_DC)
|
||||
{
|
||||
if (SCNG(script_org)) {
|
||||
efree(SCNG(script_org));
|
||||
SCNG(script_org) = NULL;
|
||||
}
|
||||
SCNG(script_org_size) = n;
|
||||
SCNG(script_org_size) = n;
|
||||
SCNG(script_org) = (unsigned char*)erealloc(SCNG(script_org), SCNG(script_org_size));
|
||||
memcpy(SCNG(script_org) + SCNG(script_org_size) - n, buf, n);
|
||||
|
||||
SCNG(script_org) = (unsigned char*)emalloc(SCNG(script_org_size) + 1);
|
||||
memcpy(SCNG(script_org), buf, n);
|
||||
SCNG(script_org) = (unsigned char*)erealloc(SCNG(script_org), SCNG(script_org_size) + 1);
|
||||
*(SCNG(script_org)+SCNG(script_org_size)) = '\0';
|
||||
|
||||
return 0;
|
||||
|
||||
@@ -683,12 +683,12 @@ ZEND_API int zend_multibyte_read_script(unsigned char *buf, size_t n TSRMLS_DC)
|
||||
{
|
||||
if (SCNG(script_org)) {
|
||||
efree(SCNG(script_org));
|
||||
SCNG(script_org) = NULL;
|
||||
}
|
||||
SCNG(script_org_size) = n;
|
||||
SCNG(script_org_size) = n;
|
||||
SCNG(script_org) = (unsigned char*)erealloc(SCNG(script_org), SCNG(script_org_size));
|
||||
memcpy(SCNG(script_org) + SCNG(script_org_size) - n, buf, n);
|
||||
|
||||
SCNG(script_org) = (unsigned char*)emalloc(SCNG(script_org_size) + 1);
|
||||
memcpy(SCNG(script_org), buf, n);
|
||||
SCNG(script_org) = (unsigned char*)erealloc(SCNG(script_org), SCNG(script_org_size) + 1);
|
||||
*(SCNG(script_org)+SCNG(script_org_size)) = '\0';
|
||||
|
||||
return 0;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
/* Generated by re2c 0.13.5 on Thu Sep 10 15:34:33 2009 */
|
||||
/* Generated by re2c 0.13.5 on Mon May 04 19:38:30 2009 */
|
||||
#line 3 "Zend/zend_language_scanner_defs.h"
|
||||
|
||||
enum YYCONDTYPE {
|
||||
|
||||
@@ -1227,12 +1227,6 @@ ZEND_API int concat_function(zval *result, zval *op1, zval *op2 TSRMLS_DC) /* {{
|
||||
if (result==op1) { /* special case, perform operations on result */
|
||||
uint res_len = Z_STRLEN_P(op1) + Z_STRLEN_P(op2);
|
||||
|
||||
if (Z_STRLEN_P(result) < 0 || (int) (Z_STRLEN_P(op1) + Z_STRLEN_P(op2)) < 0) {
|
||||
efree(Z_STRVAL_P(result));
|
||||
ZVAL_EMPTY_STRING(result);
|
||||
zend_error(E_ERROR, "String size overflow");
|
||||
}
|
||||
|
||||
Z_STRVAL_P(result) = erealloc(Z_STRVAL_P(result), res_len+1);
|
||||
|
||||
memcpy(Z_STRVAL_P(result)+Z_STRLEN_P(result), Z_STRVAL_P(op2), Z_STRLEN_P(op2));
|
||||
|
||||
+9
-8
@@ -1100,7 +1100,7 @@ ZEND_VM_HANDLER(84, ZEND_FETCH_DIM_W, VAR|CV, CONST|TMP|VAR|UNUSED|CV)
|
||||
FREE_OP1_VAR_PTR();
|
||||
|
||||
/* We are going to assign the result by reference */
|
||||
if (opline->extended_value && EX_T(opline->result.u.var).var.ptr_ptr) {
|
||||
if (opline->extended_value) {
|
||||
Z_DELREF_PP(EX_T(opline->result.u.var).var.ptr_ptr);
|
||||
SEPARATE_ZVAL_TO_MAKE_IS_REF(EX_T(opline->result.u.var).var.ptr_ptr);
|
||||
Z_ADDREF_PP(EX_T(opline->result.u.var).var.ptr_ptr);
|
||||
@@ -3691,7 +3691,7 @@ ZEND_VM_HANDLER(78, ZEND_FE_FETCH, VAR, ANY)
|
||||
{
|
||||
zend_op *opline = EX(opline);
|
||||
zend_free_op free_op1;
|
||||
zval *array = EX_T(opline->op1.u.var).var.ptr;
|
||||
zval *array = GET_OP1_ZVAL_PTR(BP_VAR_R);
|
||||
zval **value;
|
||||
char *str_key;
|
||||
uint str_key_len;
|
||||
@@ -3701,6 +3701,8 @@ ZEND_VM_HANDLER(78, ZEND_FE_FETCH, VAR, ANY)
|
||||
int key_type = 0;
|
||||
zend_bool use_key = (zend_bool)(opline->extended_value & ZEND_FE_FETCH_WITH_KEY);
|
||||
|
||||
PZVAL_LOCK(array);
|
||||
|
||||
switch (zend_iterator_unwrap(array, &iter TSRMLS_CC)) {
|
||||
default:
|
||||
case ZEND_ITER_INVALID:
|
||||
@@ -3913,7 +3915,7 @@ ZEND_VM_HELPER_EX(zend_isset_isempty_dim_prop_obj_handler, VAR|UNUSED|CV, CONST|
|
||||
zend_free_op free_op2;
|
||||
zval *offset = GET_OP2_ZVAL_PTR(BP_VAR_R);
|
||||
|
||||
if (Z_TYPE_PP(container) == IS_ARRAY && !prop_dim) {
|
||||
if (Z_TYPE_PP(container) == IS_ARRAY) {
|
||||
HashTable *ht;
|
||||
int isset = 0;
|
||||
|
||||
@@ -4243,13 +4245,12 @@ ZEND_VM_HANDLER(144, ZEND_ADD_INTERFACE, ANY, CONST)
|
||||
zend_class_entry *ce = EX_T(opline->op1.u.var).class_entry;
|
||||
zend_class_entry *iface = zend_fetch_class(Z_STRVAL(opline->op2.u.constant), Z_STRLEN(opline->op2.u.constant), opline->extended_value TSRMLS_CC);
|
||||
|
||||
if (iface) {
|
||||
if (!(iface->ce_flags & ZEND_ACC_INTERFACE)) {
|
||||
zend_error_noreturn(E_ERROR, "%s cannot implement %s - it is not an interface", ce->name, iface->name);
|
||||
}
|
||||
zend_do_implement_interface(ce, iface TSRMLS_CC);
|
||||
if (!(iface->ce_flags & ZEND_ACC_INTERFACE)) {
|
||||
zend_error_noreturn(E_ERROR, "%s cannot implement %s - it is not an interface", ce->name, iface->name);
|
||||
}
|
||||
|
||||
zend_do_implement_interface(ce, iface TSRMLS_CC);
|
||||
|
||||
ZEND_VM_NEXT_OPCODE();
|
||||
}
|
||||
|
||||
|
||||
+30
-31
@@ -889,13 +889,12 @@ static int ZEND_FASTCALL ZEND_ADD_INTERFACE_SPEC_CONST_HANDLER(ZEND_OPCODE_HAND
|
||||
zend_class_entry *ce = EX_T(opline->op1.u.var).class_entry;
|
||||
zend_class_entry *iface = zend_fetch_class(Z_STRVAL(opline->op2.u.constant), Z_STRLEN(opline->op2.u.constant), opline->extended_value TSRMLS_CC);
|
||||
|
||||
if (iface) {
|
||||
if (!(iface->ce_flags & ZEND_ACC_INTERFACE)) {
|
||||
zend_error_noreturn(E_ERROR, "%s cannot implement %s - it is not an interface", ce->name, iface->name);
|
||||
}
|
||||
zend_do_implement_interface(ce, iface TSRMLS_CC);
|
||||
if (!(iface->ce_flags & ZEND_ACC_INTERFACE)) {
|
||||
zend_error_noreturn(E_ERROR, "%s cannot implement %s - it is not an interface", ce->name, iface->name);
|
||||
}
|
||||
|
||||
zend_do_implement_interface(ce, iface TSRMLS_CC);
|
||||
|
||||
ZEND_VM_NEXT_OPCODE();
|
||||
}
|
||||
|
||||
@@ -1332,7 +1331,6 @@ static int ZEND_FASTCALL zend_fetch_var_address_helper_SPEC_CONST(int type, ZEND
|
||||
|
||||
if (opline->op2.u.EA.type == ZEND_FETCH_STATIC_MEMBER) {
|
||||
retval = zend_std_get_static_property(EX_T(opline->op2.u.var).class_entry, Z_STRVAL_P(varname), Z_STRLEN_P(varname), 0 TSRMLS_CC);
|
||||
|
||||
} else {
|
||||
target_symbol_table = zend_get_target_symbol_table(opline, EX(Ts), type, varname TSRMLS_CC);
|
||||
/*
|
||||
@@ -8851,8 +8849,8 @@ static int ZEND_FASTCALL ZEND_FE_RESET_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARG
|
||||
static int ZEND_FASTCALL ZEND_FE_FETCH_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
|
||||
{
|
||||
zend_op *opline = EX(opline);
|
||||
|
||||
zval *array = EX_T(opline->op1.u.var).var.ptr;
|
||||
zend_free_op free_op1;
|
||||
zval *array = _get_zval_ptr_var(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC);
|
||||
zval **value;
|
||||
char *str_key;
|
||||
uint str_key_len;
|
||||
@@ -8862,6 +8860,8 @@ static int ZEND_FASTCALL ZEND_FE_FETCH_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARG
|
||||
int key_type = 0;
|
||||
zend_bool use_key = (zend_bool)(opline->extended_value & ZEND_FE_FETCH_WITH_KEY);
|
||||
|
||||
PZVAL_LOCK(array);
|
||||
|
||||
switch (zend_iterator_unwrap(array, &iter TSRMLS_CC)) {
|
||||
default:
|
||||
case ZEND_ITER_INVALID:
|
||||
@@ -9864,7 +9864,7 @@ static int ZEND_FASTCALL ZEND_FETCH_DIM_W_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HA
|
||||
if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
|
||||
|
||||
/* We are going to assign the result by reference */
|
||||
if (opline->extended_value && EX_T(opline->result.u.var).var.ptr_ptr) {
|
||||
if (opline->extended_value) {
|
||||
Z_DELREF_PP(EX_T(opline->result.u.var).var.ptr_ptr);
|
||||
SEPARATE_ZVAL_TO_MAKE_IS_REF(EX_T(opline->result.u.var).var.ptr_ptr);
|
||||
Z_ADDREF_PP(EX_T(opline->result.u.var).var.ptr_ptr);
|
||||
@@ -10804,7 +10804,7 @@ static int ZEND_FASTCALL zend_isset_isempty_dim_prop_obj_handler_SPEC_VAR_CONST(
|
||||
|
||||
zval *offset = &opline->op2.u.constant;
|
||||
|
||||
if (Z_TYPE_PP(container) == IS_ARRAY && !prop_dim) {
|
||||
if (Z_TYPE_PP(container) == IS_ARRAY) {
|
||||
HashTable *ht;
|
||||
int isset = 0;
|
||||
|
||||
@@ -11667,7 +11667,7 @@ static int ZEND_FASTCALL ZEND_FETCH_DIM_W_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HAND
|
||||
if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
|
||||
|
||||
/* We are going to assign the result by reference */
|
||||
if (opline->extended_value && EX_T(opline->result.u.var).var.ptr_ptr) {
|
||||
if (opline->extended_value) {
|
||||
Z_DELREF_PP(EX_T(opline->result.u.var).var.ptr_ptr);
|
||||
SEPARATE_ZVAL_TO_MAKE_IS_REF(EX_T(opline->result.u.var).var.ptr_ptr);
|
||||
Z_ADDREF_PP(EX_T(opline->result.u.var).var.ptr_ptr);
|
||||
@@ -12553,7 +12553,7 @@ static int ZEND_FASTCALL zend_isset_isempty_dim_prop_obj_handler_SPEC_VAR_TMP(in
|
||||
zend_free_op free_op2;
|
||||
zval *offset = _get_zval_ptr_tmp(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC);
|
||||
|
||||
if (Z_TYPE_PP(container) == IS_ARRAY && !prop_dim) {
|
||||
if (Z_TYPE_PP(container) == IS_ARRAY) {
|
||||
HashTable *ht;
|
||||
int isset = 0;
|
||||
|
||||
@@ -13416,7 +13416,7 @@ static int ZEND_FASTCALL ZEND_FETCH_DIM_W_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HAND
|
||||
if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
|
||||
|
||||
/* We are going to assign the result by reference */
|
||||
if (opline->extended_value && EX_T(opline->result.u.var).var.ptr_ptr) {
|
||||
if (opline->extended_value) {
|
||||
Z_DELREF_PP(EX_T(opline->result.u.var).var.ptr_ptr);
|
||||
SEPARATE_ZVAL_TO_MAKE_IS_REF(EX_T(opline->result.u.var).var.ptr_ptr);
|
||||
Z_ADDREF_PP(EX_T(opline->result.u.var).var.ptr_ptr);
|
||||
@@ -14353,7 +14353,7 @@ static int ZEND_FASTCALL zend_isset_isempty_dim_prop_obj_handler_SPEC_VAR_VAR(in
|
||||
zend_free_op free_op2;
|
||||
zval *offset = _get_zval_ptr_var(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC);
|
||||
|
||||
if (Z_TYPE_PP(container) == IS_ARRAY && !prop_dim) {
|
||||
if (Z_TYPE_PP(container) == IS_ARRAY) {
|
||||
HashTable *ht;
|
||||
int isset = 0;
|
||||
|
||||
@@ -14756,7 +14756,7 @@ static int ZEND_FASTCALL ZEND_FETCH_DIM_W_SPEC_VAR_UNUSED_HANDLER(ZEND_OPCODE_H
|
||||
if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
|
||||
|
||||
/* We are going to assign the result by reference */
|
||||
if (opline->extended_value && EX_T(opline->result.u.var).var.ptr_ptr) {
|
||||
if (opline->extended_value) {
|
||||
Z_DELREF_PP(EX_T(opline->result.u.var).var.ptr_ptr);
|
||||
SEPARATE_ZVAL_TO_MAKE_IS_REF(EX_T(opline->result.u.var).var.ptr_ptr);
|
||||
Z_ADDREF_PP(EX_T(opline->result.u.var).var.ptr_ptr);
|
||||
@@ -15807,7 +15807,7 @@ static int ZEND_FASTCALL ZEND_FETCH_DIM_W_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDL
|
||||
if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
|
||||
|
||||
/* We are going to assign the result by reference */
|
||||
if (opline->extended_value && EX_T(opline->result.u.var).var.ptr_ptr) {
|
||||
if (opline->extended_value) {
|
||||
Z_DELREF_PP(EX_T(opline->result.u.var).var.ptr_ptr);
|
||||
SEPARATE_ZVAL_TO_MAKE_IS_REF(EX_T(opline->result.u.var).var.ptr_ptr);
|
||||
Z_ADDREF_PP(EX_T(opline->result.u.var).var.ptr_ptr);
|
||||
@@ -16739,7 +16739,7 @@ static int ZEND_FASTCALL zend_isset_isempty_dim_prop_obj_handler_SPEC_VAR_CV(int
|
||||
|
||||
zval *offset = _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC);
|
||||
|
||||
if (Z_TYPE_PP(container) == IS_ARRAY && !prop_dim) {
|
||||
if (Z_TYPE_PP(container) == IS_ARRAY) {
|
||||
HashTable *ht;
|
||||
int isset = 0;
|
||||
|
||||
@@ -17929,7 +17929,7 @@ static int ZEND_FASTCALL zend_isset_isempty_dim_prop_obj_handler_SPEC_UNUSED_CON
|
||||
|
||||
zval *offset = &opline->op2.u.constant;
|
||||
|
||||
if (Z_TYPE_PP(container) == IS_ARRAY && !prop_dim) {
|
||||
if (Z_TYPE_PP(container) == IS_ARRAY) {
|
||||
HashTable *ht;
|
||||
int isset = 0;
|
||||
|
||||
@@ -18986,7 +18986,7 @@ static int ZEND_FASTCALL zend_isset_isempty_dim_prop_obj_handler_SPEC_UNUSED_TMP
|
||||
zend_free_op free_op2;
|
||||
zval *offset = _get_zval_ptr_tmp(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC);
|
||||
|
||||
if (Z_TYPE_PP(container) == IS_ARRAY && !prop_dim) {
|
||||
if (Z_TYPE_PP(container) == IS_ARRAY) {
|
||||
HashTable *ht;
|
||||
int isset = 0;
|
||||
|
||||
@@ -20043,7 +20043,7 @@ static int ZEND_FASTCALL zend_isset_isempty_dim_prop_obj_handler_SPEC_UNUSED_VAR
|
||||
zend_free_op free_op2;
|
||||
zval *offset = _get_zval_ptr_var(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC);
|
||||
|
||||
if (Z_TYPE_PP(container) == IS_ARRAY && !prop_dim) {
|
||||
if (Z_TYPE_PP(container) == IS_ARRAY) {
|
||||
HashTable *ht;
|
||||
int isset = 0;
|
||||
|
||||
@@ -21359,7 +21359,7 @@ static int ZEND_FASTCALL zend_isset_isempty_dim_prop_obj_handler_SPEC_UNUSED_CV(
|
||||
|
||||
zval *offset = _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC);
|
||||
|
||||
if (Z_TYPE_PP(container) == IS_ARRAY && !prop_dim) {
|
||||
if (Z_TYPE_PP(container) == IS_ARRAY) {
|
||||
HashTable *ht;
|
||||
int isset = 0;
|
||||
|
||||
@@ -21711,7 +21711,6 @@ static int ZEND_FASTCALL zend_fetch_var_address_helper_SPEC_CV(int type, ZEND_OP
|
||||
|
||||
if (opline->op2.u.EA.type == ZEND_FETCH_STATIC_MEMBER) {
|
||||
retval = zend_std_get_static_property(EX_T(opline->op2.u.var).class_entry, Z_STRVAL_P(varname), Z_STRLEN_P(varname), 0 TSRMLS_CC);
|
||||
|
||||
} else {
|
||||
target_symbol_table = zend_get_target_symbol_table(opline, EX(Ts), type, varname TSRMLS_CC);
|
||||
/*
|
||||
@@ -23567,7 +23566,7 @@ static int ZEND_FASTCALL ZEND_FETCH_DIM_W_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HAN
|
||||
}
|
||||
|
||||
/* We are going to assign the result by reference */
|
||||
if (opline->extended_value && EX_T(opline->result.u.var).var.ptr_ptr) {
|
||||
if (opline->extended_value) {
|
||||
Z_DELREF_PP(EX_T(opline->result.u.var).var.ptr_ptr);
|
||||
SEPARATE_ZVAL_TO_MAKE_IS_REF(EX_T(opline->result.u.var).var.ptr_ptr);
|
||||
Z_ADDREF_PP(EX_T(opline->result.u.var).var.ptr_ptr);
|
||||
@@ -24345,7 +24344,7 @@ static int ZEND_FASTCALL zend_isset_isempty_dim_prop_obj_handler_SPEC_CV_CONST(i
|
||||
|
||||
zval *offset = &opline->op2.u.constant;
|
||||
|
||||
if (Z_TYPE_PP(container) == IS_ARRAY && !prop_dim) {
|
||||
if (Z_TYPE_PP(container) == IS_ARRAY) {
|
||||
HashTable *ht;
|
||||
int isset = 0;
|
||||
|
||||
@@ -25204,7 +25203,7 @@ static int ZEND_FASTCALL ZEND_FETCH_DIM_W_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDL
|
||||
}
|
||||
|
||||
/* We are going to assign the result by reference */
|
||||
if (opline->extended_value && EX_T(opline->result.u.var).var.ptr_ptr) {
|
||||
if (opline->extended_value) {
|
||||
Z_DELREF_PP(EX_T(opline->result.u.var).var.ptr_ptr);
|
||||
SEPARATE_ZVAL_TO_MAKE_IS_REF(EX_T(opline->result.u.var).var.ptr_ptr);
|
||||
Z_ADDREF_PP(EX_T(opline->result.u.var).var.ptr_ptr);
|
||||
@@ -25985,7 +25984,7 @@ static int ZEND_FASTCALL zend_isset_isempty_dim_prop_obj_handler_SPEC_CV_TMP(int
|
||||
zend_free_op free_op2;
|
||||
zval *offset = _get_zval_ptr_tmp(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC);
|
||||
|
||||
if (Z_TYPE_PP(container) == IS_ARRAY && !prop_dim) {
|
||||
if (Z_TYPE_PP(container) == IS_ARRAY) {
|
||||
HashTable *ht;
|
||||
int isset = 0;
|
||||
|
||||
@@ -26844,7 +26843,7 @@ static int ZEND_FASTCALL ZEND_FETCH_DIM_W_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDL
|
||||
}
|
||||
|
||||
/* We are going to assign the result by reference */
|
||||
if (opline->extended_value && EX_T(opline->result.u.var).var.ptr_ptr) {
|
||||
if (opline->extended_value) {
|
||||
Z_DELREF_PP(EX_T(opline->result.u.var).var.ptr_ptr);
|
||||
SEPARATE_ZVAL_TO_MAKE_IS_REF(EX_T(opline->result.u.var).var.ptr_ptr);
|
||||
Z_ADDREF_PP(EX_T(opline->result.u.var).var.ptr_ptr);
|
||||
@@ -27675,7 +27674,7 @@ static int ZEND_FASTCALL zend_isset_isempty_dim_prop_obj_handler_SPEC_CV_VAR(int
|
||||
zend_free_op free_op2;
|
||||
zval *offset = _get_zval_ptr_var(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC);
|
||||
|
||||
if (Z_TYPE_PP(container) == IS_ARRAY && !prop_dim) {
|
||||
if (Z_TYPE_PP(container) == IS_ARRAY) {
|
||||
HashTable *ht;
|
||||
int isset = 0;
|
||||
|
||||
@@ -28074,7 +28073,7 @@ static int ZEND_FASTCALL ZEND_FETCH_DIM_W_SPEC_CV_UNUSED_HANDLER(ZEND_OPCODE_HA
|
||||
}
|
||||
|
||||
/* We are going to assign the result by reference */
|
||||
if (opline->extended_value && EX_T(opline->result.u.var).var.ptr_ptr) {
|
||||
if (opline->extended_value) {
|
||||
Z_DELREF_PP(EX_T(opline->result.u.var).var.ptr_ptr);
|
||||
SEPARATE_ZVAL_TO_MAKE_IS_REF(EX_T(opline->result.u.var).var.ptr_ptr);
|
||||
Z_ADDREF_PP(EX_T(opline->result.u.var).var.ptr_ptr);
|
||||
@@ -29026,7 +29025,7 @@ static int ZEND_FASTCALL ZEND_FETCH_DIM_W_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLE
|
||||
}
|
||||
|
||||
/* We are going to assign the result by reference */
|
||||
if (opline->extended_value && EX_T(opline->result.u.var).var.ptr_ptr) {
|
||||
if (opline->extended_value) {
|
||||
Z_DELREF_PP(EX_T(opline->result.u.var).var.ptr_ptr);
|
||||
SEPARATE_ZVAL_TO_MAKE_IS_REF(EX_T(opline->result.u.var).var.ptr_ptr);
|
||||
Z_ADDREF_PP(EX_T(opline->result.u.var).var.ptr_ptr);
|
||||
@@ -29852,7 +29851,7 @@ static int ZEND_FASTCALL zend_isset_isempty_dim_prop_obj_handler_SPEC_CV_CV(int
|
||||
|
||||
zval *offset = _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC);
|
||||
|
||||
if (Z_TYPE_PP(container) == IS_ARRAY && !prop_dim) {
|
||||
if (Z_TYPE_PP(container) == IS_ARRAY) {
|
||||
HashTable *ht;
|
||||
int isset = 0;
|
||||
|
||||
|
||||
+6
-6
@@ -1688,7 +1688,7 @@ dnl PHP_BROKEN_GLIBC_FOPEN_APPEND
|
||||
dnl
|
||||
AC_DEFUN([PHP_BROKEN_GLIBC_FOPEN_APPEND], [
|
||||
AC_MSG_CHECKING([for broken libc stdio])
|
||||
AC_CACHE_VAL(_cv_have_broken_glibc_fopen_append,[
|
||||
AC_CACHE_VAL(have_broken_glibc_fopen_append,[
|
||||
AC_TRY_RUN([
|
||||
#include <stdio.h>
|
||||
int main(int argc, char *argv[])
|
||||
@@ -1714,8 +1714,8 @@ int main(int argc, char *argv[])
|
||||
return 0;
|
||||
}
|
||||
],
|
||||
[_cv_have_broken_glibc_fopen_append=no],
|
||||
[_cv_have_broken_glibc_fopen_append=yes ],
|
||||
[have_broken_glibc_fopen_append=no],
|
||||
[have_broken_glibc_fopen_append=yes ],
|
||||
AC_TRY_COMPILE([
|
||||
#include <features.h>
|
||||
],[
|
||||
@@ -1723,11 +1723,11 @@ AC_TRY_COMPILE([
|
||||
choke me
|
||||
#endif
|
||||
],
|
||||
[_cv_have_broken_glibc_fopen_append=yes],
|
||||
[_cv_have_broken_glibc_fopen_append=no ])
|
||||
[have_broken_glibc_fopen_append=yes],
|
||||
[have_broken_glibc_fopen_append=no ])
|
||||
)])
|
||||
|
||||
if test "$_cv_have_broken_glibc_fopen_append" = "yes"; then
|
||||
if test "$have_broken_glibc_fopen_append" = "yes"; then
|
||||
AC_MSG_RESULT(yes)
|
||||
AC_DEFINE(HAVE_BROKEN_GLIBC_FOPEN_APPEND,1, [Define if your glibc borks on fopen with mode a+])
|
||||
else
|
||||
|
||||
Vendored
+793
-899
File diff suppressed because it is too large.
Load diff
Vendored
+20
-80
@@ -1,10 +1,9 @@
|
||||
#! /bin/sh
|
||||
# Attempt to guess a canonical system name.
|
||||
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
|
||||
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
|
||||
# Free Software Foundation, Inc.
|
||||
# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
|
||||
|
||||
timestamp='2008-01-23'
|
||||
timestamp='2005-08-03'
|
||||
|
||||
# This file is free software; you can redistribute it and/or modify it
|
||||
# under the terms of the GNU General Public License as published by
|
||||
@@ -56,8 +55,8 @@ version="\
|
||||
GNU config.guess ($timestamp)
|
||||
|
||||
Originally written by Per Bothner.
|
||||
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
|
||||
2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
|
||||
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
|
||||
Free Software Foundation, Inc.
|
||||
|
||||
This is free software; see the source for copying conditions. There is NO
|
||||
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
|
||||
@@ -107,7 +106,7 @@ set_cc_for_build='
|
||||
trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
|
||||
trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
|
||||
: ${TMPDIR=/tmp} ;
|
||||
{ tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
|
||||
{ tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
|
||||
{ test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
|
||||
{ tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
|
||||
{ echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
|
||||
@@ -161,7 +160,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
|
||||
arm*) machine=arm-unknown ;;
|
||||
sh3el) machine=shl-unknown ;;
|
||||
sh3eb) machine=sh-unknown ;;
|
||||
sh5el) machine=sh5le-unknown ;;
|
||||
*) machine=${UNAME_MACHINE_ARCH}-unknown ;;
|
||||
esac
|
||||
# The Operating System including object format, if it has switched
|
||||
@@ -208,11 +206,8 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
|
||||
*:ekkoBSD:*:*)
|
||||
echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
|
||||
exit ;;
|
||||
*:SolidBSD:*:*)
|
||||
echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
|
||||
exit ;;
|
||||
macppc:MirBSD:*:*)
|
||||
echo powerpc-unknown-mirbsd${UNAME_RELEASE}
|
||||
echo powerppc-unknown-mirbsd${UNAME_RELEASE}
|
||||
exit ;;
|
||||
*:MirBSD:*:*)
|
||||
echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
|
||||
@@ -330,7 +325,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
|
||||
sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
|
||||
echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
|
||||
exit ;;
|
||||
i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
|
||||
i86pc:SunOS:5.*:*)
|
||||
echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
|
||||
exit ;;
|
||||
sun4*:SunOS:6*:*)
|
||||
@@ -532,7 +527,7 @@ EOF
|
||||
echo rs6000-ibm-aix3.2
|
||||
fi
|
||||
exit ;;
|
||||
*:AIX:*:[456])
|
||||
*:AIX:*:[45])
|
||||
IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
|
||||
if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
|
||||
IBM_ARCH=rs6000
|
||||
@@ -769,19 +764,12 @@ EOF
|
||||
echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
|
||||
exit ;;
|
||||
*:FreeBSD:*:*)
|
||||
case ${UNAME_MACHINE} in
|
||||
pc98)
|
||||
echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
|
||||
amd64)
|
||||
echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
|
||||
*)
|
||||
echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
|
||||
esac
|
||||
echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
|
||||
exit ;;
|
||||
i*:CYGWIN*:*)
|
||||
echo ${UNAME_MACHINE}-pc-cygwin
|
||||
exit ;;
|
||||
*:MINGW*:*)
|
||||
i*:MINGW*:*)
|
||||
echo ${UNAME_MACHINE}-pc-mingw32
|
||||
exit ;;
|
||||
i*:windows32*:*)
|
||||
@@ -791,18 +779,9 @@ EOF
|
||||
i*:PW*:*)
|
||||
echo ${UNAME_MACHINE}-pc-pw32
|
||||
exit ;;
|
||||
*:Interix*:[3456]*)
|
||||
case ${UNAME_MACHINE} in
|
||||
x86)
|
||||
echo i586-pc-interix${UNAME_RELEASE}
|
||||
exit ;;
|
||||
EM64T | authenticamd)
|
||||
echo x86_64-unknown-interix${UNAME_RELEASE}
|
||||
exit ;;
|
||||
IA64)
|
||||
echo ia64-unknown-interix${UNAME_RELEASE}
|
||||
exit ;;
|
||||
esac ;;
|
||||
x86:Interix*:[34]*)
|
||||
echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
|
||||
exit ;;
|
||||
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
|
||||
echo i${UNAME_MACHINE}-pc-mks
|
||||
exit ;;
|
||||
@@ -836,16 +815,6 @@ EOF
|
||||
echo ${UNAME_MACHINE}-pc-minix
|
||||
exit ;;
|
||||
arm*:Linux:*:*)
|
||||
eval $set_cc_for_build
|
||||
if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
|
||||
| grep -q __ARM_EABI__
|
||||
then
|
||||
echo ${UNAME_MACHINE}-unknown-linux-gnu
|
||||
else
|
||||
echo ${UNAME_MACHINE}-unknown-linux-gnueabi
|
||||
fi
|
||||
exit ;;
|
||||
avr32*:Linux:*:*)
|
||||
echo ${UNAME_MACHINE}-unknown-linux-gnu
|
||||
exit ;;
|
||||
cris:Linux:*:*)
|
||||
@@ -882,11 +851,7 @@ EOF
|
||||
#endif
|
||||
#endif
|
||||
EOF
|
||||
eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
|
||||
/^CPU/{
|
||||
s: ::g
|
||||
p
|
||||
}'`"
|
||||
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
|
||||
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
|
||||
;;
|
||||
mips64:Linux:*:*)
|
||||
@@ -905,11 +870,7 @@ EOF
|
||||
#endif
|
||||
#endif
|
||||
EOF
|
||||
eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
|
||||
/^CPU/{
|
||||
s: ::g
|
||||
p
|
||||
}'`"
|
||||
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
|
||||
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
|
||||
;;
|
||||
or32:Linux:*:*)
|
||||
@@ -958,15 +919,9 @@ EOF
|
||||
sparc:Linux:*:* | sparc64:Linux:*:*)
|
||||
echo ${UNAME_MACHINE}-unknown-linux-gnu
|
||||
exit ;;
|
||||
vax:Linux:*:*)
|
||||
echo ${UNAME_MACHINE}-dec-linux-gnu
|
||||
exit ;;
|
||||
x86_64:Linux:*:*)
|
||||
echo x86_64-unknown-linux-gnu
|
||||
exit ;;
|
||||
xtensa*:Linux:*:*)
|
||||
echo ${UNAME_MACHINE}-unknown-linux-gnu
|
||||
exit ;;
|
||||
i*86:Linux:*:*)
|
||||
# The BFD linker knows what the default object file format is, so
|
||||
# first see if it will tell us. cd to the root directory to prevent
|
||||
@@ -1009,7 +964,7 @@ EOF
|
||||
LIBC=gnulibc1
|
||||
# endif
|
||||
#else
|
||||
#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
|
||||
#ifdef __INTEL_COMPILER
|
||||
LIBC=gnu
|
||||
#else
|
||||
LIBC=gnuaout
|
||||
@@ -1019,11 +974,7 @@ EOF
|
||||
LIBC=dietlibc
|
||||
#endif
|
||||
EOF
|
||||
eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
|
||||
/^LIBC/{
|
||||
s: ::g
|
||||
p
|
||||
}'`"
|
||||
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
|
||||
test x"${LIBC}" != x && {
|
||||
echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
|
||||
exit
|
||||
@@ -1225,15 +1176,6 @@ EOF
|
||||
SX-6:SUPER-UX:*:*)
|
||||
echo sx6-nec-superux${UNAME_RELEASE}
|
||||
exit ;;
|
||||
SX-7:SUPER-UX:*:*)
|
||||
echo sx7-nec-superux${UNAME_RELEASE}
|
||||
exit ;;
|
||||
SX-8:SUPER-UX:*:*)
|
||||
echo sx8-nec-superux${UNAME_RELEASE}
|
||||
exit ;;
|
||||
SX-8R:SUPER-UX:*:*)
|
||||
echo sx8r-nec-superux${UNAME_RELEASE}
|
||||
exit ;;
|
||||
Power*:Rhapsody:*:*)
|
||||
echo powerpc-apple-rhapsody${UNAME_RELEASE}
|
||||
exit ;;
|
||||
@@ -1243,6 +1185,7 @@ EOF
|
||||
*:Darwin:*:*)
|
||||
UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
|
||||
case $UNAME_PROCESSOR in
|
||||
*86) UNAME_PROCESSOR=i686 ;;
|
||||
unknown) UNAME_PROCESSOR=powerpc ;;
|
||||
esac
|
||||
echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
|
||||
@@ -1321,9 +1264,6 @@ EOF
|
||||
i*86:skyos:*:*)
|
||||
echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
|
||||
exit ;;
|
||||
i*86:rdos:*:*)
|
||||
echo ${UNAME_MACHINE}-pc-rdos
|
||||
exit ;;
|
||||
esac
|
||||
|
||||
#echo '(No uname command or uname output not recognized.)' 1>&2
|
||||
@@ -1484,9 +1424,9 @@ This script, last modified $timestamp, has failed to recognize
|
||||
the operating system you are using. It is advised that you
|
||||
download the most up to date version of the config scripts from
|
||||
|
||||
http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
|
||||
http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
|
||||
and
|
||||
http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
|
||||
http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
|
||||
|
||||
If the version you run ($0) is already up to date, please
|
||||
send the following data and any information you think might be
|
||||
|
||||
Vendored
+37
-116
@@ -1,10 +1,9 @@
|
||||
#! /bin/sh
|
||||
# Configuration validation subroutine script.
|
||||
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
|
||||
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
|
||||
# Free Software Foundation, Inc.
|
||||
# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
|
||||
|
||||
timestamp='2008-01-16'
|
||||
timestamp='2005-07-08'
|
||||
|
||||
# This file is (in principle) common to ALL GNU software.
|
||||
# The presence of a machine in this file suggests that SOME GNU software
|
||||
@@ -72,8 +71,8 @@ Report bugs and patches to <config-patches@gnu.org>."
|
||||
version="\
|
||||
GNU config.sub ($timestamp)
|
||||
|
||||
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
|
||||
2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
|
||||
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
|
||||
Free Software Foundation, Inc.
|
||||
|
||||
This is free software; see the source for copying conditions. There is NO
|
||||
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
|
||||
@@ -120,9 +119,8 @@ esac
|
||||
# Here we must recognize all the valid KERNEL-OS combinations.
|
||||
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
|
||||
case $maybe_os in
|
||||
nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
|
||||
uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
|
||||
storm-chaos* | os2-emx* | rtmk-nova*)
|
||||
nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
|
||||
kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
|
||||
os=-$maybe_os
|
||||
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
|
||||
;;
|
||||
@@ -173,10 +171,6 @@ case $os in
|
||||
-hiux*)
|
||||
os=-hiuxwe2
|
||||
;;
|
||||
-sco6)
|
||||
os=-sco5v6
|
||||
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
|
||||
;;
|
||||
-sco5)
|
||||
os=-sco3.2v5
|
||||
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
|
||||
@@ -193,10 +187,6 @@ case $os in
|
||||
# Don't forget version if it is 3.2v4 or newer.
|
||||
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
|
||||
;;
|
||||
-sco5v6*)
|
||||
# Don't forget version if it is 3.2v4 or newer.
|
||||
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
|
||||
;;
|
||||
-sco*)
|
||||
os=-sco3.2v2
|
||||
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
|
||||
@@ -241,16 +231,15 @@ case $basic_machine in
|
||||
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
|
||||
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
|
||||
| am33_2.0 \
|
||||
| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
|
||||
| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
|
||||
| bfin \
|
||||
| c4x | clipper \
|
||||
| d10v | d30v | dlx | dsp16xx \
|
||||
| fido | fr30 | frv \
|
||||
| fr30 | frv \
|
||||
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
|
||||
| i370 | i860 | i960 | ia64 \
|
||||
| ip2k | iq2000 \
|
||||
| m32c | m32r | m32rle | m68000 | m68k | m88k \
|
||||
| maxq | mb | microblaze | mcore | mep \
|
||||
| m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
|
||||
| mips | mipsbe | mipseb | mipsel | mipsle \
|
||||
| mips16 \
|
||||
| mips64 | mips64el \
|
||||
@@ -268,27 +257,28 @@ case $basic_machine in
|
||||
| mipsisa64sr71k | mipsisa64sr71kel \
|
||||
| mipstx39 | mipstx39el \
|
||||
| mn10200 | mn10300 \
|
||||
| mt \
|
||||
| ms1 \
|
||||
| msp430 \
|
||||
| nios | nios2 \
|
||||
| ns16k | ns32k \
|
||||
| or32 \
|
||||
| pdp10 | pdp11 | pj | pjl \
|
||||
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
|
||||
| pyramid \
|
||||
| score \
|
||||
| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
|
||||
| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
|
||||
| sh64 | sh64le \
|
||||
| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
|
||||
| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
|
||||
| spu | strongarm \
|
||||
| sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
|
||||
| sparcv8 | sparcv9 | sparcv9b \
|
||||
| strongarm \
|
||||
| tahoe | thumb | tic4x | tic80 | tron \
|
||||
| v850 | v850e \
|
||||
| we32k \
|
||||
| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
|
||||
| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
|
||||
| z8k)
|
||||
basic_machine=$basic_machine-unknown
|
||||
;;
|
||||
m32c)
|
||||
basic_machine=$basic_machine-unknown
|
||||
;;
|
||||
m6811 | m68hc11 | m6812 | m68hc12)
|
||||
# Motorola 68HC11/12.
|
||||
basic_machine=$basic_machine-unknown
|
||||
@@ -296,9 +286,6 @@ case $basic_machine in
|
||||
;;
|
||||
m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
|
||||
;;
|
||||
ms1)
|
||||
basic_machine=mt-unknown
|
||||
;;
|
||||
|
||||
# We use `pc' rather than `unknown'
|
||||
# because (1) that's what they normally are, and
|
||||
@@ -318,18 +305,18 @@ case $basic_machine in
|
||||
| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
|
||||
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
|
||||
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
|
||||
| avr-* | avr32-* \
|
||||
| avr-* \
|
||||
| bfin-* | bs2000-* \
|
||||
| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
|
||||
| clipper-* | craynv-* | cydra-* \
|
||||
| d10v-* | d30v-* | dlx-* \
|
||||
| elxsi-* \
|
||||
| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
|
||||
| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
|
||||
| h8300-* | h8500-* \
|
||||
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
|
||||
| i*86-* | i860-* | i960-* | ia64-* \
|
||||
| ip2k-* | iq2000-* \
|
||||
| m32c-* | m32r-* | m32rle-* \
|
||||
| m32r-* | m32rle-* \
|
||||
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
|
||||
| m88110-* | m88k-* | maxq-* | mcore-* \
|
||||
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
|
||||
@@ -349,33 +336,30 @@ case $basic_machine in
|
||||
| mipsisa64sr71k-* | mipsisa64sr71kel-* \
|
||||
| mipstx39-* | mipstx39el-* \
|
||||
| mmix-* \
|
||||
| mt-* \
|
||||
| ms1-* \
|
||||
| msp430-* \
|
||||
| nios-* | nios2-* \
|
||||
| none-* | np1-* | ns16k-* | ns32k-* \
|
||||
| orion-* \
|
||||
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
|
||||
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
|
||||
| pyramid-* \
|
||||
| romp-* | rs6000-* \
|
||||
| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
|
||||
| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
|
||||
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
|
||||
| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
|
||||
| sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
|
||||
| sparclite-* \
|
||||
| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
|
||||
| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
|
||||
| tahoe-* | thumb-* \
|
||||
| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
|
||||
| tron-* \
|
||||
| v850-* | v850e-* | vax-* \
|
||||
| we32k-* \
|
||||
| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
|
||||
| xstormy16-* | xtensa*-* \
|
||||
| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
|
||||
| xstormy16-* | xtensa-* \
|
||||
| ymp-* \
|
||||
| z8k-*)
|
||||
;;
|
||||
# Recognize the basic CPU types without company name, with glob match.
|
||||
xtensa*)
|
||||
basic_machine=$basic_machine-unknown
|
||||
m32c-*)
|
||||
;;
|
||||
# Recognize the various machine names and aliases which stand
|
||||
# for a CPU type and a company and sometimes even an OS.
|
||||
@@ -447,14 +431,6 @@ case $basic_machine in
|
||||
basic_machine=ns32k-sequent
|
||||
os=-dynix
|
||||
;;
|
||||
blackfin)
|
||||
basic_machine=bfin-unknown
|
||||
os=-linux
|
||||
;;
|
||||
blackfin-*)
|
||||
basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
|
||||
os=-linux
|
||||
;;
|
||||
c90)
|
||||
basic_machine=c90-cray
|
||||
os=-unicos
|
||||
@@ -487,8 +463,8 @@ case $basic_machine in
|
||||
basic_machine=craynv-cray
|
||||
os=-unicosmp
|
||||
;;
|
||||
cr16)
|
||||
basic_machine=cr16-unknown
|
||||
cr16c)
|
||||
basic_machine=cr16c-unknown
|
||||
os=-elf
|
||||
;;
|
||||
crds | unos)
|
||||
@@ -680,14 +656,6 @@ case $basic_machine in
|
||||
basic_machine=m68k-isi
|
||||
os=-sysv
|
||||
;;
|
||||
m68knommu)
|
||||
basic_machine=m68k-unknown
|
||||
os=-linux
|
||||
;;
|
||||
m68knommu-*)
|
||||
basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
|
||||
os=-linux
|
||||
;;
|
||||
m88k-omron*)
|
||||
basic_machine=m88k-omron
|
||||
;;
|
||||
@@ -703,10 +671,6 @@ case $basic_machine in
|
||||
basic_machine=i386-pc
|
||||
os=-mingw32
|
||||
;;
|
||||
mingw32ce)
|
||||
basic_machine=arm-unknown
|
||||
os=-mingw32ce
|
||||
;;
|
||||
miniframe)
|
||||
basic_machine=m68000-convergent
|
||||
;;
|
||||
@@ -732,9 +696,6 @@ case $basic_machine in
|
||||
basic_machine=i386-pc
|
||||
os=-msdos
|
||||
;;
|
||||
ms1-*)
|
||||
basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
|
||||
;;
|
||||
mvs)
|
||||
basic_machine=i370-ibm
|
||||
os=-mvs
|
||||
@@ -833,14 +794,6 @@ case $basic_machine in
|
||||
basic_machine=i860-intel
|
||||
os=-osf
|
||||
;;
|
||||
parisc)
|
||||
basic_machine=hppa-unknown
|
||||
os=-linux
|
||||
;;
|
||||
parisc-*)
|
||||
basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
|
||||
os=-linux
|
||||
;;
|
||||
pbd)
|
||||
basic_machine=sparc-tti
|
||||
;;
|
||||
@@ -850,12 +803,6 @@ case $basic_machine in
|
||||
pc532 | pc532-*)
|
||||
basic_machine=ns32k-pc532
|
||||
;;
|
||||
pc98)
|
||||
basic_machine=i386-pc
|
||||
;;
|
||||
pc98-*)
|
||||
basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
|
||||
;;
|
||||
pentium | p5 | k5 | k6 | nexgen | viac3)
|
||||
basic_machine=i586-pc
|
||||
;;
|
||||
@@ -912,10 +859,6 @@ case $basic_machine in
|
||||
basic_machine=i586-unknown
|
||||
os=-pw32
|
||||
;;
|
||||
rdos)
|
||||
basic_machine=i386-pc
|
||||
os=-rdos
|
||||
;;
|
||||
rom68k)
|
||||
basic_machine=m68k-rom68k
|
||||
os=-coff
|
||||
@@ -942,10 +885,6 @@ case $basic_machine in
|
||||
sb1el)
|
||||
basic_machine=mipsisa64sb1el-unknown
|
||||
;;
|
||||
sde)
|
||||
basic_machine=mipsisa32-sde
|
||||
os=-elf
|
||||
;;
|
||||
sei)
|
||||
basic_machine=mips-sei
|
||||
os=-seiux
|
||||
@@ -957,9 +896,6 @@ case $basic_machine in
|
||||
basic_machine=sh-hitachi
|
||||
os=-hms
|
||||
;;
|
||||
sh5el)
|
||||
basic_machine=sh5le-unknown
|
||||
;;
|
||||
sh64)
|
||||
basic_machine=sh64-unknown
|
||||
;;
|
||||
@@ -1049,10 +985,6 @@ case $basic_machine in
|
||||
basic_machine=tic6x-unknown
|
||||
os=-coff
|
||||
;;
|
||||
tile*)
|
||||
basic_machine=tile-unknown
|
||||
os=-linux-gnu
|
||||
;;
|
||||
tx39)
|
||||
basic_machine=mipstx39-unknown
|
||||
;;
|
||||
@@ -1169,7 +1101,7 @@ case $basic_machine in
|
||||
sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
|
||||
basic_machine=sh-unknown
|
||||
;;
|
||||
sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
|
||||
sparc | sparcv8 | sparcv9 | sparcv9b)
|
||||
basic_machine=sparc-sun
|
||||
;;
|
||||
cydra)
|
||||
@@ -1242,23 +1174,21 @@ case $os in
|
||||
| -aos* \
|
||||
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
|
||||
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
|
||||
| -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
|
||||
| -openbsd* | -solidbsd* \
|
||||
| -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
|
||||
| -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
|
||||
| -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
|
||||
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
|
||||
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
|
||||
| -chorusos* | -chorusrdb* \
|
||||
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
|
||||
| -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
|
||||
| -uxpv* | -beos* | -mpeix* | -udk* \
|
||||
| -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
|
||||
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
|
||||
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
|
||||
| -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
|
||||
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
|
||||
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
|
||||
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
|
||||
| -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
|
||||
| -skyos* | -haiku*)
|
||||
# Remember, each alternative MUST END IN *, to match a version number.
|
||||
;;
|
||||
-qnx*)
|
||||
@@ -1410,12 +1340,6 @@ else
|
||||
# system, and we'll never get to this point.
|
||||
|
||||
case $basic_machine in
|
||||
score-*)
|
||||
os=-elf
|
||||
;;
|
||||
spu-*)
|
||||
os=-elf
|
||||
;;
|
||||
*-acorn)
|
||||
os=-riscix1.2
|
||||
;;
|
||||
@@ -1425,9 +1349,9 @@ case $basic_machine in
|
||||
arm*-semi)
|
||||
os=-aout
|
||||
;;
|
||||
c4x-* | tic4x-*)
|
||||
os=-coff
|
||||
;;
|
||||
c4x-* | tic4x-*)
|
||||
os=-coff
|
||||
;;
|
||||
# This must come before the *-dec entry.
|
||||
pdp10-*)
|
||||
os=-tops20
|
||||
@@ -1453,9 +1377,6 @@ case $basic_machine in
|
||||
m68*-cisco)
|
||||
os=-aout
|
||||
;;
|
||||
mep-*)
|
||||
os=-elf
|
||||
;;
|
||||
mips*-cisco)
|
||||
os=-elf
|
||||
;;
|
||||
|
||||
+31
-24
@@ -41,8 +41,8 @@ AC_CONFIG_HEADER(main/php_config.h)
|
||||
|
||||
PHP_MAJOR_VERSION=5
|
||||
PHP_MINOR_VERSION=3
|
||||
PHP_RELEASE_VERSION=2
|
||||
PHP_EXTRA_VERSION="RC1"
|
||||
PHP_RELEASE_VERSION=1
|
||||
PHP_EXTRA_VERSION="RC2"
|
||||
PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION"
|
||||
PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 10000 + [$]PHP_MINOR_VERSION \* 100 + [$]PHP_RELEASE_VERSION`
|
||||
|
||||
@@ -122,6 +122,21 @@ dnl or the contents of libs.
|
||||
$php_shtool mkdir -p libs
|
||||
rm -f libs/*
|
||||
|
||||
dnl Darwin 9 hack
|
||||
dnl Because the default debugging format used by Apple's GCC on Mac OS 10.5
|
||||
dnl causes errors in all current and past versions of Autoconf, we do a little
|
||||
dnl messing with the CFLAGS here to trick it.
|
||||
php_did_darwin9_cheat=0
|
||||
case $host_alias in
|
||||
*darwin9*)
|
||||
hasg=`echo $CFLAGS | grep -E '(^-g)|([[:space:]]-g)'`
|
||||
if test x"$hasg" = "x"; then
|
||||
php_did_darwin9_cheat=1
|
||||
CFLAGS="$CFLAGS -gstabs"
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
|
||||
dnl Checks for programs.
|
||||
dnl -------------------------------------------------------------------------
|
||||
|
||||
@@ -202,12 +217,7 @@ case $host_cpu in
|
||||
;;
|
||||
sparc*)
|
||||
if test "$SUNCC" = "yes"; then
|
||||
CFLAGS="$CFLAGS -xc99=all -xmemalign=8s"
|
||||
fi
|
||||
;;
|
||||
i386)
|
||||
if test "$SUNCC" = "yes"; then
|
||||
CFLAGS="$CFLAGS -xc99=all"
|
||||
CFLAGS="$CFLAGS -xmemalign=8s"
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
@@ -392,6 +402,9 @@ dnl Check for inet_aton
|
||||
dnl in -lc, -lbind and -lresolv
|
||||
PHP_CHECK_FUNC(inet_aton, resolv, bind)
|
||||
|
||||
dnl Some systems (like OpenSolaris) do not have nanosleep in libc
|
||||
PHP_CHECK_FUNC(nanosleep, rt)
|
||||
|
||||
dnl Then headers.
|
||||
dnl -------------------------------------------------------------------------
|
||||
|
||||
@@ -411,6 +424,7 @@ sys/time.h \
|
||||
netinet/in.h \
|
||||
alloca.h \
|
||||
arpa/inet.h \
|
||||
arpa/nameser_compat.h \
|
||||
arpa/nameser.h \
|
||||
assert.h \
|
||||
crypt.h \
|
||||
@@ -615,9 +629,6 @@ vasprintf \
|
||||
asprintf \
|
||||
)
|
||||
|
||||
dnl Some systems (like OpenSolaris) do not have nanosleep in libc
|
||||
AC_CACHE_CHECK([for nanosleep], ac_cv_func_nanosleep, [PHP_CHECK_FUNC_LIB(nanosleep, rt)])
|
||||
|
||||
dnl Check for getaddrinfo, should be a better way, but...
|
||||
dnl Also check for working getaddrinfo
|
||||
AC_CACHE_CHECK([for getaddrinfo], ac_cv_func_getaddrinfo,
|
||||
@@ -1160,7 +1171,6 @@ EXPANDED_PEAR_INSTALLDIR=`eval echo $PEAR_INSTALLDIR`
|
||||
EXPANDED_EXTENSION_DIR=`eval echo $EXTENSION_DIR`
|
||||
EXPANDED_LOCALSTATEDIR=`eval echo $localstatedir`
|
||||
EXPANDED_BINDIR=`eval echo $bindir`
|
||||
EXPANDED_SBINDIR=`eval echo $sbindir`
|
||||
EXPANDED_LIBDIR=$libdir
|
||||
EXPANDED_SYSCONFDIR=`eval echo $sysconfdir`
|
||||
EXPANDED_DATADIR=$datadir
|
||||
@@ -1176,7 +1186,6 @@ AC_SUBST(INCLUDE_PATH)
|
||||
AC_SUBST(EXPANDED_PEAR_INSTALLDIR)
|
||||
AC_SUBST(EXPANDED_EXTENSION_DIR)
|
||||
AC_SUBST(EXPANDED_BINDIR)
|
||||
AC_SUBST(EXPANDED_SBINDIR)
|
||||
AC_SUBST(EXPANDED_LIBDIR)
|
||||
AC_SUBST(EXPANDED_DATADIR)
|
||||
AC_SUBST(EXPANDED_SYSCONFDIR)
|
||||
@@ -1221,14 +1230,12 @@ if test "$PHP_CLI" != "no"; then
|
||||
PHP_INSTALL_CLI_TARGET="install-cli"
|
||||
PHP_ADD_SOURCES(sapi/cli, php_cli.c php_cli_readline.c,, cli)
|
||||
PHP_INSTALLED_SAPIS="cli $PHP_SAPI"
|
||||
PHP_EXECUTABLE="\$(top_builddir)/\$(SAPI_CLI_PATH)"
|
||||
else
|
||||
PHP_INSTALLED_SAPIS="$PHP_SAPI"
|
||||
fi
|
||||
|
||||
PHP_SUBST_OLD(PHP_INSTALLED_SAPIS)
|
||||
|
||||
PHP_SUBST(PHP_EXECUTABLE)
|
||||
PHP_SUBST(PHP_CLI_TARGET)
|
||||
PHP_SUBST(PHP_SAPI_OBJS)
|
||||
PHP_SUBST(PHP_CLI_OBJS)
|
||||
@@ -1245,7 +1252,6 @@ PHP_SUBST_OLD(php_abs_top_builddir)
|
||||
PHP_SUBST_OLD(php_abs_top_srcdir)
|
||||
|
||||
PHP_SUBST(bindir)
|
||||
PHP_SUBST(sbindir)
|
||||
PHP_SUBST(exec_prefix)
|
||||
PHP_SUBST_OLD(program_prefix)
|
||||
PHP_SUBST_OLD(program_suffix)
|
||||
@@ -1330,14 +1336,6 @@ PHP_CONFIGURE_PART(Configuring libtool)
|
||||
|
||||
LDFLAGS="$LDFLAGS $PHP_AIX_LDFLAGS"
|
||||
|
||||
dnl Autoconf 2.13's libtool checks go slightly nuts on Mac OS X 10.5 and 10.6.
|
||||
dnl This hack works around it. Ugly.
|
||||
case $host_alias in
|
||||
*darwin9*|*darwin10*)
|
||||
ac_cv_exeext=
|
||||
;;
|
||||
esac
|
||||
|
||||
dnl Only allow AC_PROG_CXX and AC_PROG_CXXCPP if they are explicitly called (by PHP_REQUIRE_CXX).
|
||||
dnl Otherwise AC_PROG_LIBTOOL fails if there is no working C++ compiler.
|
||||
AC_PROVIDE_IFELSE([PHP_REQUIRE_CXX], [], [
|
||||
@@ -1361,6 +1359,15 @@ SHARED_LIBTOOL='$(LIBTOOL)'
|
||||
|
||||
CC=$old_CC
|
||||
|
||||
dnl Finish the Darwin hack
|
||||
if test "$php_did_darwin9_cheat" -eq 1; then
|
||||
if test "$PHP_DEBUG" = "1"; then
|
||||
CFLAGS=`echo "$CFLAGS" | $SED -e 's/-gstabs/-g/g'`
|
||||
else
|
||||
CFLAGS=`echo "-O2 $CFLAGS" | $SED -e 's/-gstabs//g'`
|
||||
fi
|
||||
fi
|
||||
|
||||
PHP_CONFIGURE_PART(Generating files)
|
||||
|
||||
CXXFLAGS_CLEAN=$CXXFLAGS
|
||||
|
||||
@@ -309,7 +309,7 @@ ITypeInfo *php_com_locate_typeinfo(char *typelibname, php_com_dotnet_object *obj
|
||||
}
|
||||
} else if (typelibname) {
|
||||
/* Fetch the typelibrary and use that to look things up */
|
||||
typelib = php_com_load_typelib(typelibname, CP_THREAD_ACP TSRMLS_CC);
|
||||
typelib = php_com_load_typelib(typelibname, obj->code_page TSRMLS_CC);
|
||||
}
|
||||
|
||||
if (!gotguid && dispname && typelib) {
|
||||
|
||||
+1
-121
@@ -629,9 +629,6 @@ PHP_MINIT_FUNCTION(curl)
|
||||
REGISTER_CURL_CONSTANT(CURLINFO_REDIRECT_COUNT);
|
||||
REGISTER_CURL_CONSTANT(CURLINFO_HEADER_OUT);
|
||||
REGISTER_CURL_CONSTANT(CURLINFO_PRIVATE);
|
||||
#if LIBCURL_VERSION_NUM > 0x071301
|
||||
REGISTER_CURL_CONSTANT(CURLINFO_CERTINFO);
|
||||
#endif
|
||||
|
||||
/* cURL protocol constants (curl_version) */
|
||||
REGISTER_CURL_CONSTANT(CURL_VERSION_IPV6);
|
||||
@@ -748,11 +745,6 @@ PHP_MINIT_FUNCTION(curl)
|
||||
REGISTER_CURL_CONSTANT(CURLFTPSSL_ALL);
|
||||
#endif
|
||||
|
||||
#if LIBCURL_VERSION_NUM > 0x071301
|
||||
REGISTER_CURL_CONSTANT(CURLOPT_CERTINFO);
|
||||
REGISTER_CURL_CONSTANT(CURLOPT_POSTREDIR);
|
||||
#endif
|
||||
|
||||
/* SSH support works in 7.19.0+ using libssh2 */
|
||||
#if LIBCURL_VERSION_NUM >= 0x071300
|
||||
REGISTER_CURL_CONSTANT(CURLSSH_AUTH_NONE);
|
||||
@@ -1344,83 +1336,6 @@ static void alloc_curl_handle(php_curl **ch)
|
||||
}
|
||||
/* }}} */
|
||||
|
||||
#if LIBCURL_VERSION_NUM > 0x071301
|
||||
/* {{{ split_certinfo
|
||||
*/
|
||||
static void split_certinfo(char *string, zval *hash)
|
||||
{
|
||||
char *org = estrdup(string);
|
||||
char *s = org;
|
||||
char *split;
|
||||
|
||||
if(org) {
|
||||
do {
|
||||
char *key;
|
||||
char *val;
|
||||
char *tmp;
|
||||
|
||||
split = strstr(s, "; ");
|
||||
if(split)
|
||||
*split = '\0';
|
||||
|
||||
key = s;
|
||||
tmp = memchr(key, '=', 64);
|
||||
if(tmp) {
|
||||
*tmp = '\0';
|
||||
val = tmp+1;
|
||||
add_assoc_string(hash, key, val, 1);
|
||||
}
|
||||
s = split+2;
|
||||
} while(split);
|
||||
efree(org);
|
||||
}
|
||||
}
|
||||
|
||||
/* {{{ create_certinfo
|
||||
*/
|
||||
static void create_certinfo(struct curl_certinfo *ci, zval *listcode TSRMLS_DC)
|
||||
{
|
||||
int i;
|
||||
|
||||
if(ci) {
|
||||
zval *certhash = NULL;
|
||||
|
||||
for(i=0; i<ci->num_of_certs; i++) {
|
||||
struct curl_slist *slist;
|
||||
|
||||
MAKE_STD_ZVAL(certhash);
|
||||
array_init(certhash);
|
||||
for(slist = ci->certinfo[i]; slist; slist = slist->next) {
|
||||
int len;
|
||||
char s[64];
|
||||
char *tmp;
|
||||
strncpy(s, slist->data, 64);
|
||||
tmp = memchr(s, ':', 64);
|
||||
if(tmp) {
|
||||
*tmp = '\0';
|
||||
len = strlen(s);
|
||||
if(!strcmp(s, "Subject") || !strcmp(s, "Issuer")) {
|
||||
zval *hash;
|
||||
|
||||
MAKE_STD_ZVAL(hash);
|
||||
array_init(hash);
|
||||
|
||||
split_certinfo(&slist->data[len+1], hash);
|
||||
add_assoc_zval(certhash, s, hash);
|
||||
} else {
|
||||
add_assoc_string(certhash, s, &slist->data[len+1], 1);
|
||||
}
|
||||
} else {
|
||||
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not extract hash key from certificate info");
|
||||
}
|
||||
}
|
||||
add_next_index_zval(listcode, certhash);
|
||||
}
|
||||
}
|
||||
}
|
||||
/* }}} */
|
||||
#endif
|
||||
|
||||
/* {{{ proto resource curl_init([string url])
|
||||
Initialize a cURL session */
|
||||
PHP_FUNCTION(curl_init)
|
||||
@@ -1657,9 +1572,6 @@ static int _php_curl_setopt(php_curl *ch, long option, zval **zvalue, zval *retu
|
||||
#endif
|
||||
#if LIBCURL_VERSION_NUM >= 0x070f01
|
||||
case CURLOPT_FTP_FILEMETHOD:
|
||||
#endif
|
||||
#if LIBCURL_VERSION_NUM > 0x071301
|
||||
case CURLOPT_CERTINFO:
|
||||
#endif
|
||||
convert_to_long_ex(zvalue);
|
||||
#if LIBCURL_VERSION_NUM >= 0x71304
|
||||
@@ -1683,12 +1595,6 @@ static int _php_curl_setopt(php_curl *ch, long option, zval **zvalue, zval *retu
|
||||
}
|
||||
error = curl_easy_setopt(ch->cp, option, Z_LVAL_PP(zvalue));
|
||||
break;
|
||||
#if LIBCURL_VERSION_NUM > 0x071301
|
||||
case CURLOPT_POSTREDIR:
|
||||
convert_to_long_ex(zvalue);
|
||||
error = curl_easy_setopt(ch->cp, CURLOPT_POSTREDIR, Z_LVAL_PP(zvalue) & CURL_REDIR_POST_ALL);
|
||||
break;
|
||||
#endif
|
||||
case CURLOPT_PRIVATE:
|
||||
case CURLOPT_URL:
|
||||
case CURLOPT_PROXY:
|
||||
@@ -1946,7 +1852,7 @@ static int _php_curl_setopt(php_curl *ch, long option, zval **zvalue, zval *retu
|
||||
error = curl_formadd(&first, &last,
|
||||
CURLFORM_COPYNAME, string_key,
|
||||
CURLFORM_NAMELENGTH, (long)string_key_len - 1,
|
||||
CURLFORM_FILENAME, filename ? filename + sizeof(";filename=") - 1 : postval,
|
||||
CURLFORM_FILENAME, filename ? filename : postval,
|
||||
CURLFORM_CONTENTTYPE, type ? type + sizeof(";type=") - 1 : "application/octet-stream",
|
||||
CURLFORM_FILE, postval,
|
||||
CURLFORM_END);
|
||||
@@ -2215,10 +2121,6 @@ PHP_FUNCTION(curl_getinfo)
|
||||
char *s_code;
|
||||
long l_code;
|
||||
double d_code;
|
||||
#if LIBCURL_VERSION_NUM > 0x071301
|
||||
struct curl_certinfo *ci = NULL;
|
||||
zval *listcode;
|
||||
#endif
|
||||
|
||||
array_init(return_value);
|
||||
|
||||
@@ -2289,14 +2191,6 @@ PHP_FUNCTION(curl_getinfo)
|
||||
if (curl_easy_getinfo(ch->cp, CURLINFO_REDIRECT_TIME, &d_code) == CURLE_OK) {
|
||||
CAAD("redirect_time", d_code);
|
||||
}
|
||||
#if LIBCURL_VERSION_NUM > 0x071301
|
||||
if (curl_easy_getinfo(ch->cp, CURLINFO_CERTINFO, &ci) == CURLE_OK) {
|
||||
MAKE_STD_ZVAL(listcode);
|
||||
array_init(listcode);
|
||||
create_certinfo(ci, listcode TSRMLS_CC);
|
||||
CAAZ("certinfo", listcode);
|
||||
}
|
||||
#endif
|
||||
if (ch->header.str_len > 0) {
|
||||
CAAS("request_header", ch->header.str);
|
||||
}
|
||||
@@ -2356,20 +2250,6 @@ PHP_FUNCTION(curl_getinfo)
|
||||
} else {
|
||||
RETURN_FALSE;
|
||||
}
|
||||
#if LIBCURL_VERSION_NUM > 0x071301
|
||||
case CURLINFO_CERTINFO: {
|
||||
struct curl_certinfo *ci = NULL;
|
||||
|
||||
array_init(return_value);
|
||||
|
||||
if (curl_easy_getinfo(ch->cp, CURLINFO_CERTINFO, &ci) == CURLE_OK) {
|
||||
create_certinfo(ci, return_value TSRMLS_CC);
|
||||
} else {
|
||||
RETURN_FALSE;
|
||||
}
|
||||
break;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,13 +3,7 @@ Test curl_getinfo() function with basic functionality
|
||||
--CREDITS--
|
||||
Jean-Marc Fontaine <jmf@durcommefaire.net>
|
||||
--SKIPIF--
|
||||
<?php
|
||||
if (!extension_loaded("curl")) exit("skip curl extension not loaded");
|
||||
$curl_version = curl_version();
|
||||
if ($curl_version['version_number'] > 0x071201) {
|
||||
exit("skip: tests works only on older versions of curl");
|
||||
}
|
||||
?>
|
||||
<?php if (!extension_loaded("curl")) exit("skip curl extension not loaded"); ?>
|
||||
--FILE--
|
||||
<?php
|
||||
$ch = curl_init();
|
||||
@@ -18,7 +12,7 @@ if ($curl_version['version_number'] > 0x071201) {
|
||||
?>
|
||||
===DONE===
|
||||
--EXPECTF--
|
||||
array(2%d) {
|
||||
array(20) {
|
||||
[%u|b%"url"]=>
|
||||
string(0) ""
|
||||
["content_type"]=>
|
||||
|
||||
@@ -27,7 +27,7 @@ curl_close($ch);
|
||||
var_dump( $curl_content );
|
||||
?>
|
||||
--EXPECTF--
|
||||
Warning: Directive 'safe_mode' is deprecated in PHP 5.3 and greater in Unknown on line 0
|
||||
PHP Warning: Directive 'safe_mode' is deprecated in PHP 5.3 and greater in Unknown on line 0
|
||||
*** Testing curl_setopt with CURLOPT_FOLLOWLOCATION in safemode
|
||||
|
||||
Warning: curl_setopt(): CURLOPT_FOLLOWLOCATION cannot be activated when in safe_mode or an open_basedir is set in %s on line %d
|
||||
|
||||
@@ -16,8 +16,6 @@ PHP_ADD_INCLUDE([$ext_srcdir/lib])
|
||||
|
||||
PHP_INSTALL_HEADERS([ext/date], [php_date.h lib/timelib.h lib/timelib_structs.h lib/timelib_config.h])
|
||||
|
||||
AC_CHECK_FUNCS([llabs])
|
||||
|
||||
cat > $ext_builddir/lib/timelib_config.h <<EOF
|
||||
#ifdef PHP_WIN32
|
||||
# include "config.w32.h"
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
/* Generated by re2c 0.13.5 on Mon Dec 14 07:41:45 2009 */
|
||||
/* Generated by re2c 0.13.5 on Wed Jul 29 16:20:12 2009 */
|
||||
#line 1 "ext/date/lib/parse_date.re"
|
||||
/*
|
||||
+----------------------------------------------------------------------+
|
||||
@@ -24086,15 +24086,15 @@ timelib_time *timelib_parse_from_format(char *format, char *string, int len, tim
|
||||
add_pbf_error(s, "A two digit second could not be found", string, begin);
|
||||
}
|
||||
break;
|
||||
case 'u': /* up to six digit millisecond */
|
||||
case 'u': /* six digit millisecond */
|
||||
{
|
||||
double f;
|
||||
char *tptr;
|
||||
|
||||
TIMELIB_CHECK_NUMBER;
|
||||
tptr = ptr;
|
||||
if ((f = timelib_get_nr((char **) &ptr, 6)) == TIMELIB_UNSET || (ptr - tptr) < 1) {
|
||||
add_pbf_error(s, "At least a single digit millisecond could not be found", string, begin);
|
||||
if ((f = timelib_get_nr((char **) &ptr, 6)) == TIMELIB_UNSET || ptr - tptr != 6) {
|
||||
add_pbf_error(s, "A six digit millisecond could not be found", string, begin);
|
||||
} else {
|
||||
s->time->f = (f / 1000000);
|
||||
}
|
||||
|
||||
@@ -1943,15 +1943,15 @@ timelib_time *timelib_parse_from_format(char *format, char *string, int len, tim
|
||||
add_pbf_error(s, "A two digit second could not be found", string, begin);
|
||||
}
|
||||
break;
|
||||
case 'u': /* up to six digit millisecond */
|
||||
case 'u': /* six digit millisecond */
|
||||
{
|
||||
double f;
|
||||
char *tptr;
|
||||
|
||||
TIMELIB_CHECK_NUMBER;
|
||||
tptr = ptr;
|
||||
if ((f = timelib_get_nr((char **) &ptr, 6)) == TIMELIB_UNSET || (ptr - tptr) < 1) {
|
||||
add_pbf_error(s, "At least a single digit millisecond could not be found", string, begin);
|
||||
if ((f = timelib_get_nr((char **) &ptr, 6)) == TIMELIB_UNSET || ptr - tptr != 6) {
|
||||
add_pbf_error(s, "A six digit millisecond could not be found", string, begin);
|
||||
} else {
|
||||
s->time->f = (f / 1000000);
|
||||
}
|
||||
|
||||
+755
-705
File diff suppressed because it is too large.
Load diff
+5
-10
@@ -35,12 +35,12 @@
|
||||
# include "win32/php_stdint.h"
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_LLABS
|
||||
# if defined(__GNUC__) && __GNUC__ < 3
|
||||
#if defined(__GNUC__) && __GNUC__ < 3
|
||||
static __inline __int64_t llabs( __int64_t i ) { return i >= 0 ? i : -i; }
|
||||
# elif defined(NETWARE) && defined(__MWERKS__)
|
||||
#endif
|
||||
|
||||
#if defined(NETWARE) && defined(__MWERKS__)
|
||||
static __inline long long llabs( long long i ) { return i >= 0 ? i : -i; }
|
||||
# endif
|
||||
#endif
|
||||
|
||||
/* {{{ arginfo */
|
||||
@@ -619,7 +619,6 @@ PHP_RINIT_FUNCTION(date)
|
||||
}
|
||||
DATEG(timezone) = NULL;
|
||||
DATEG(tzcache) = NULL;
|
||||
DATEG(last_errors) = NULL;
|
||||
|
||||
return SUCCESS;
|
||||
}
|
||||
@@ -637,11 +636,6 @@ PHP_RSHUTDOWN_FUNCTION(date)
|
||||
FREE_HASHTABLE(DATEG(tzcache));
|
||||
DATEG(tzcache) = NULL;
|
||||
}
|
||||
if (DATEG(last_errors)) {
|
||||
timelib_error_container_dtor(DATEG(last_errors));
|
||||
DATEG(last_errors) = NULL;
|
||||
}
|
||||
|
||||
return SUCCESS;
|
||||
}
|
||||
/* }}} */
|
||||
@@ -783,6 +777,7 @@ PHP_MINIT_FUNCTION(date)
|
||||
|
||||
php_date_global_timezone_db = NULL;
|
||||
php_date_global_timezone_db_enabled = 0;
|
||||
|
||||
DATEG(last_errors) = NULL;
|
||||
return SUCCESS;
|
||||
}
|
||||
|
||||
@@ -13,24 +13,816 @@ echo "*** Testing DateTimeZone::listIdentifiers() : basic functionality ***\n";
|
||||
//Set the default time zone
|
||||
date_default_timezone_set("GMT");
|
||||
|
||||
$zones = DateTimeZone::listIdentifiers();
|
||||
echo "Check return tpe is ARRAY\n";
|
||||
var_dump(is_array($zones));
|
||||
|
||||
echo "Check array contains some common timezones\n";
|
||||
var_dump(in_array("Europe/London", $zones));
|
||||
var_dump(in_array("America/New_York", $zones));
|
||||
var_dump(in_array("UTC", $zones));
|
||||
var_dump( DateTimeZone::listIdentifiers() );
|
||||
|
||||
?>
|
||||
===DONE===
|
||||
--EXPECT--
|
||||
*** Testing DateTimeZone::listIdentifiers() : basic functionality ***
|
||||
Check return tpe is ARRAY
|
||||
bool(true)
|
||||
Check array contains some common timezones
|
||||
bool(true)
|
||||
bool(true)
|
||||
bool(true)
|
||||
===DONE===
|
||||
|
||||
array(402) {
|
||||
[0]=>
|
||||
string(14) "Africa/Abidjan"
|
||||
[1]=>
|
||||
string(12) "Africa/Accra"
|
||||
[2]=>
|
||||
string(18) "Africa/Addis_Ababa"
|
||||
[3]=>
|
||||
string(14) "Africa/Algiers"
|
||||
[4]=>
|
||||
string(13) "Africa/Asmara"
|
||||
[5]=>
|
||||
string(13) "Africa/Bamako"
|
||||
[6]=>
|
||||
string(13) "Africa/Bangui"
|
||||
[7]=>
|
||||
string(13) "Africa/Banjul"
|
||||
[8]=>
|
||||
string(13) "Africa/Bissau"
|
||||
[9]=>
|
||||
string(15) "Africa/Blantyre"
|
||||
[10]=>
|
||||
string(18) "Africa/Brazzaville"
|
||||
[11]=>
|
||||
string(16) "Africa/Bujumbura"
|
||||
[12]=>
|
||||
string(12) "Africa/Cairo"
|
||||
[13]=>
|
||||
string(17) "Africa/Casablanca"
|
||||
[14]=>
|
||||
string(12) "Africa/Ceuta"
|
||||
[15]=>
|
||||
string(14) "Africa/Conakry"
|
||||
[16]=>
|
||||
string(12) "Africa/Dakar"
|
||||
[17]=>
|
||||
string(20) "Africa/Dar_es_Salaam"
|
||||
[18]=>
|
||||
string(15) "Africa/Djibouti"
|
||||
[19]=>
|
||||
string(13) "Africa/Douala"
|
||||
[20]=>
|
||||
string(15) "Africa/El_Aaiun"
|
||||
[21]=>
|
||||
string(15) "Africa/Freetown"
|
||||
[22]=>
|
||||
string(15) "Africa/Gaborone"
|
||||
[23]=>
|
||||
string(13) "Africa/Harare"
|
||||
[24]=>
|
||||
string(19) "Africa/Johannesburg"
|
||||
[25]=>
|
||||
string(14) "Africa/Kampala"
|
||||
[26]=>
|
||||
string(15) "Africa/Khartoum"
|
||||
[27]=>
|
||||
string(13) "Africa/Kigali"
|
||||
[28]=>
|
||||
string(15) "Africa/Kinshasa"
|
||||
[29]=>
|
||||
string(12) "Africa/Lagos"
|
||||
[30]=>
|
||||
string(17) "Africa/Libreville"
|
||||
[31]=>
|
||||
string(11) "Africa/Lome"
|
||||
[32]=>
|
||||
string(13) "Africa/Luanda"
|
||||
[33]=>
|
||||
string(17) "Africa/Lubumbashi"
|
||||
[34]=>
|
||||
string(13) "Africa/Lusaka"
|
||||
[35]=>
|
||||
string(13) "Africa/Malabo"
|
||||
[36]=>
|
||||
string(13) "Africa/Maputo"
|
||||
[37]=>
|
||||
string(13) "Africa/Maseru"
|
||||
[38]=>
|
||||
string(14) "Africa/Mbabane"
|
||||
[39]=>
|
||||
string(16) "Africa/Mogadishu"
|
||||
[40]=>
|
||||
string(15) "Africa/Monrovia"
|
||||
[41]=>
|
||||
string(14) "Africa/Nairobi"
|
||||
[42]=>
|
||||
string(15) "Africa/Ndjamena"
|
||||
[43]=>
|
||||
string(13) "Africa/Niamey"
|
||||
[44]=>
|
||||
string(17) "Africa/Nouakchott"
|
||||
[45]=>
|
||||
string(18) "Africa/Ouagadougou"
|
||||
[46]=>
|
||||
string(17) "Africa/Porto-Novo"
|
||||
[47]=>
|
||||
string(15) "Africa/Sao_Tome"
|
||||
[48]=>
|
||||
string(14) "Africa/Tripoli"
|
||||
[49]=>
|
||||
string(12) "Africa/Tunis"
|
||||
[50]=>
|
||||
string(15) "Africa/Windhoek"
|
||||
[51]=>
|
||||
string(12) "America/Adak"
|
||||
[52]=>
|
||||
string(17) "America/Anchorage"
|
||||
[53]=>
|
||||
string(16) "America/Anguilla"
|
||||
[54]=>
|
||||
string(15) "America/Antigua"
|
||||
[55]=>
|
||||
string(17) "America/Araguaina"
|
||||
[56]=>
|
||||
string(30) "America/Argentina/Buenos_Aires"
|
||||
[57]=>
|
||||
string(27) "America/Argentina/Catamarca"
|
||||
[58]=>
|
||||
string(25) "America/Argentina/Cordoba"
|
||||
[59]=>
|
||||
string(23) "America/Argentina/Jujuy"
|
||||
[60]=>
|
||||
string(26) "America/Argentina/La_Rioja"
|
||||
[61]=>
|
||||
string(25) "America/Argentina/Mendoza"
|
||||
[62]=>
|
||||
string(30) "America/Argentina/Rio_Gallegos"
|
||||
[63]=>
|
||||
string(23) "America/Argentina/Salta"
|
||||
[64]=>
|
||||
string(26) "America/Argentina/San_Juan"
|
||||
[65]=>
|
||||
string(26) "America/Argentina/San_Luis"
|
||||
[66]=>
|
||||
string(25) "America/Argentina/Tucuman"
|
||||
[67]=>
|
||||
string(25) "America/Argentina/Ushuaia"
|
||||
[68]=>
|
||||
string(13) "America/Aruba"
|
||||
[69]=>
|
||||
string(16) "America/Asuncion"
|
||||
[70]=>
|
||||
string(16) "America/Atikokan"
|
||||
[71]=>
|
||||
string(13) "America/Bahia"
|
||||
[72]=>
|
||||
string(16) "America/Barbados"
|
||||
[73]=>
|
||||
string(13) "America/Belem"
|
||||
[74]=>
|
||||
string(14) "America/Belize"
|
||||
[75]=>
|
||||
string(20) "America/Blanc-Sablon"
|
||||
[76]=>
|
||||
string(17) "America/Boa_Vista"
|
||||
[77]=>
|
||||
string(14) "America/Bogota"
|
||||
[78]=>
|
||||
string(13) "America/Boise"
|
||||
[79]=>
|
||||
string(21) "America/Cambridge_Bay"
|
||||
[80]=>
|
||||
string(20) "America/Campo_Grande"
|
||||
[81]=>
|
||||
string(14) "America/Cancun"
|
||||
[82]=>
|
||||
string(15) "America/Caracas"
|
||||
[83]=>
|
||||
string(15) "America/Cayenne"
|
||||
[84]=>
|
||||
string(14) "America/Cayman"
|
||||
[85]=>
|
||||
string(15) "America/Chicago"
|
||||
[86]=>
|
||||
string(17) "America/Chihuahua"
|
||||
[87]=>
|
||||
string(18) "America/Costa_Rica"
|
||||
[88]=>
|
||||
string(14) "America/Cuiaba"
|
||||
[89]=>
|
||||
string(15) "America/Curacao"
|
||||
[90]=>
|
||||
string(20) "America/Danmarkshavn"
|
||||
[91]=>
|
||||
string(14) "America/Dawson"
|
||||
[92]=>
|
||||
string(20) "America/Dawson_Creek"
|
||||
[93]=>
|
||||
string(14) "America/Denver"
|
||||
[94]=>
|
||||
string(15) "America/Detroit"
|
||||
[95]=>
|
||||
string(16) "America/Dominica"
|
||||
[96]=>
|
||||
string(16) "America/Edmonton"
|
||||
[97]=>
|
||||
string(16) "America/Eirunepe"
|
||||
[98]=>
|
||||
string(19) "America/El_Salvador"
|
||||
[99]=>
|
||||
string(17) "America/Fortaleza"
|
||||
[100]=>
|
||||
string(17) "America/Glace_Bay"
|
||||
[101]=>
|
||||
string(15) "America/Godthab"
|
||||
[102]=>
|
||||
string(17) "America/Goose_Bay"
|
||||
[103]=>
|
||||
string(18) "America/Grand_Turk"
|
||||
[104]=>
|
||||
string(15) "America/Grenada"
|
||||
[105]=>
|
||||
string(18) "America/Guadeloupe"
|
||||
[106]=>
|
||||
string(17) "America/Guatemala"
|
||||
[107]=>
|
||||
string(17) "America/Guayaquil"
|
||||
[108]=>
|
||||
string(14) "America/Guyana"
|
||||
[109]=>
|
||||
string(15) "America/Halifax"
|
||||
[110]=>
|
||||
string(14) "America/Havana"
|
||||
[111]=>
|
||||
string(18) "America/Hermosillo"
|
||||
[112]=>
|
||||
string(28) "America/Indiana/Indianapolis"
|
||||
[113]=>
|
||||
string(20) "America/Indiana/Knox"
|
||||
[114]=>
|
||||
string(23) "America/Indiana/Marengo"
|
||||
[115]=>
|
||||
string(26) "America/Indiana/Petersburg"
|
||||
[116]=>
|
||||
string(25) "America/Indiana/Tell_City"
|
||||
[117]=>
|
||||
string(21) "America/Indiana/Vevay"
|
||||
[118]=>
|
||||
string(25) "America/Indiana/Vincennes"
|
||||
[119]=>
|
||||
string(23) "America/Indiana/Winamac"
|
||||
[120]=>
|
||||
string(14) "America/Inuvik"
|
||||
[121]=>
|
||||
string(15) "America/Iqaluit"
|
||||
[122]=>
|
||||
string(15) "America/Jamaica"
|
||||
[123]=>
|
||||
string(14) "America/Juneau"
|
||||
[124]=>
|
||||
string(27) "America/Kentucky/Louisville"
|
||||
[125]=>
|
||||
string(27) "America/Kentucky/Monticello"
|
||||
[126]=>
|
||||
string(14) "America/La_Paz"
|
||||
[127]=>
|
||||
string(12) "America/Lima"
|
||||
[128]=>
|
||||
string(19) "America/Los_Angeles"
|
||||
[129]=>
|
||||
string(14) "America/Maceio"
|
||||
[130]=>
|
||||
string(15) "America/Managua"
|
||||
[131]=>
|
||||
string(14) "America/Manaus"
|
||||
[132]=>
|
||||
string(15) "America/Marigot"
|
||||
[133]=>
|
||||
string(18) "America/Martinique"
|
||||
[134]=>
|
||||
string(16) "America/Mazatlan"
|
||||
[135]=>
|
||||
string(17) "America/Menominee"
|
||||
[136]=>
|
||||
string(14) "America/Merida"
|
||||
[137]=>
|
||||
string(19) "America/Mexico_City"
|
||||
[138]=>
|
||||
string(16) "America/Miquelon"
|
||||
[139]=>
|
||||
string(15) "America/Moncton"
|
||||
[140]=>
|
||||
string(17) "America/Monterrey"
|
||||
[141]=>
|
||||
string(18) "America/Montevideo"
|
||||
[142]=>
|
||||
string(16) "America/Montreal"
|
||||
[143]=>
|
||||
string(18) "America/Montserrat"
|
||||
[144]=>
|
||||
string(14) "America/Nassau"
|
||||
[145]=>
|
||||
string(16) "America/New_York"
|
||||
[146]=>
|
||||
string(15) "America/Nipigon"
|
||||
[147]=>
|
||||
string(12) "America/Nome"
|
||||
[148]=>
|
||||
string(15) "America/Noronha"
|
||||
[149]=>
|
||||
string(27) "America/North_Dakota/Center"
|
||||
[150]=>
|
||||
string(30) "America/North_Dakota/New_Salem"
|
||||
[151]=>
|
||||
string(14) "America/Panama"
|
||||
[152]=>
|
||||
string(19) "America/Pangnirtung"
|
||||
[153]=>
|
||||
string(18) "America/Paramaribo"
|
||||
[154]=>
|
||||
string(15) "America/Phoenix"
|
||||
[155]=>
|
||||
string(22) "America/Port-au-Prince"
|
||||
[156]=>
|
||||
string(21) "America/Port_of_Spain"
|
||||
[157]=>
|
||||
string(19) "America/Porto_Velho"
|
||||
[158]=>
|
||||
string(19) "America/Puerto_Rico"
|
||||
[159]=>
|
||||
string(19) "America/Rainy_River"
|
||||
[160]=>
|
||||
string(20) "America/Rankin_Inlet"
|
||||
[161]=>
|
||||
string(14) "America/Recife"
|
||||
[162]=>
|
||||
string(14) "America/Regina"
|
||||
[163]=>
|
||||
string(16) "America/Resolute"
|
||||
[164]=>
|
||||
string(18) "America/Rio_Branco"
|
||||
[165]=>
|
||||
string(16) "America/Santarem"
|
||||
[166]=>
|
||||
string(16) "America/Santiago"
|
||||
[167]=>
|
||||
string(21) "America/Santo_Domingo"
|
||||
[168]=>
|
||||
string(17) "America/Sao_Paulo"
|
||||
[169]=>
|
||||
string(20) "America/Scoresbysund"
|
||||
[170]=>
|
||||
string(16) "America/Shiprock"
|
||||
[171]=>
|
||||
string(21) "America/St_Barthelemy"
|
||||
[172]=>
|
||||
string(16) "America/St_Johns"
|
||||
[173]=>
|
||||
string(16) "America/St_Kitts"
|
||||
[174]=>
|
||||
string(16) "America/St_Lucia"
|
||||
[175]=>
|
||||
string(17) "America/St_Thomas"
|
||||
[176]=>
|
||||
string(18) "America/St_Vincent"
|
||||
[177]=>
|
||||
string(21) "America/Swift_Current"
|
||||
[178]=>
|
||||
string(19) "America/Tegucigalpa"
|
||||
[179]=>
|
||||
string(13) "America/Thule"
|
||||
[180]=>
|
||||
string(19) "America/Thunder_Bay"
|
||||
[181]=>
|
||||
string(15) "America/Tijuana"
|
||||
[182]=>
|
||||
string(15) "America/Toronto"
|
||||
[183]=>
|
||||
string(15) "America/Tortola"
|
||||
[184]=>
|
||||
string(17) "America/Vancouver"
|
||||
[185]=>
|
||||
string(18) "America/Whitehorse"
|
||||
[186]=>
|
||||
string(16) "America/Winnipeg"
|
||||
[187]=>
|
||||
string(15) "America/Yakutat"
|
||||
[188]=>
|
||||
string(19) "America/Yellowknife"
|
||||
[189]=>
|
||||
string(16) "Antarctica/Casey"
|
||||
[190]=>
|
||||
string(16) "Antarctica/Davis"
|
||||
[191]=>
|
||||
string(25) "Antarctica/DumontDUrville"
|
||||
[192]=>
|
||||
string(17) "Antarctica/Mawson"
|
||||
[193]=>
|
||||
string(18) "Antarctica/McMurdo"
|
||||
[194]=>
|
||||
string(17) "Antarctica/Palmer"
|
||||
[195]=>
|
||||
string(18) "Antarctica/Rothera"
|
||||
[196]=>
|
||||
string(21) "Antarctica/South_Pole"
|
||||
[197]=>
|
||||
string(16) "Antarctica/Syowa"
|
||||
[198]=>
|
||||
string(17) "Antarctica/Vostok"
|
||||
[199]=>
|
||||
string(19) "Arctic/Longyearbyen"
|
||||
[200]=>
|
||||
string(9) "Asia/Aden"
|
||||
[201]=>
|
||||
string(11) "Asia/Almaty"
|
||||
[202]=>
|
||||
string(10) "Asia/Amman"
|
||||
[203]=>
|
||||
string(11) "Asia/Anadyr"
|
||||
[204]=>
|
||||
string(10) "Asia/Aqtau"
|
||||
[205]=>
|
||||
string(11) "Asia/Aqtobe"
|
||||
[206]=>
|
||||
string(13) "Asia/Ashgabat"
|
||||
[207]=>
|
||||
string(12) "Asia/Baghdad"
|
||||
[208]=>
|
||||
string(12) "Asia/Bahrain"
|
||||
[209]=>
|
||||
string(9) "Asia/Baku"
|
||||
[210]=>
|
||||
string(12) "Asia/Bangkok"
|
||||
[211]=>
|
||||
string(11) "Asia/Beirut"
|
||||
[212]=>
|
||||
string(12) "Asia/Bishkek"
|
||||
[213]=>
|
||||
string(11) "Asia/Brunei"
|
||||
[214]=>
|
||||
string(15) "Asia/Choibalsan"
|
||||
[215]=>
|
||||
string(14) "Asia/Chongqing"
|
||||
[216]=>
|
||||
string(12) "Asia/Colombo"
|
||||
[217]=>
|
||||
string(13) "Asia/Damascus"
|
||||
[218]=>
|
||||
string(10) "Asia/Dhaka"
|
||||
[219]=>
|
||||
string(9) "Asia/Dili"
|
||||
[220]=>
|
||||
string(10) "Asia/Dubai"
|
||||
[221]=>
|
||||
string(13) "Asia/Dushanbe"
|
||||
[222]=>
|
||||
string(9) "Asia/Gaza"
|
||||
[223]=>
|
||||
string(11) "Asia/Harbin"
|
||||
[224]=>
|
||||
string(16) "Asia/Ho_Chi_Minh"
|
||||
[225]=>
|
||||
string(14) "Asia/Hong_Kong"
|
||||
[226]=>
|
||||
string(9) "Asia/Hovd"
|
||||
[227]=>
|
||||
string(12) "Asia/Irkutsk"
|
||||
[228]=>
|
||||
string(12) "Asia/Jakarta"
|
||||
[229]=>
|
||||
string(13) "Asia/Jayapura"
|
||||
[230]=>
|
||||
string(14) "Asia/Jerusalem"
|
||||
[231]=>
|
||||
string(10) "Asia/Kabul"
|
||||
[232]=>
|
||||
string(14) "Asia/Kamchatka"
|
||||
[233]=>
|
||||
string(12) "Asia/Karachi"
|
||||
[234]=>
|
||||
string(12) "Asia/Kashgar"
|
||||
[235]=>
|
||||
string(14) "Asia/Kathmandu"
|
||||
[236]=>
|
||||
string(12) "Asia/Kolkata"
|
||||
[237]=>
|
||||
string(16) "Asia/Krasnoyarsk"
|
||||
[238]=>
|
||||
string(17) "Asia/Kuala_Lumpur"
|
||||
[239]=>
|
||||
string(12) "Asia/Kuching"
|
||||
[240]=>
|
||||
string(11) "Asia/Kuwait"
|
||||
[241]=>
|
||||
string(10) "Asia/Macau"
|
||||
[242]=>
|
||||
string(12) "Asia/Magadan"
|
||||
[243]=>
|
||||
string(13) "Asia/Makassar"
|
||||
[244]=>
|
||||
string(11) "Asia/Manila"
|
||||
[245]=>
|
||||
string(11) "Asia/Muscat"
|
||||
[246]=>
|
||||
string(12) "Asia/Nicosia"
|
||||
[247]=>
|
||||
string(16) "Asia/Novosibirsk"
|
||||
[248]=>
|
||||
string(9) "Asia/Omsk"
|
||||
[249]=>
|
||||
string(9) "Asia/Oral"
|
||||
[250]=>
|
||||
string(15) "Asia/Phnom_Penh"
|
||||
[251]=>
|
||||
string(14) "Asia/Pontianak"
|
||||
[252]=>
|
||||
string(14) "Asia/Pyongyang"
|
||||
[253]=>
|
||||
string(10) "Asia/Qatar"
|
||||
[254]=>
|
||||
string(14) "Asia/Qyzylorda"
|
||||
[255]=>
|
||||
string(12) "Asia/Rangoon"
|
||||
[256]=>
|
||||
string(11) "Asia/Riyadh"
|
||||
[257]=>
|
||||
string(13) "Asia/Sakhalin"
|
||||
[258]=>
|
||||
string(14) "Asia/Samarkand"
|
||||
[259]=>
|
||||
string(10) "Asia/Seoul"
|
||||
[260]=>
|
||||
string(13) "Asia/Shanghai"
|
||||
[261]=>
|
||||
string(14) "Asia/Singapore"
|
||||
[262]=>
|
||||
string(11) "Asia/Taipei"
|
||||
[263]=>
|
||||
string(13) "Asia/Tashkent"
|
||||
[264]=>
|
||||
string(12) "Asia/Tbilisi"
|
||||
[265]=>
|
||||
string(11) "Asia/Tehran"
|
||||
[266]=>
|
||||
string(12) "Asia/Thimphu"
|
||||
[267]=>
|
||||
string(10) "Asia/Tokyo"
|
||||
[268]=>
|
||||
string(16) "Asia/Ulaanbaatar"
|
||||
[269]=>
|
||||
string(11) "Asia/Urumqi"
|
||||
[270]=>
|
||||
string(14) "Asia/Vientiane"
|
||||
[271]=>
|
||||
string(16) "Asia/Vladivostok"
|
||||
[272]=>
|
||||
string(12) "Asia/Yakutsk"
|
||||
[273]=>
|
||||
string(18) "Asia/Yekaterinburg"
|
||||
[274]=>
|
||||
string(12) "Asia/Yerevan"
|
||||
[275]=>
|
||||
string(15) "Atlantic/Azores"
|
||||
[276]=>
|
||||
string(16) "Atlantic/Bermuda"
|
||||
[277]=>
|
||||
string(15) "Atlantic/Canary"
|
||||
[278]=>
|
||||
string(19) "Atlantic/Cape_Verde"
|
||||
[279]=>
|
||||
string(14) "Atlantic/Faroe"
|
||||
[280]=>
|
||||
string(16) "Atlantic/Madeira"
|
||||
[281]=>
|
||||
string(18) "Atlantic/Reykjavik"
|
||||
[282]=>
|
||||
string(22) "Atlantic/South_Georgia"
|
||||
[283]=>
|
||||
string(18) "Atlantic/St_Helena"
|
||||
[284]=>
|
||||
string(16) "Atlantic/Stanley"
|
||||
[285]=>
|
||||
string(18) "Australia/Adelaide"
|
||||
[286]=>
|
||||
string(18) "Australia/Brisbane"
|
||||
[287]=>
|
||||
string(21) "Australia/Broken_Hill"
|
||||
[288]=>
|
||||
string(16) "Australia/Currie"
|
||||
[289]=>
|
||||
string(16) "Australia/Darwin"
|
||||
[290]=>
|
||||
string(15) "Australia/Eucla"
|
||||
[291]=>
|
||||
string(16) "Australia/Hobart"
|
||||
[292]=>
|
||||
string(18) "Australia/Lindeman"
|
||||
[293]=>
|
||||
string(19) "Australia/Lord_Howe"
|
||||
[294]=>
|
||||
string(19) "Australia/Melbourne"
|
||||
[295]=>
|
||||
string(15) "Australia/Perth"
|
||||
[296]=>
|
||||
string(16) "Australia/Sydney"
|
||||
[297]=>
|
||||
string(16) "Europe/Amsterdam"
|
||||
[298]=>
|
||||
string(14) "Europe/Andorra"
|
||||
[299]=>
|
||||
string(13) "Europe/Athens"
|
||||
[300]=>
|
||||
string(15) "Europe/Belgrade"
|
||||
[301]=>
|
||||
string(13) "Europe/Berlin"
|
||||
[302]=>
|
||||
string(17) "Europe/Bratislava"
|
||||
[303]=>
|
||||
string(15) "Europe/Brussels"
|
||||
[304]=>
|
||||
string(16) "Europe/Bucharest"
|
||||
[305]=>
|
||||
string(15) "Europe/Budapest"
|
||||
[306]=>
|
||||
string(15) "Europe/Chisinau"
|
||||
[307]=>
|
||||
string(17) "Europe/Copenhagen"
|
||||
[308]=>
|
||||
string(13) "Europe/Dublin"
|
||||
[309]=>
|
||||
string(16) "Europe/Gibraltar"
|
||||
[310]=>
|
||||
string(15) "Europe/Guernsey"
|
||||
[311]=>
|
||||
string(15) "Europe/Helsinki"
|
||||
[312]=>
|
||||
string(18) "Europe/Isle_of_Man"
|
||||
[313]=>
|
||||
string(15) "Europe/Istanbul"
|
||||
[314]=>
|
||||
string(13) "Europe/Jersey"
|
||||
[315]=>
|
||||
string(18) "Europe/Kaliningrad"
|
||||
[316]=>
|
||||
string(11) "Europe/Kiev"
|
||||
[317]=>
|
||||
string(13) "Europe/Lisbon"
|
||||
[318]=>
|
||||
string(16) "Europe/Ljubljana"
|
||||
[319]=>
|
||||
string(13) "Europe/London"
|
||||
[320]=>
|
||||
string(17) "Europe/Luxembourg"
|
||||
[321]=>
|
||||
string(13) "Europe/Madrid"
|
||||
[322]=>
|
||||
string(12) "Europe/Malta"
|
||||
[323]=>
|
||||
string(16) "Europe/Mariehamn"
|
||||
[324]=>
|
||||
string(12) "Europe/Minsk"
|
||||
[325]=>
|
||||
string(13) "Europe/Monaco"
|
||||
[326]=>
|
||||
string(13) "Europe/Moscow"
|
||||
[327]=>
|
||||
string(11) "Europe/Oslo"
|
||||
[328]=>
|
||||
string(12) "Europe/Paris"
|
||||
[329]=>
|
||||
string(16) "Europe/Podgorica"
|
||||
[330]=>
|
||||
string(13) "Europe/Prague"
|
||||
[331]=>
|
||||
string(11) "Europe/Riga"
|
||||
[332]=>
|
||||
string(11) "Europe/Rome"
|
||||
[333]=>
|
||||
string(13) "Europe/Samara"
|
||||
[334]=>
|
||||
string(17) "Europe/San_Marino"
|
||||
[335]=>
|
||||
string(15) "Europe/Sarajevo"
|
||||
[336]=>
|
||||
string(17) "Europe/Simferopol"
|
||||
[337]=>
|
||||
string(13) "Europe/Skopje"
|
||||
[338]=>
|
||||
string(12) "Europe/Sofia"
|
||||
[339]=>
|
||||
string(16) "Europe/Stockholm"
|
||||
[340]=>
|
||||
string(14) "Europe/Tallinn"
|
||||
[341]=>
|
||||
string(13) "Europe/Tirane"
|
||||
[342]=>
|
||||
string(15) "Europe/Uzhgorod"
|
||||
[343]=>
|
||||
string(12) "Europe/Vaduz"
|
||||
[344]=>
|
||||
string(14) "Europe/Vatican"
|
||||
[345]=>
|
||||
string(13) "Europe/Vienna"
|
||||
[346]=>
|
||||
string(14) "Europe/Vilnius"
|
||||
[347]=>
|
||||
string(16) "Europe/Volgograd"
|
||||
[348]=>
|
||||
string(13) "Europe/Warsaw"
|
||||
[349]=>
|
||||
string(13) "Europe/Zagreb"
|
||||
[350]=>
|
||||
string(17) "Europe/Zaporozhye"
|
||||
[351]=>
|
||||
string(13) "Europe/Zurich"
|
||||
[352]=>
|
||||
string(19) "Indian/Antananarivo"
|
||||
[353]=>
|
||||
string(13) "Indian/Chagos"
|
||||
[354]=>
|
||||
string(16) "Indian/Christmas"
|
||||
[355]=>
|
||||
string(12) "Indian/Cocos"
|
||||
[356]=>
|
||||
string(13) "Indian/Comoro"
|
||||
[357]=>
|
||||
string(16) "Indian/Kerguelen"
|
||||
[358]=>
|
||||
string(11) "Indian/Mahe"
|
||||
[359]=>
|
||||
string(15) "Indian/Maldives"
|
||||
[360]=>
|
||||
string(16) "Indian/Mauritius"
|
||||
[361]=>
|
||||
string(14) "Indian/Mayotte"
|
||||
[362]=>
|
||||
string(14) "Indian/Reunion"
|
||||
[363]=>
|
||||
string(12) "Pacific/Apia"
|
||||
[364]=>
|
||||
string(16) "Pacific/Auckland"
|
||||
[365]=>
|
||||
string(15) "Pacific/Chatham"
|
||||
[366]=>
|
||||
string(14) "Pacific/Easter"
|
||||
[367]=>
|
||||
string(13) "Pacific/Efate"
|
||||
[368]=>
|
||||
string(17) "Pacific/Enderbury"
|
||||
[369]=>
|
||||
string(15) "Pacific/Fakaofo"
|
||||
[370]=>
|
||||
string(12) "Pacific/Fiji"
|
||||
[371]=>
|
||||
string(16) "Pacific/Funafuti"
|
||||
[372]=>
|
||||
string(17) "Pacific/Galapagos"
|
||||
[373]=>
|
||||
string(15) "Pacific/Gambier"
|
||||
[374]=>
|
||||
string(19) "Pacific/Guadalcanal"
|
||||
[375]=>
|
||||
string(12) "Pacific/Guam"
|
||||
[376]=>
|
||||
string(16) "Pacific/Honolulu"
|
||||
[377]=>
|
||||
string(16) "Pacific/Johnston"
|
||||
[378]=>
|
||||
string(18) "Pacific/Kiritimati"
|
||||
[379]=>
|
||||
string(14) "Pacific/Kosrae"
|
||||
[380]=>
|
||||
string(17) "Pacific/Kwajalein"
|
||||
[381]=>
|
||||
string(14) "Pacific/Majuro"
|
||||
[382]=>
|
||||
string(17) "Pacific/Marquesas"
|
||||
[383]=>
|
||||
string(14) "Pacific/Midway"
|
||||
[384]=>
|
||||
string(13) "Pacific/Nauru"
|
||||
[385]=>
|
||||
string(12) "Pacific/Niue"
|
||||
[386]=>
|
||||
string(15) "Pacific/Norfolk"
|
||||
[387]=>
|
||||
string(14) "Pacific/Noumea"
|
||||
[388]=>
|
||||
string(17) "Pacific/Pago_Pago"
|
||||
[389]=>
|
||||
string(13) "Pacific/Palau"
|
||||
[390]=>
|
||||
string(16) "Pacific/Pitcairn"
|
||||
[391]=>
|
||||
string(14) "Pacific/Ponape"
|
||||
[392]=>
|
||||
string(20) "Pacific/Port_Moresby"
|
||||
[393]=>
|
||||
string(17) "Pacific/Rarotonga"
|
||||
[394]=>
|
||||
string(14) "Pacific/Saipan"
|
||||
[395]=>
|
||||
string(14) "Pacific/Tahiti"
|
||||
[396]=>
|
||||
string(14) "Pacific/Tarawa"
|
||||
[397]=>
|
||||
string(17) "Pacific/Tongatapu"
|
||||
[398]=>
|
||||
string(12) "Pacific/Truk"
|
||||
[399]=>
|
||||
string(12) "Pacific/Wake"
|
||||
[400]=>
|
||||
string(14) "Pacific/Wallis"
|
||||
[401]=>
|
||||
string(3) "UTC"
|
||||
}
|
||||
===DONE===
|
||||
@@ -1,63 +0,0 @@
|
||||
--TEST--
|
||||
Bug #50392 date_create_from_format enforces 6 digits for 'u' format character
|
||||
--FILE--
|
||||
<?php
|
||||
date_default_timezone_set('Europe/Bratislava');
|
||||
|
||||
$base = '2009-03-01 18:00:00';
|
||||
|
||||
for ($i = 0; $i < 8; $i++) {
|
||||
var_dump(date_create_from_format('Y-m-d H:i:s.u', $base . '.' . str_repeat('1', $i)));
|
||||
}
|
||||
?>
|
||||
--EXPECT--
|
||||
bool(false)
|
||||
object(DateTime)#2 (3) {
|
||||
["date"]=>
|
||||
string(19) "2009-03-01 18:00:00"
|
||||
["timezone_type"]=>
|
||||
int(3)
|
||||
["timezone"]=>
|
||||
string(17) "Europe/Bratislava"
|
||||
}
|
||||
object(DateTime)#2 (3) {
|
||||
["date"]=>
|
||||
string(19) "2009-03-01 18:00:00"
|
||||
["timezone_type"]=>
|
||||
int(3)
|
||||
["timezone"]=>
|
||||
string(17) "Europe/Bratislava"
|
||||
}
|
||||
object(DateTime)#2 (3) {
|
||||
["date"]=>
|
||||
string(19) "2009-03-01 18:00:00"
|
||||
["timezone_type"]=>
|
||||
int(3)
|
||||
["timezone"]=>
|
||||
string(17) "Europe/Bratislava"
|
||||
}
|
||||
object(DateTime)#2 (3) {
|
||||
["date"]=>
|
||||
string(19) "2009-03-01 18:00:00"
|
||||
["timezone_type"]=>
|
||||
int(3)
|
||||
["timezone"]=>
|
||||
string(17) "Europe/Bratislava"
|
||||
}
|
||||
object(DateTime)#2 (3) {
|
||||
["date"]=>
|
||||
string(19) "2009-03-01 18:00:00"
|
||||
["timezone_type"]=>
|
||||
int(3)
|
||||
["timezone"]=>
|
||||
string(17) "Europe/Bratislava"
|
||||
}
|
||||
object(DateTime)#2 (3) {
|
||||
["date"]=>
|
||||
string(19) "2009-03-01 18:00:00"
|
||||
["timezone_type"]=>
|
||||
int(3)
|
||||
["timezone"]=>
|
||||
string(17) "Europe/Bratislava"
|
||||
}
|
||||
bool(false)
|
||||
@@ -13,24 +13,816 @@ echo "*** Testing timezone_identifiers_list() : basic functionality ***\n";
|
||||
//Set the default time zone
|
||||
date_default_timezone_set("GMT");
|
||||
|
||||
$zones = timezone_identifiers_list();
|
||||
echo "Check return tpe is ARRAY\n";
|
||||
var_dump(is_array($zones));
|
||||
|
||||
echo "Check array contains some common timezones\n";
|
||||
var_dump(in_array("Europe/London", $zones));
|
||||
var_dump(in_array("America/New_York", $zones));
|
||||
var_dump(in_array("UTC", $zones));
|
||||
var_dump (timezone_identifiers_list() );
|
||||
|
||||
?>
|
||||
===DONE===
|
||||
--EXPECTF--
|
||||
*** Testing timezone_identifiers_list() : basic functionality ***
|
||||
Check return tpe is ARRAY
|
||||
bool(true)
|
||||
Check array contains some common timezones
|
||||
bool(true)
|
||||
bool(true)
|
||||
bool(true)
|
||||
array(402) {
|
||||
[0]=>
|
||||
string(14) "Africa/Abidjan"
|
||||
[1]=>
|
||||
string(12) "Africa/Accra"
|
||||
[2]=>
|
||||
string(18) "Africa/Addis_Ababa"
|
||||
[3]=>
|
||||
string(14) "Africa/Algiers"
|
||||
[4]=>
|
||||
string(13) "Africa/Asmara"
|
||||
[5]=>
|
||||
string(13) "Africa/Bamako"
|
||||
[6]=>
|
||||
string(13) "Africa/Bangui"
|
||||
[7]=>
|
||||
string(13) "Africa/Banjul"
|
||||
[8]=>
|
||||
string(13) "Africa/Bissau"
|
||||
[9]=>
|
||||
string(15) "Africa/Blantyre"
|
||||
[10]=>
|
||||
string(18) "Africa/Brazzaville"
|
||||
[11]=>
|
||||
string(16) "Africa/Bujumbura"
|
||||
[12]=>
|
||||
string(12) "Africa/Cairo"
|
||||
[13]=>
|
||||
string(17) "Africa/Casablanca"
|
||||
[14]=>
|
||||
string(12) "Africa/Ceuta"
|
||||
[15]=>
|
||||
string(14) "Africa/Conakry"
|
||||
[16]=>
|
||||
string(12) "Africa/Dakar"
|
||||
[17]=>
|
||||
string(20) "Africa/Dar_es_Salaam"
|
||||
[18]=>
|
||||
string(15) "Africa/Djibouti"
|
||||
[19]=>
|
||||
string(13) "Africa/Douala"
|
||||
[20]=>
|
||||
string(15) "Africa/El_Aaiun"
|
||||
[21]=>
|
||||
string(15) "Africa/Freetown"
|
||||
[22]=>
|
||||
string(15) "Africa/Gaborone"
|
||||
[23]=>
|
||||
string(13) "Africa/Harare"
|
||||
[24]=>
|
||||
string(19) "Africa/Johannesburg"
|
||||
[25]=>
|
||||
string(14) "Africa/Kampala"
|
||||
[26]=>
|
||||
string(15) "Africa/Khartoum"
|
||||
[27]=>
|
||||
string(13) "Africa/Kigali"
|
||||
[28]=>
|
||||
string(15) "Africa/Kinshasa"
|
||||
[29]=>
|
||||
string(12) "Africa/Lagos"
|
||||
[30]=>
|
||||
string(17) "Africa/Libreville"
|
||||
[31]=>
|
||||
string(11) "Africa/Lome"
|
||||
[32]=>
|
||||
string(13) "Africa/Luanda"
|
||||
[33]=>
|
||||
string(17) "Africa/Lubumbashi"
|
||||
[34]=>
|
||||
string(13) "Africa/Lusaka"
|
||||
[35]=>
|
||||
string(13) "Africa/Malabo"
|
||||
[36]=>
|
||||
string(13) "Africa/Maputo"
|
||||
[37]=>
|
||||
string(13) "Africa/Maseru"
|
||||
[38]=>
|
||||
string(14) "Africa/Mbabane"
|
||||
[39]=>
|
||||
string(16) "Africa/Mogadishu"
|
||||
[40]=>
|
||||
string(15) "Africa/Monrovia"
|
||||
[41]=>
|
||||
string(14) "Africa/Nairobi"
|
||||
[42]=>
|
||||
string(15) "Africa/Ndjamena"
|
||||
[43]=>
|
||||
string(13) "Africa/Niamey"
|
||||
[44]=>
|
||||
string(17) "Africa/Nouakchott"
|
||||
[45]=>
|
||||
string(18) "Africa/Ouagadougou"
|
||||
[46]=>
|
||||
string(17) "Africa/Porto-Novo"
|
||||
[47]=>
|
||||
string(15) "Africa/Sao_Tome"
|
||||
[48]=>
|
||||
string(14) "Africa/Tripoli"
|
||||
[49]=>
|
||||
string(12) "Africa/Tunis"
|
||||
[50]=>
|
||||
string(15) "Africa/Windhoek"
|
||||
[51]=>
|
||||
string(12) "America/Adak"
|
||||
[52]=>
|
||||
string(17) "America/Anchorage"
|
||||
[53]=>
|
||||
string(16) "America/Anguilla"
|
||||
[54]=>
|
||||
string(15) "America/Antigua"
|
||||
[55]=>
|
||||
string(17) "America/Araguaina"
|
||||
[56]=>
|
||||
string(30) "America/Argentina/Buenos_Aires"
|
||||
[57]=>
|
||||
string(27) "America/Argentina/Catamarca"
|
||||
[58]=>
|
||||
string(25) "America/Argentina/Cordoba"
|
||||
[59]=>
|
||||
string(23) "America/Argentina/Jujuy"
|
||||
[60]=>
|
||||
string(26) "America/Argentina/La_Rioja"
|
||||
[61]=>
|
||||
string(25) "America/Argentina/Mendoza"
|
||||
[62]=>
|
||||
string(30) "America/Argentina/Rio_Gallegos"
|
||||
[63]=>
|
||||
string(23) "America/Argentina/Salta"
|
||||
[64]=>
|
||||
string(26) "America/Argentina/San_Juan"
|
||||
[65]=>
|
||||
string(26) "America/Argentina/San_Luis"
|
||||
[66]=>
|
||||
string(25) "America/Argentina/Tucuman"
|
||||
[67]=>
|
||||
string(25) "America/Argentina/Ushuaia"
|
||||
[68]=>
|
||||
string(13) "America/Aruba"
|
||||
[69]=>
|
||||
string(16) "America/Asuncion"
|
||||
[70]=>
|
||||
string(16) "America/Atikokan"
|
||||
[71]=>
|
||||
string(13) "America/Bahia"
|
||||
[72]=>
|
||||
string(16) "America/Barbados"
|
||||
[73]=>
|
||||
string(13) "America/Belem"
|
||||
[74]=>
|
||||
string(14) "America/Belize"
|
||||
[75]=>
|
||||
string(20) "America/Blanc-Sablon"
|
||||
[76]=>
|
||||
string(17) "America/Boa_Vista"
|
||||
[77]=>
|
||||
string(14) "America/Bogota"
|
||||
[78]=>
|
||||
string(13) "America/Boise"
|
||||
[79]=>
|
||||
string(21) "America/Cambridge_Bay"
|
||||
[80]=>
|
||||
string(20) "America/Campo_Grande"
|
||||
[81]=>
|
||||
string(14) "America/Cancun"
|
||||
[82]=>
|
||||
string(15) "America/Caracas"
|
||||
[83]=>
|
||||
string(15) "America/Cayenne"
|
||||
[84]=>
|
||||
string(14) "America/Cayman"
|
||||
[85]=>
|
||||
string(15) "America/Chicago"
|
||||
[86]=>
|
||||
string(17) "America/Chihuahua"
|
||||
[87]=>
|
||||
string(18) "America/Costa_Rica"
|
||||
[88]=>
|
||||
string(14) "America/Cuiaba"
|
||||
[89]=>
|
||||
string(15) "America/Curacao"
|
||||
[90]=>
|
||||
string(20) "America/Danmarkshavn"
|
||||
[91]=>
|
||||
string(14) "America/Dawson"
|
||||
[92]=>
|
||||
string(20) "America/Dawson_Creek"
|
||||
[93]=>
|
||||
string(14) "America/Denver"
|
||||
[94]=>
|
||||
string(15) "America/Detroit"
|
||||
[95]=>
|
||||
string(16) "America/Dominica"
|
||||
[96]=>
|
||||
string(16) "America/Edmonton"
|
||||
[97]=>
|
||||
string(16) "America/Eirunepe"
|
||||
[98]=>
|
||||
string(19) "America/El_Salvador"
|
||||
[99]=>
|
||||
string(17) "America/Fortaleza"
|
||||
[100]=>
|
||||
string(17) "America/Glace_Bay"
|
||||
[101]=>
|
||||
string(15) "America/Godthab"
|
||||
[102]=>
|
||||
string(17) "America/Goose_Bay"
|
||||
[103]=>
|
||||
string(18) "America/Grand_Turk"
|
||||
[104]=>
|
||||
string(15) "America/Grenada"
|
||||
[105]=>
|
||||
string(18) "America/Guadeloupe"
|
||||
[106]=>
|
||||
string(17) "America/Guatemala"
|
||||
[107]=>
|
||||
string(17) "America/Guayaquil"
|
||||
[108]=>
|
||||
string(14) "America/Guyana"
|
||||
[109]=>
|
||||
string(15) "America/Halifax"
|
||||
[110]=>
|
||||
string(14) "America/Havana"
|
||||
[111]=>
|
||||
string(18) "America/Hermosillo"
|
||||
[112]=>
|
||||
string(28) "America/Indiana/Indianapolis"
|
||||
[113]=>
|
||||
string(20) "America/Indiana/Knox"
|
||||
[114]=>
|
||||
string(23) "America/Indiana/Marengo"
|
||||
[115]=>
|
||||
string(26) "America/Indiana/Petersburg"
|
||||
[116]=>
|
||||
string(25) "America/Indiana/Tell_City"
|
||||
[117]=>
|
||||
string(21) "America/Indiana/Vevay"
|
||||
[118]=>
|
||||
string(25) "America/Indiana/Vincennes"
|
||||
[119]=>
|
||||
string(23) "America/Indiana/Winamac"
|
||||
[120]=>
|
||||
string(14) "America/Inuvik"
|
||||
[121]=>
|
||||
string(15) "America/Iqaluit"
|
||||
[122]=>
|
||||
string(15) "America/Jamaica"
|
||||
[123]=>
|
||||
string(14) "America/Juneau"
|
||||
[124]=>
|
||||
string(27) "America/Kentucky/Louisville"
|
||||
[125]=>
|
||||
string(27) "America/Kentucky/Monticello"
|
||||
[126]=>
|
||||
string(14) "America/La_Paz"
|
||||
[127]=>
|
||||
string(12) "America/Lima"
|
||||
[128]=>
|
||||
string(19) "America/Los_Angeles"
|
||||
[129]=>
|
||||
string(14) "America/Maceio"
|
||||
[130]=>
|
||||
string(15) "America/Managua"
|
||||
[131]=>
|
||||
string(14) "America/Manaus"
|
||||
[132]=>
|
||||
string(15) "America/Marigot"
|
||||
[133]=>
|
||||
string(18) "America/Martinique"
|
||||
[134]=>
|
||||
string(16) "America/Mazatlan"
|
||||
[135]=>
|
||||
string(17) "America/Menominee"
|
||||
[136]=>
|
||||
string(14) "America/Merida"
|
||||
[137]=>
|
||||
string(19) "America/Mexico_City"
|
||||
[138]=>
|
||||
string(16) "America/Miquelon"
|
||||
[139]=>
|
||||
string(15) "America/Moncton"
|
||||
[140]=>
|
||||
string(17) "America/Monterrey"
|
||||
[141]=>
|
||||
string(18) "America/Montevideo"
|
||||
[142]=>
|
||||
string(16) "America/Montreal"
|
||||
[143]=>
|
||||
string(18) "America/Montserrat"
|
||||
[144]=>
|
||||
string(14) "America/Nassau"
|
||||
[145]=>
|
||||
string(16) "America/New_York"
|
||||
[146]=>
|
||||
string(15) "America/Nipigon"
|
||||
[147]=>
|
||||
string(12) "America/Nome"
|
||||
[148]=>
|
||||
string(15) "America/Noronha"
|
||||
[149]=>
|
||||
string(27) "America/North_Dakota/Center"
|
||||
[150]=>
|
||||
string(30) "America/North_Dakota/New_Salem"
|
||||
[151]=>
|
||||
string(14) "America/Panama"
|
||||
[152]=>
|
||||
string(19) "America/Pangnirtung"
|
||||
[153]=>
|
||||
string(18) "America/Paramaribo"
|
||||
[154]=>
|
||||
string(15) "America/Phoenix"
|
||||
[155]=>
|
||||
string(22) "America/Port-au-Prince"
|
||||
[156]=>
|
||||
string(21) "America/Port_of_Spain"
|
||||
[157]=>
|
||||
string(19) "America/Porto_Velho"
|
||||
[158]=>
|
||||
string(19) "America/Puerto_Rico"
|
||||
[159]=>
|
||||
string(19) "America/Rainy_River"
|
||||
[160]=>
|
||||
string(20) "America/Rankin_Inlet"
|
||||
[161]=>
|
||||
string(14) "America/Recife"
|
||||
[162]=>
|
||||
string(14) "America/Regina"
|
||||
[163]=>
|
||||
string(16) "America/Resolute"
|
||||
[164]=>
|
||||
string(18) "America/Rio_Branco"
|
||||
[165]=>
|
||||
string(16) "America/Santarem"
|
||||
[166]=>
|
||||
string(16) "America/Santiago"
|
||||
[167]=>
|
||||
string(21) "America/Santo_Domingo"
|
||||
[168]=>
|
||||
string(17) "America/Sao_Paulo"
|
||||
[169]=>
|
||||
string(20) "America/Scoresbysund"
|
||||
[170]=>
|
||||
string(16) "America/Shiprock"
|
||||
[171]=>
|
||||
string(21) "America/St_Barthelemy"
|
||||
[172]=>
|
||||
string(16) "America/St_Johns"
|
||||
[173]=>
|
||||
string(16) "America/St_Kitts"
|
||||
[174]=>
|
||||
string(16) "America/St_Lucia"
|
||||
[175]=>
|
||||
string(17) "America/St_Thomas"
|
||||
[176]=>
|
||||
string(18) "America/St_Vincent"
|
||||
[177]=>
|
||||
string(21) "America/Swift_Current"
|
||||
[178]=>
|
||||
string(19) "America/Tegucigalpa"
|
||||
[179]=>
|
||||
string(13) "America/Thule"
|
||||
[180]=>
|
||||
string(19) "America/Thunder_Bay"
|
||||
[181]=>
|
||||
string(15) "America/Tijuana"
|
||||
[182]=>
|
||||
string(15) "America/Toronto"
|
||||
[183]=>
|
||||
string(15) "America/Tortola"
|
||||
[184]=>
|
||||
string(17) "America/Vancouver"
|
||||
[185]=>
|
||||
string(18) "America/Whitehorse"
|
||||
[186]=>
|
||||
string(16) "America/Winnipeg"
|
||||
[187]=>
|
||||
string(15) "America/Yakutat"
|
||||
[188]=>
|
||||
string(19) "America/Yellowknife"
|
||||
[189]=>
|
||||
string(16) "Antarctica/Casey"
|
||||
[190]=>
|
||||
string(16) "Antarctica/Davis"
|
||||
[191]=>
|
||||
string(25) "Antarctica/DumontDUrville"
|
||||
[192]=>
|
||||
string(17) "Antarctica/Mawson"
|
||||
[193]=>
|
||||
string(18) "Antarctica/McMurdo"
|
||||
[194]=>
|
||||
string(17) "Antarctica/Palmer"
|
||||
[195]=>
|
||||
string(18) "Antarctica/Rothera"
|
||||
[196]=>
|
||||
string(21) "Antarctica/South_Pole"
|
||||
[197]=>
|
||||
string(16) "Antarctica/Syowa"
|
||||
[198]=>
|
||||
string(17) "Antarctica/Vostok"
|
||||
[199]=>
|
||||
string(19) "Arctic/Longyearbyen"
|
||||
[200]=>
|
||||
string(9) "Asia/Aden"
|
||||
[201]=>
|
||||
string(11) "Asia/Almaty"
|
||||
[202]=>
|
||||
string(10) "Asia/Amman"
|
||||
[203]=>
|
||||
string(11) "Asia/Anadyr"
|
||||
[204]=>
|
||||
string(10) "Asia/Aqtau"
|
||||
[205]=>
|
||||
string(11) "Asia/Aqtobe"
|
||||
[206]=>
|
||||
string(13) "Asia/Ashgabat"
|
||||
[207]=>
|
||||
string(12) "Asia/Baghdad"
|
||||
[208]=>
|
||||
string(12) "Asia/Bahrain"
|
||||
[209]=>
|
||||
string(9) "Asia/Baku"
|
||||
[210]=>
|
||||
string(12) "Asia/Bangkok"
|
||||
[211]=>
|
||||
string(11) "Asia/Beirut"
|
||||
[212]=>
|
||||
string(12) "Asia/Bishkek"
|
||||
[213]=>
|
||||
string(11) "Asia/Brunei"
|
||||
[214]=>
|
||||
string(15) "Asia/Choibalsan"
|
||||
[215]=>
|
||||
string(14) "Asia/Chongqing"
|
||||
[216]=>
|
||||
string(12) "Asia/Colombo"
|
||||
[217]=>
|
||||
string(13) "Asia/Damascus"
|
||||
[218]=>
|
||||
string(10) "Asia/Dhaka"
|
||||
[219]=>
|
||||
string(9) "Asia/Dili"
|
||||
[220]=>
|
||||
string(10) "Asia/Dubai"
|
||||
[221]=>
|
||||
string(13) "Asia/Dushanbe"
|
||||
[222]=>
|
||||
string(9) "Asia/Gaza"
|
||||
[223]=>
|
||||
string(11) "Asia/Harbin"
|
||||
[224]=>
|
||||
string(16) "Asia/Ho_Chi_Minh"
|
||||
[225]=>
|
||||
string(14) "Asia/Hong_Kong"
|
||||
[226]=>
|
||||
string(9) "Asia/Hovd"
|
||||
[227]=>
|
||||
string(12) "Asia/Irkutsk"
|
||||
[228]=>
|
||||
string(12) "Asia/Jakarta"
|
||||
[229]=>
|
||||
string(13) "Asia/Jayapura"
|
||||
[230]=>
|
||||
string(14) "Asia/Jerusalem"
|
||||
[231]=>
|
||||
string(10) "Asia/Kabul"
|
||||
[232]=>
|
||||
string(14) "Asia/Kamchatka"
|
||||
[233]=>
|
||||
string(12) "Asia/Karachi"
|
||||
[234]=>
|
||||
string(12) "Asia/Kashgar"
|
||||
[235]=>
|
||||
string(14) "Asia/Kathmandu"
|
||||
[236]=>
|
||||
string(12) "Asia/Kolkata"
|
||||
[237]=>
|
||||
string(16) "Asia/Krasnoyarsk"
|
||||
[238]=>
|
||||
string(17) "Asia/Kuala_Lumpur"
|
||||
[239]=>
|
||||
string(12) "Asia/Kuching"
|
||||
[240]=>
|
||||
string(11) "Asia/Kuwait"
|
||||
[241]=>
|
||||
string(10) "Asia/Macau"
|
||||
[242]=>
|
||||
string(12) "Asia/Magadan"
|
||||
[243]=>
|
||||
string(13) "Asia/Makassar"
|
||||
[244]=>
|
||||
string(11) "Asia/Manila"
|
||||
[245]=>
|
||||
string(11) "Asia/Muscat"
|
||||
[246]=>
|
||||
string(12) "Asia/Nicosia"
|
||||
[247]=>
|
||||
string(16) "Asia/Novosibirsk"
|
||||
[248]=>
|
||||
string(9) "Asia/Omsk"
|
||||
[249]=>
|
||||
string(9) "Asia/Oral"
|
||||
[250]=>
|
||||
string(15) "Asia/Phnom_Penh"
|
||||
[251]=>
|
||||
string(14) "Asia/Pontianak"
|
||||
[252]=>
|
||||
string(14) "Asia/Pyongyang"
|
||||
[253]=>
|
||||
string(10) "Asia/Qatar"
|
||||
[254]=>
|
||||
string(14) "Asia/Qyzylorda"
|
||||
[255]=>
|
||||
string(12) "Asia/Rangoon"
|
||||
[256]=>
|
||||
string(11) "Asia/Riyadh"
|
||||
[257]=>
|
||||
string(13) "Asia/Sakhalin"
|
||||
[258]=>
|
||||
string(14) "Asia/Samarkand"
|
||||
[259]=>
|
||||
string(10) "Asia/Seoul"
|
||||
[260]=>
|
||||
string(13) "Asia/Shanghai"
|
||||
[261]=>
|
||||
string(14) "Asia/Singapore"
|
||||
[262]=>
|
||||
string(11) "Asia/Taipei"
|
||||
[263]=>
|
||||
string(13) "Asia/Tashkent"
|
||||
[264]=>
|
||||
string(12) "Asia/Tbilisi"
|
||||
[265]=>
|
||||
string(11) "Asia/Tehran"
|
||||
[266]=>
|
||||
string(12) "Asia/Thimphu"
|
||||
[267]=>
|
||||
string(10) "Asia/Tokyo"
|
||||
[268]=>
|
||||
string(16) "Asia/Ulaanbaatar"
|
||||
[269]=>
|
||||
string(11) "Asia/Urumqi"
|
||||
[270]=>
|
||||
string(14) "Asia/Vientiane"
|
||||
[271]=>
|
||||
string(16) "Asia/Vladivostok"
|
||||
[272]=>
|
||||
string(12) "Asia/Yakutsk"
|
||||
[273]=>
|
||||
string(18) "Asia/Yekaterinburg"
|
||||
[274]=>
|
||||
string(12) "Asia/Yerevan"
|
||||
[275]=>
|
||||
string(15) "Atlantic/Azores"
|
||||
[276]=>
|
||||
string(16) "Atlantic/Bermuda"
|
||||
[277]=>
|
||||
string(15) "Atlantic/Canary"
|
||||
[278]=>
|
||||
string(19) "Atlantic/Cape_Verde"
|
||||
[279]=>
|
||||
string(14) "Atlantic/Faroe"
|
||||
[280]=>
|
||||
string(16) "Atlantic/Madeira"
|
||||
[281]=>
|
||||
string(18) "Atlantic/Reykjavik"
|
||||
[282]=>
|
||||
string(22) "Atlantic/South_Georgia"
|
||||
[283]=>
|
||||
string(18) "Atlantic/St_Helena"
|
||||
[284]=>
|
||||
string(16) "Atlantic/Stanley"
|
||||
[285]=>
|
||||
string(18) "Australia/Adelaide"
|
||||
[286]=>
|
||||
string(18) "Australia/Brisbane"
|
||||
[287]=>
|
||||
string(21) "Australia/Broken_Hill"
|
||||
[288]=>
|
||||
string(16) "Australia/Currie"
|
||||
[289]=>
|
||||
string(16) "Australia/Darwin"
|
||||
[290]=>
|
||||
string(15) "Australia/Eucla"
|
||||
[291]=>
|
||||
string(16) "Australia/Hobart"
|
||||
[292]=>
|
||||
string(18) "Australia/Lindeman"
|
||||
[293]=>
|
||||
string(19) "Australia/Lord_Howe"
|
||||
[294]=>
|
||||
string(19) "Australia/Melbourne"
|
||||
[295]=>
|
||||
string(15) "Australia/Perth"
|
||||
[296]=>
|
||||
string(16) "Australia/Sydney"
|
||||
[297]=>
|
||||
string(16) "Europe/Amsterdam"
|
||||
[298]=>
|
||||
string(14) "Europe/Andorra"
|
||||
[299]=>
|
||||
string(13) "Europe/Athens"
|
||||
[300]=>
|
||||
string(15) "Europe/Belgrade"
|
||||
[301]=>
|
||||
string(13) "Europe/Berlin"
|
||||
[302]=>
|
||||
string(17) "Europe/Bratislava"
|
||||
[303]=>
|
||||
string(15) "Europe/Brussels"
|
||||
[304]=>
|
||||
string(16) "Europe/Bucharest"
|
||||
[305]=>
|
||||
string(15) "Europe/Budapest"
|
||||
[306]=>
|
||||
string(15) "Europe/Chisinau"
|
||||
[307]=>
|
||||
string(17) "Europe/Copenhagen"
|
||||
[308]=>
|
||||
string(13) "Europe/Dublin"
|
||||
[309]=>
|
||||
string(16) "Europe/Gibraltar"
|
||||
[310]=>
|
||||
string(15) "Europe/Guernsey"
|
||||
[311]=>
|
||||
string(15) "Europe/Helsinki"
|
||||
[312]=>
|
||||
string(18) "Europe/Isle_of_Man"
|
||||
[313]=>
|
||||
string(15) "Europe/Istanbul"
|
||||
[314]=>
|
||||
string(13) "Europe/Jersey"
|
||||
[315]=>
|
||||
string(18) "Europe/Kaliningrad"
|
||||
[316]=>
|
||||
string(11) "Europe/Kiev"
|
||||
[317]=>
|
||||
string(13) "Europe/Lisbon"
|
||||
[318]=>
|
||||
string(16) "Europe/Ljubljana"
|
||||
[319]=>
|
||||
string(13) "Europe/London"
|
||||
[320]=>
|
||||
string(17) "Europe/Luxembourg"
|
||||
[321]=>
|
||||
string(13) "Europe/Madrid"
|
||||
[322]=>
|
||||
string(12) "Europe/Malta"
|
||||
[323]=>
|
||||
string(16) "Europe/Mariehamn"
|
||||
[324]=>
|
||||
string(12) "Europe/Minsk"
|
||||
[325]=>
|
||||
string(13) "Europe/Monaco"
|
||||
[326]=>
|
||||
string(13) "Europe/Moscow"
|
||||
[327]=>
|
||||
string(11) "Europe/Oslo"
|
||||
[328]=>
|
||||
string(12) "Europe/Paris"
|
||||
[329]=>
|
||||
string(16) "Europe/Podgorica"
|
||||
[330]=>
|
||||
string(13) "Europe/Prague"
|
||||
[331]=>
|
||||
string(11) "Europe/Riga"
|
||||
[332]=>
|
||||
string(11) "Europe/Rome"
|
||||
[333]=>
|
||||
string(13) "Europe/Samara"
|
||||
[334]=>
|
||||
string(17) "Europe/San_Marino"
|
||||
[335]=>
|
||||
string(15) "Europe/Sarajevo"
|
||||
[336]=>
|
||||
string(17) "Europe/Simferopol"
|
||||
[337]=>
|
||||
string(13) "Europe/Skopje"
|
||||
[338]=>
|
||||
string(12) "Europe/Sofia"
|
||||
[339]=>
|
||||
string(16) "Europe/Stockholm"
|
||||
[340]=>
|
||||
string(14) "Europe/Tallinn"
|
||||
[341]=>
|
||||
string(13) "Europe/Tirane"
|
||||
[342]=>
|
||||
string(15) "Europe/Uzhgorod"
|
||||
[343]=>
|
||||
string(12) "Europe/Vaduz"
|
||||
[344]=>
|
||||
string(14) "Europe/Vatican"
|
||||
[345]=>
|
||||
string(13) "Europe/Vienna"
|
||||
[346]=>
|
||||
string(14) "Europe/Vilnius"
|
||||
[347]=>
|
||||
string(16) "Europe/Volgograd"
|
||||
[348]=>
|
||||
string(13) "Europe/Warsaw"
|
||||
[349]=>
|
||||
string(13) "Europe/Zagreb"
|
||||
[350]=>
|
||||
string(17) "Europe/Zaporozhye"
|
||||
[351]=>
|
||||
string(13) "Europe/Zurich"
|
||||
[352]=>
|
||||
string(19) "Indian/Antananarivo"
|
||||
[353]=>
|
||||
string(13) "Indian/Chagos"
|
||||
[354]=>
|
||||
string(16) "Indian/Christmas"
|
||||
[355]=>
|
||||
string(12) "Indian/Cocos"
|
||||
[356]=>
|
||||
string(13) "Indian/Comoro"
|
||||
[357]=>
|
||||
string(16) "Indian/Kerguelen"
|
||||
[358]=>
|
||||
string(11) "Indian/Mahe"
|
||||
[359]=>
|
||||
string(15) "Indian/Maldives"
|
||||
[360]=>
|
||||
string(16) "Indian/Mauritius"
|
||||
[361]=>
|
||||
string(14) "Indian/Mayotte"
|
||||
[362]=>
|
||||
string(14) "Indian/Reunion"
|
||||
[363]=>
|
||||
string(12) "Pacific/Apia"
|
||||
[364]=>
|
||||
string(16) "Pacific/Auckland"
|
||||
[365]=>
|
||||
string(15) "Pacific/Chatham"
|
||||
[366]=>
|
||||
string(14) "Pacific/Easter"
|
||||
[367]=>
|
||||
string(13) "Pacific/Efate"
|
||||
[368]=>
|
||||
string(17) "Pacific/Enderbury"
|
||||
[369]=>
|
||||
string(15) "Pacific/Fakaofo"
|
||||
[370]=>
|
||||
string(12) "Pacific/Fiji"
|
||||
[371]=>
|
||||
string(16) "Pacific/Funafuti"
|
||||
[372]=>
|
||||
string(17) "Pacific/Galapagos"
|
||||
[373]=>
|
||||
string(15) "Pacific/Gambier"
|
||||
[374]=>
|
||||
string(19) "Pacific/Guadalcanal"
|
||||
[375]=>
|
||||
string(12) "Pacific/Guam"
|
||||
[376]=>
|
||||
string(16) "Pacific/Honolulu"
|
||||
[377]=>
|
||||
string(16) "Pacific/Johnston"
|
||||
[378]=>
|
||||
string(18) "Pacific/Kiritimati"
|
||||
[379]=>
|
||||
string(14) "Pacific/Kosrae"
|
||||
[380]=>
|
||||
string(17) "Pacific/Kwajalein"
|
||||
[381]=>
|
||||
string(14) "Pacific/Majuro"
|
||||
[382]=>
|
||||
string(17) "Pacific/Marquesas"
|
||||
[383]=>
|
||||
string(14) "Pacific/Midway"
|
||||
[384]=>
|
||||
string(13) "Pacific/Nauru"
|
||||
[385]=>
|
||||
string(12) "Pacific/Niue"
|
||||
[386]=>
|
||||
string(15) "Pacific/Norfolk"
|
||||
[387]=>
|
||||
string(14) "Pacific/Noumea"
|
||||
[388]=>
|
||||
string(17) "Pacific/Pago_Pago"
|
||||
[389]=>
|
||||
string(13) "Pacific/Palau"
|
||||
[390]=>
|
||||
string(16) "Pacific/Pitcairn"
|
||||
[391]=>
|
||||
string(14) "Pacific/Ponape"
|
||||
[392]=>
|
||||
string(20) "Pacific/Port_Moresby"
|
||||
[393]=>
|
||||
string(17) "Pacific/Rarotonga"
|
||||
[394]=>
|
||||
string(14) "Pacific/Saipan"
|
||||
[395]=>
|
||||
string(14) "Pacific/Tahiti"
|
||||
[396]=>
|
||||
string(14) "Pacific/Tarawa"
|
||||
[397]=>
|
||||
string(17) "Pacific/Tongatapu"
|
||||
[398]=>
|
||||
string(12) "Pacific/Truk"
|
||||
[399]=>
|
||||
string(12) "Pacific/Wake"
|
||||
[400]=>
|
||||
string(14) "Pacific/Wallis"
|
||||
[401]=>
|
||||
string(3) "UTC"
|
||||
}
|
||||
===DONE===
|
||||
|
||||
@@ -33,7 +33,7 @@ magic_quotes_runtime=1
|
||||
}
|
||||
?>
|
||||
--EXPECT--
|
||||
Warning: Directive 'magic_quotes_runtime' is deprecated in PHP 5.3 and greater in Unknown on line 0
|
||||
PHP Warning: Directive 'magic_quotes_runtime' is deprecated in PHP 5.3 and greater in Unknown on line 0
|
||||
database handler: cdb_make
|
||||
string(32) "12fc5ba2b9dcfef2480e5324eeb5f3e5"
|
||||
string(32) "12fc5ba2b9dcfef2480e5324eeb5f3e5"
|
||||
+1
-12
@@ -1203,18 +1203,7 @@ PHP_FUNCTION(dom_document_import_node)
|
||||
if (!retnodep) {
|
||||
RETURN_FALSE;
|
||||
}
|
||||
|
||||
if ((retnodep->type == XML_ATTRIBUTE_NODE) && (nodep->ns != NULL)) {
|
||||
xmlNsPtr nsptr = NULL;
|
||||
xmlNodePtr root = xmlDocGetRootElement(docp);
|
||||
|
||||
nsptr = xmlSearchNsByHref (nodep->doc, root, nodep->ns->href);
|
||||
if (nsptr == NULL) {
|
||||
int errorcode;
|
||||
nsptr = dom_get_ns(root, nodep->ns->href, &errorcode, nodep->ns->prefix);
|
||||
}
|
||||
xmlSetNs(retnodep, nsptr);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
DOM_RET_OBJ(rv, (xmlNodePtr) retnodep, &ret, intern);
|
||||
|
||||
+2
-2
@@ -1730,7 +1730,7 @@ PHP_FUNCTION(dom_node_get_feature)
|
||||
}
|
||||
/* }}} end dom_node_get_feature */
|
||||
|
||||
/* {{{ proto mixed dom_node_set_user_data(string key, mixed data, userdatahandler handler);
|
||||
/* {{{ proto DomUserData dom_node_set_user_data(string key, DomUserData data, userdatahandler handler);
|
||||
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Node3-setUserData
|
||||
Since: DOM Level 3
|
||||
*/
|
||||
@@ -1740,7 +1740,7 @@ PHP_FUNCTION(dom_node_set_user_data)
|
||||
}
|
||||
/* }}} end dom_node_set_user_data */
|
||||
|
||||
/* {{{ proto mixed dom_node_get_user_data(string key);
|
||||
/* {{{ proto DomUserData dom_node_get_user_data(string key);
|
||||
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Node3-getUserData
|
||||
Since: DOM Level 3
|
||||
*/
|
||||
|
||||
@@ -3,14 +3,9 @@ Read empty $value.
|
||||
--CREDIT--
|
||||
Jason Bouffard <jbouffard1@yahoo.com>
|
||||
# TestFest Atlanta 2009-05-14
|
||||
--SKIPIF--
|
||||
<?php require_once('skipif.inc'); ?>
|
||||
--FILE--
|
||||
<?php
|
||||
$attr = new DOMAttr('category');
|
||||
print $attr->value."\n";
|
||||
?>
|
||||
===DONE===
|
||||
--EXPECTF--
|
||||
===DONE===
|
||||
|
||||
@@ -3,15 +3,10 @@ Invalid State Error when getting length on DOMCharacterData out of content.
|
||||
--CREDIT--
|
||||
Jason Bouffard <jbouffard1@yahoo.com>
|
||||
# TestFest Atlanta 2009-05-14
|
||||
--SKIPIF--
|
||||
<?php require_once('skipif.inc'); ?>
|
||||
--FILE--
|
||||
<?php
|
||||
$character_data = new DOMCharacterData();
|
||||
print $character_data->length;
|
||||
?>
|
||||
===DONE===
|
||||
--EXPECTF--
|
||||
Warning: main(): Invalid State Error in %s
|
||||
===DONE===
|
||||
|
||||
Warning: main(): Invalid State Error in %s
|
||||
@@ -3,8 +3,6 @@ DOMText::appendData basic functionality test
|
||||
--CREDITS--
|
||||
Mike Sullivan <mike@regexia.com>
|
||||
#TestFest 2008 (London)
|
||||
--SKIPIF--
|
||||
<?php require_once('skipif.inc'); ?>
|
||||
--FILE--
|
||||
<?php
|
||||
|
||||
@@ -28,13 +26,10 @@ echo "Text Content: " . $textnode->data . "\n";
|
||||
echo "\n" . $document->saveXML();
|
||||
|
||||
?>
|
||||
===DONE===
|
||||
--EXPECT--
|
||||
Text Length (one append): 4
|
||||
Text Length (two appends): 8
|
||||
Text Content: data><&"
|
||||
|
||||
<?xml version="1.0"?>
|
||||
<root><text>data><&"</text></root>
|
||||
===DONE===
|
||||
|
||||
<root><text>data><&"</text></root>
|
||||
@@ -1,7 +1,5 @@
|
||||
--TEST--
|
||||
Bug #42082 (NodeList length zero should be empty)
|
||||
--SKIPIF--
|
||||
<?php require_once('skipif.inc'); ?>
|
||||
--FILE--
|
||||
<?php
|
||||
$doc = new DOMDocument();
|
||||
@@ -16,7 +14,6 @@ $doc->loadXML("<element></element>");
|
||||
var_dump($doc->firstChild->nodeValue, empty($doc->firstChild->nodeValue), isset($doc->firstChild->nodeValue));
|
||||
var_dump(empty($doc->nodeType), empty($doc->firstChild->nodeType))
|
||||
?>
|
||||
===DONE===
|
||||
--EXPECTF--
|
||||
object(DOMNodeList)#%d (0) {
|
||||
}
|
||||
@@ -27,6 +24,4 @@ string(0) ""
|
||||
bool(true)
|
||||
bool(true)
|
||||
bool(false)
|
||||
bool(false)
|
||||
===DONE===
|
||||
|
||||
bool(false)
|
||||
@@ -1,25 +0,0 @@
|
||||
--TEST--
|
||||
Bug #47848 (importNode doesn't preserve attribute namespaces)
|
||||
--SKIPIF--
|
||||
<?php require_once('skipif.inc'); ?>
|
||||
--FILE--
|
||||
<?php
|
||||
|
||||
$aDOM = new DOMDocument();
|
||||
$aDOM->appendChild($aDOM->createElementNS('http://friend2friend.net/','f2f:a'));
|
||||
|
||||
$fromdom = new DOMDocument();
|
||||
$fromdom->loadXML('<data xmlns:ai="http://altruists.org" ai:attr="namespaced" />');
|
||||
|
||||
$attr= $fromdom->firstChild->attributes->item(0);
|
||||
|
||||
$att = $aDOM->importNode($attr);
|
||||
|
||||
$aDOM->documentElement->appendChild($aDOM->importNode($attr, true));
|
||||
|
||||
echo $aDOM->saveXML();
|
||||
|
||||
?>
|
||||
--EXPECT--
|
||||
<?xml version="1.0"?>
|
||||
<f2f:a xmlns:f2f="http://friend2friend.net/" xmlns:ai="http://altruists.org" ai:attr="namespaced"/>
|
||||
@@ -2,15 +2,10 @@
|
||||
DomDocument::CreateComment() - Incorrect Parameters
|
||||
--CREDITS--
|
||||
Clint Priest @ PhpTek09
|
||||
--SKIPIF--
|
||||
<?php require_once('skipif.inc'); ?>
|
||||
--FILE--
|
||||
<?php
|
||||
$x = new DomDocument();
|
||||
$x->createComment();
|
||||
?>
|
||||
===DONE===
|
||||
--EXPECTF--
|
||||
Warning: DOMDocument::createComment() expects exactly 1 parameter, 0 given in %s
|
||||
===DONE===
|
||||
|
||||
Warning: DOMDocument::createComment() expects exactly 1 parameter, 0 given in %s
|
||||
@@ -2,17 +2,12 @@
|
||||
DomDocument::CreateEntityReference() - Creates an entity reference with the appropriate name
|
||||
--CREDITS--
|
||||
Clint Priest @ PhpTek09
|
||||
--SKIPIF--
|
||||
<?php require_once('skipif.inc'); ?>
|
||||
--FILE--
|
||||
<?php
|
||||
$objDoc = new DomDocument();
|
||||
|
||||
$objRef = $objDoc->createEntityReference('Test');
|
||||
echo $objRef->nodeName . "\n";
|
||||
echo $objRef->nodeName;
|
||||
?>
|
||||
===DONE===
|
||||
--EXPECT--
|
||||
Test
|
||||
===DONE===
|
||||
|
||||
Test
|
||||
@@ -2,16 +2,11 @@
|
||||
DomDocument::CreateEntityReference() - Empty Arguments
|
||||
--CREDITS--
|
||||
Clint Priest @ PhpTek09
|
||||
--SKIPIF--
|
||||
<?php require_once('skipif.inc'); ?>
|
||||
--FILE--
|
||||
<?php
|
||||
$objDoc = new DomDocument();
|
||||
|
||||
$objRef = $objDoc->createEntityReference();
|
||||
?>
|
||||
===DONE===
|
||||
--EXPECTF--
|
||||
Warning: DOMDocument::createEntityReference() expects exactly 1 parameter, 0 given in %s
|
||||
===DONE===
|
||||
|
||||
Warning: DOMDocument::createEntityReference() expects exactly 1 parameter, 0 given in %s
|
||||
@@ -3876,7 +3876,11 @@ static int exif_read_file(image_info_type *ImageInfo, char *FileName, int read_t
|
||||
}
|
||||
|
||||
/* Store file date/time. */
|
||||
#ifdef NETWARE
|
||||
ImageInfo->FileDateTime = st.st_mtime.tv_sec;
|
||||
#else
|
||||
ImageInfo->FileDateTime = st.st_mtime;
|
||||
#endif
|
||||
ImageInfo->FileSize = st.st_size;
|
||||
/*exif_error_docref(NULL EXIFERR_CC, ImageInfo, E_NOTICE, "Opened stream is file: %d", ImageInfo->FileSize);*/
|
||||
}
|
||||
|
||||
@@ -20,7 +20,7 @@ magic_quotes_runtime=1
|
||||
var_dump(exif_read_data(dirname(__FILE__).'/test6.jpg','',true,false));
|
||||
?>
|
||||
--EXPECTF--
|
||||
Warning: Directive 'magic_quotes_runtime' is deprecated in PHP 5.3 and greater in Unknown on line 0
|
||||
PHP Warning: Directive 'magic_quotes_runtime' is deprecated in PHP 5.3 and greater in Unknown on line 0
|
||||
array(5) {
|
||||
["FILE"]=>
|
||||
array(6) {
|
||||
|
||||
+24
-9
@@ -251,7 +251,6 @@ PHP_MINIT_FUNCTION(filter)
|
||||
|
||||
REGISTER_LONG_CONSTANT("FILTER_FLAG_STRIP_LOW", FILTER_FLAG_STRIP_LOW, CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("FILTER_FLAG_STRIP_HIGH", FILTER_FLAG_STRIP_HIGH, CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("FILTER_FLAG_STRIP_BACKTICK", FILTER_FLAG_STRIP_BACKTICK, CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("FILTER_FLAG_ENCODE_LOW", FILTER_FLAG_ENCODE_LOW, CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("FILTER_FLAG_ENCODE_HIGH", FILTER_FLAG_ENCODE_HIGH, CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("FILTER_FLAG_ENCODE_AMP", FILTER_FLAG_ENCODE_AMP, CONST_CS | CONST_PERSISTENT);
|
||||
@@ -392,7 +391,9 @@ static void php_zval_filter(zval **value, long filter, long flags, zval *options
|
||||
) {
|
||||
zval **tmp;
|
||||
if (zend_hash_find(HASH_OF(options), "default", sizeof("default"), (void **)&tmp) == SUCCESS) {
|
||||
MAKE_COPY_ZVAL(tmp, *value);
|
||||
**value = **tmp;
|
||||
zval_copy_ctor(*value);
|
||||
INIT_PZVAL(*value);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -677,7 +678,9 @@ static void php_filter_call(zval **filtered, long filter, zval **filter_args, co
|
||||
zval *tmp;
|
||||
|
||||
ALLOC_ZVAL(tmp);
|
||||
MAKE_COPY_ZVAL(filtered, tmp);
|
||||
*tmp = **filtered;
|
||||
zval_copy_ctor(tmp);
|
||||
INIT_PZVAL(tmp);
|
||||
|
||||
zval_dtor(*filtered);
|
||||
|
||||
@@ -697,11 +700,15 @@ static void php_filter_array_handler(zval *input, zval **op, zval *return_value
|
||||
|
||||
if (!op) {
|
||||
zval_dtor(return_value);
|
||||
MAKE_COPY_ZVAL(&input, return_value);
|
||||
*return_value = *input;
|
||||
zval_copy_ctor(return_value);
|
||||
INIT_PZVAL(return_value);
|
||||
php_filter_call(&return_value, FILTER_DEFAULT, NULL, 0, FILTER_REQUIRE_ARRAY TSRMLS_CC);
|
||||
} else if (Z_TYPE_PP(op) == IS_LONG) {
|
||||
zval_dtor(return_value);
|
||||
MAKE_COPY_ZVAL(&input, return_value);
|
||||
*return_value = *input;
|
||||
zval_copy_ctor(return_value);
|
||||
INIT_PZVAL(return_value);
|
||||
php_filter_call(&return_value, Z_LVAL_PP(op), NULL, 0, FILTER_REQUIRE_ARRAY TSRMLS_CC);
|
||||
} else if (Z_TYPE_PP(op) == IS_ARRAY) {
|
||||
array_init(return_value);
|
||||
@@ -727,7 +734,9 @@ static void php_filter_array_handler(zval *input, zval **op, zval *return_value
|
||||
zval *nval;
|
||||
|
||||
ALLOC_ZVAL(nval);
|
||||
MAKE_COPY_ZVAL(tmp, nval);
|
||||
*nval = **tmp;
|
||||
zval_copy_ctor(nval);
|
||||
INIT_PZVAL(nval);
|
||||
|
||||
php_filter_call(&nval, -1, arg_elm, 0, FILTER_REQUIRE_SCALAR TSRMLS_CC);
|
||||
add_assoc_zval_ex(return_value, arg_key, arg_key_len, nval);
|
||||
@@ -773,7 +782,9 @@ PHP_FUNCTION(filter_input)
|
||||
Z_TYPE_PP(opt) == IS_ARRAY &&
|
||||
zend_hash_find(HASH_OF(*opt), "default", sizeof("default"), (void **)&def) == SUCCESS
|
||||
) {
|
||||
MAKE_COPY_ZVAL(def, return_value);
|
||||
*return_value = **def;
|
||||
zval_copy_ctor(return_value);
|
||||
INIT_PZVAL(return_value);
|
||||
return;
|
||||
}
|
||||
}
|
||||
@@ -784,7 +795,9 @@ PHP_FUNCTION(filter_input)
|
||||
}
|
||||
}
|
||||
|
||||
MAKE_COPY_ZVAL(tmp, return_value);
|
||||
*return_value = **tmp;
|
||||
zval_copy_ctor(return_value); /* Watch out for empty strings */
|
||||
INIT_PZVAL(return_value);
|
||||
|
||||
php_filter_call(&return_value, filter, filter_args, 1, FILTER_REQUIRE_SCALAR TSRMLS_CC);
|
||||
}
|
||||
@@ -806,7 +819,9 @@ PHP_FUNCTION(filter_var)
|
||||
RETURN_FALSE;
|
||||
}
|
||||
|
||||
MAKE_COPY_ZVAL(&data, return_value);
|
||||
*return_value = *data;
|
||||
zval_copy_ctor(data);
|
||||
INIT_PZVAL(return_value);
|
||||
|
||||
php_filter_call(&return_value, filter, filter_args, 1, FILTER_REQUIRE_SCALAR TSRMLS_CC);
|
||||
}
|
||||
|
||||
@@ -39,7 +39,6 @@
|
||||
#define FILTER_FLAG_ENCODE_AMP 0x0040
|
||||
#define FILTER_FLAG_NO_ENCODE_QUOTES 0x0080
|
||||
#define FILTER_FLAG_EMPTY_STRING_NULL 0x0100
|
||||
#define FILTER_FLAG_STRIP_BACKTICK 0x0200
|
||||
|
||||
#define FILTER_FLAG_ALLOW_FRACTION 0x1000
|
||||
#define FILTER_FLAG_ALLOW_THOUSAND 0x2000
|
||||
|
||||
@@ -472,7 +472,7 @@ void php_filter_validate_url(PHP_INPUT_FILTER_PARAM_DECL) /* {{{ */
|
||||
void php_filter_validate_email(PHP_INPUT_FILTER_PARAM_DECL) /* {{{ */
|
||||
{
|
||||
/* From http://cvs.php.net/co.php/pear/HTML_QuickForm/QuickForm/Rule/Email.php?r=1.4 */
|
||||
const char regexp[] = "/^((\\\"[^\\\"\\f\\n\\r\\t\\b]+\\\")|([A-Za-z0-9_][A-Za-z0-9_\\!\\#\\$\\%\\&\\'\\*\\+\\-\\~\\/\\=\\?\\^\\`\\|\\{\\}]*(\\.[A-Za-z0-9_\\!\\#\\$\\%\\&\\'\\*\\+\\-\\~\\/\\=\\?\\^\\`\\|\\{\\}]*)*))@((\\[(((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9])))\\])|(((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9])))|((([A-Za-z0-9])(([A-Za-z0-9\\-])*([A-Za-z0-9]))?(\\.(?=[A-Za-z0-9\\-]))?)+[A-Za-z]+))$/D";
|
||||
const char regexp[] = "/^((\\\"[^\\\"\\f\\n\\r\\t\\b]+\\\")|([A-Za-z0-9_][A-Za-z0-9_\\!\\#\\$\\%\\&\\'\\*\\+\\-\\~\\/\\^\\`\\|\\{\\}]*(\\.[A-Za-z0-9_\\!\\#\\$\\%\\&\\'\\*\\+\\-\\~\\/\\^\\`\\|\\{\\}]*)*))@((\\[(((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9])))\\])|(((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9])))|((([A-Za-z0-9])(([A-Za-z0-9\\-])*([A-Za-z0-9]))?(\\.(?=[A-Za-z0-9\\-]))?)+[A-Za-z]+))$/D";
|
||||
|
||||
pcre *re = NULL;
|
||||
pcre_extra *pcre_extra = NULL;
|
||||
|
||||
@@ -123,7 +123,6 @@ static void php_filter_strip(zval *value, long flags)
|
||||
for (i = 0; i < Z_STRLEN_P(value); i++) {
|
||||
if ((str[i] > 127) && (flags & FILTER_FLAG_STRIP_HIGH)) {
|
||||
} else if ((str[i] < 32) && (flags & FILTER_FLAG_STRIP_LOW)) {
|
||||
} else if ((str[i] == '`') && (flags & FILTER_FLAG_STRIP_BACKTICK)) {
|
||||
} else {
|
||||
buf[c] = str[i];
|
||||
++c;
|
||||
|
||||
@@ -21,7 +21,7 @@ stripped PHP 1 foo@bar.com http://a.b.c 1.2.3.4 123 12
|
||||
encoded PHP 1 foo%40bar.com http%3A%2F%2Fa.b.c 1.2.3.4 123 123abc%3C%3E%28%29 O%27Henry %ED%95%98%ED%8D%BC
|
||||
special_chars PHP 1 foo@bar.com http://a.b.c 1.2.3.4 123 123abc<>() O'Henry 하퍼
|
||||
unsafe_raw PHP 1 foo@bar.com http://a.b.c 1.2.3.4 123 123abc<>() O'Henry 하퍼
|
||||
email PHP 1 foo@bar.com httpa.b.c 1.2.3.4 123 123abc O'Henry
|
||||
email PHP 1 foo@bar.com http//a.b.c 1.2.3.4 123 123abc O'Henry
|
||||
url PHP 1 foo@bar.com http://a.b.c 1.2.3.4 123 123abc<>() O'Henry
|
||||
number_int 1 1234 123 123
|
||||
number_float 1 1234 123 123
|
||||
|
||||
@@ -12,6 +12,6 @@ parse_str("val=%22probably+a+bug%22");
|
||||
echo $val . "\n";
|
||||
?>
|
||||
--EXPECT--
|
||||
Warning: Directive 'magic_quotes_gpc' is deprecated in PHP 5.3 and greater in Unknown on line 0
|
||||
PHP Warning: Directive 'magic_quotes_gpc' is deprecated in PHP 5.3 and greater in Unknown on line 0
|
||||
\"probably a bug\"
|
||||
\"probably a bug\"
|
||||
@@ -3,7 +3,6 @@ Bug #42718 - 2 (unsafe_raw filter not applied when configured as default filter)
|
||||
--SKIPIF--
|
||||
<?php if (!extension_loaded("filter")) die("skip"); ?>
|
||||
--INI--
|
||||
display_errors=0
|
||||
magic_quotes_gpc=1
|
||||
filter.default=unsafe_raw
|
||||
filter.default_flags=
|
||||
|
||||
@@ -1,23 +0,0 @@
|
||||
--TEST--
|
||||
Bug #50158 (FILTER_VALIDATE_EMAIL fails with valid addresses containing = or ?)
|
||||
--FILE--
|
||||
<?php
|
||||
|
||||
$email_address = "test=mail@example.com";
|
||||
var_dump(filter_var($email_address, FILTER_VALIDATE_EMAIL));
|
||||
|
||||
$email_address = "test-mail@example.com";
|
||||
var_dump(filter_var($email_address, FILTER_VALIDATE_EMAIL));
|
||||
|
||||
$email_address = "test+mail@example.com";
|
||||
var_dump(filter_var($email_address, FILTER_VALIDATE_EMAIL));
|
||||
|
||||
$email_address = "test?mail@example.com";
|
||||
var_dump(filter_var($email_address, FILTER_VALIDATE_EMAIL));
|
||||
|
||||
?>
|
||||
--EXPECTF--
|
||||
%unicode|string%(21) "test=mail@example.com"
|
||||
%unicode|string%(21) "test-mail@example.com"
|
||||
%unicode|string%(21) "test+mail@example.com"
|
||||
%unicode|string%(21) "test?mail@example.com"
|
||||
+5
-5
@@ -1387,7 +1387,7 @@ ftp_getdata(ftpbuf_t *ftp TSRMLS_DC)
|
||||
|
||||
sa = (struct sockaddr *) &ftp->localaddr;
|
||||
/* bind/listen */
|
||||
if ((fd = socket(sa->sa_family, SOCK_STREAM, 0)) == SOCK_ERR) {
|
||||
if ((fd = socket(sa->sa_family, SOCK_STREAM, 0)) == -1) {
|
||||
php_error_docref(NULL TSRMLS_CC, E_WARNING, "socket() failed: %s (%d)", strerror(errno), errno);
|
||||
goto bail;
|
||||
}
|
||||
@@ -1420,17 +1420,17 @@ ftp_getdata(ftpbuf_t *ftp TSRMLS_DC)
|
||||
php_any_addr(sa->sa_family, &addr, 0);
|
||||
size = php_sockaddr_size(&addr);
|
||||
|
||||
if (bind(fd, (struct sockaddr*) &addr, size) != 0) {
|
||||
if (bind(fd, (struct sockaddr*) &addr, size) == -1) {
|
||||
php_error_docref(NULL TSRMLS_CC, E_WARNING, "bind() failed: %s (%d)", strerror(errno), errno);
|
||||
goto bail;
|
||||
}
|
||||
|
||||
if (getsockname(fd, (struct sockaddr*) &addr, &size) != 0) {
|
||||
if (getsockname(fd, (struct sockaddr*) &addr, &size) == -1) {
|
||||
php_error_docref(NULL TSRMLS_CC, E_WARNING, "getsockname() failed: %s (%d)", strerror(errno), errno);
|
||||
goto bail;
|
||||
}
|
||||
|
||||
if (listen(fd, 5) != 0) {
|
||||
if (listen(fd, 5) == -1) {
|
||||
php_error_docref(NULL TSRMLS_CC, E_WARNING, "listen() failed: %s (%d)", strerror(errno), errno);
|
||||
goto bail;
|
||||
}
|
||||
@@ -1699,7 +1699,7 @@ ftp_nb_get(ftpbuf_t *ftp, php_stream *outstream, const char *path, ftptype_t typ
|
||||
char arg[11];
|
||||
|
||||
if (ftp == NULL) {
|
||||
return PHP_FTP_FAILED;
|
||||
goto bail;
|
||||
}
|
||||
|
||||
if (!ftp_type(ftp, type)) {
|
||||
|
||||
+1
-1
@@ -4139,7 +4139,7 @@ PHP_FUNCTION(imagepsencodefont)
|
||||
T1_DeleteAllSizes(*f_ind);
|
||||
if (T1_ReencodeFont(*f_ind, enc_vector)) {
|
||||
T1_DeleteEncoding(enc_vector);
|
||||
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Couldn't re-encode font");
|
||||
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Couldn't reencode font");
|
||||
RETURN_FALSE;
|
||||
}
|
||||
|
||||
|
||||
@@ -1090,7 +1090,6 @@ gdImageStringFTEx (gdImage * im, int *brect, int fg, char *fontlist, double ptsi
|
||||
|
||||
if (render) {
|
||||
if (image->format != ft_glyph_format_bitmap && FT_Glyph_To_Bitmap(&image, ft_render_mode_normal, 0, 1)) {
|
||||
FT_Done_Glyph(image);
|
||||
if (tmpstr) {
|
||||
gdFree(tmpstr);
|
||||
}
|
||||
|
||||
@@ -2,7 +2,8 @@
|
||||
image_type_to_mime_type()
|
||||
--SKIPIF--
|
||||
<?php
|
||||
if (!function_exists('image_type_to_mime_type')) die('skip image_type_to_mime_type() not available');
|
||||
if (!function_exists('image_type_to_mime_type')) die('skip image_type_to_mime_type() not available');
|
||||
require_once('skipif_imagetype.inc');
|
||||
?>
|
||||
--FILE--
|
||||
<?php
|
||||
@@ -60,4 +61,4 @@ string(18) "image/vnd.wap.wbmp"
|
||||
string(24) "application/octet-stream"
|
||||
string(9) "image/xbm"
|
||||
|
||||
Done image_type_to_mime_type() test
|
||||
Done image_type_to_mime_type() test
|
||||
@@ -3,7 +3,7 @@ imagecopyresampled()
|
||||
--SKIPIF--
|
||||
<?php
|
||||
if (!function_exists('imagecopyresampled')) die('skip imagecopyresampled() not available');
|
||||
if (!(imagetype() & IMG_PNG)) die('skip PNG Support is not enabled');
|
||||
require_once('skipif_imagetype.inc');
|
||||
?>
|
||||
--FILE--
|
||||
<?php
|
||||
|
||||
@@ -3,7 +3,7 @@ imagedashedline()
|
||||
--SKIPIF--
|
||||
<?php
|
||||
if (!function_exists('imagedashedline')) die('skip imagedashedline() not available');
|
||||
if (!(imagetype() & IMG_PNG)) die('skip PNG Support is not enabled');
|
||||
require_once('skipif_imagetype.inc');
|
||||
?>
|
||||
--FILE--
|
||||
<?php
|
||||
|
||||
@@ -3,7 +3,7 @@ imagefilledpolygon()
|
||||
--SKIPIF--
|
||||
<?php
|
||||
if (!function_exists('imagefilledpolygon')) die('skip imagefilledpolygon() not available');
|
||||
if (!(imagetype() & IMG_PNG)) die('skip PNG Support is not enabled');
|
||||
require_once('skipif_imagetype.inc');
|
||||
?>
|
||||
--FILE--
|
||||
<?php
|
||||
|
||||
@@ -5,7 +5,7 @@ Ivan Rosolen <contato [at] ivanrosolen [dot] com>
|
||||
#testfest PHPSP on 2009-06-30
|
||||
--SKIPIF--
|
||||
<?php
|
||||
if ( ! extension_loaded('gd') ) die( 'skip GD not present; skipping test' );
|
||||
if ( ! extension_loaded('gd') ) die( 'GD not present; skipping test' );
|
||||
?>
|
||||
--FILE--
|
||||
<?php
|
||||
|
||||
@@ -5,7 +5,7 @@ Ivan Rosolen <contato [at] ivanrosolen [dot] com>
|
||||
#testfest PHPSP on 2009-06-30
|
||||
--SKIPIF--
|
||||
<?php
|
||||
if ( ! extension_loaded('gd') ) die( 'skip GD not present; skipping test' );
|
||||
if ( ! extension_loaded('gd') ) die( 'GD not present; skipping test' );
|
||||
?>
|
||||
--FILE--
|
||||
<?php
|
||||
|
||||
@@ -8,7 +8,6 @@ if (PHP_GMP != "no") {
|
||||
CHECK_HEADER_ADD_INCLUDE("gmp.h", "CFLAGS_GMP", PHP_GMP + ";" + PHP_PHP_BUILD + "\\include\\mpir")) {
|
||||
EXTENSION("gmp", "gmp.c");
|
||||
AC_DEFINE('HAVE_GMP', 1, 'GMP support');
|
||||
AC_DEFINE('HAVE_MPIR', 1, 'MPIR support');
|
||||
} else {
|
||||
WARNING("GMP not enabled; libraries and headers not found");
|
||||
}
|
||||
|
||||
+1
-16
@@ -356,9 +356,6 @@ ZEND_MODULE_STARTUP_D(gmp)
|
||||
REGISTER_LONG_CONSTANT("GMP_ROUND_ZERO", GMP_ROUND_ZERO, CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("GMP_ROUND_PLUSINF", GMP_ROUND_PLUSINF, CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("GMP_ROUND_MINUSINF", GMP_ROUND_MINUSINF, CONST_CS | CONST_PERSISTENT);
|
||||
#ifdef mpir_version
|
||||
REGISTER_STRING_CONSTANT("GMP_MPIR_VERSION", (char *)mpir_version, CONST_CS | CONST_PERSISTENT);
|
||||
#endif
|
||||
REGISTER_STRING_CONSTANT("GMP_VERSION", (char *)gmp_version, CONST_CS | CONST_PERSISTENT);
|
||||
|
||||
mp_set_memory_functions(gmp_emalloc, gmp_erealloc, gmp_efree);
|
||||
@@ -386,11 +383,7 @@ ZEND_MODULE_INFO_D(gmp)
|
||||
{
|
||||
php_info_print_table_start();
|
||||
php_info_print_table_row(2, "gmp support", "enabled");
|
||||
#ifdef mpir_version
|
||||
php_info_print_table_row(2, "MPIR version", mpir_version);
|
||||
#else
|
||||
php_info_print_table_row(2, "GMP version", gmp_version);
|
||||
#endif
|
||||
php_info_print_table_end();
|
||||
}
|
||||
/* }}} */
|
||||
@@ -753,11 +746,7 @@ ZEND_FUNCTION(gmp_init)
|
||||
return;
|
||||
}
|
||||
|
||||
#if (__GNU_MP_VERSION >= 4 && __GNU_MP_VERSION_MINOR >= 2)
|
||||
if (base && (base < 2 || base > 62)) {
|
||||
#else
|
||||
if (base && (base < 2 || base > 36)) {
|
||||
#endif
|
||||
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Bad base for conversion: %ld (should be between 2 and 36)", base);
|
||||
RETURN_FALSE;
|
||||
}
|
||||
@@ -807,18 +796,14 @@ ZEND_FUNCTION(gmp_strval)
|
||||
return;
|
||||
}
|
||||
|
||||
#if __GNU_MP_VERSION >= 4 && __GNU_MP_VERSION_MINOR >= 2
|
||||
if ((base < 2 && base > -2) || base > 62 || base < -36) {
|
||||
#else
|
||||
if (base < 2 || base > 36) {
|
||||
#endif
|
||||
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Bad base for conversion: %ld", base);
|
||||
RETURN_FALSE;
|
||||
}
|
||||
|
||||
FETCH_GMP_ZVAL(gmpnum, gmpnumber_arg, temp_a);
|
||||
|
||||
num_len = mpz_sizeinbase(*gmpnum, abs(base));
|
||||
num_len = mpz_sizeinbase(*gmpnum, base);
|
||||
out_string = emalloc(num_len+2);
|
||||
if (mpz_sgn(*gmpnum) < 0) {
|
||||
num_len++;
|
||||
|
||||
@@ -1,36 +0,0 @@
|
||||
--TEST--
|
||||
Feature Request #50283 (allow base in gmp_strval to use full range: 2 to 62, and -2 to -36)
|
||||
--SKIPIF--
|
||||
<?php if (!extension_loaded("gmp")) print "skip"; ?>
|
||||
--FILE--
|
||||
<?php
|
||||
$a = gmp_init("0x41682179fbf5");
|
||||
printf("Decimal: %s, -36-based: %s\n", gmp_strval($a), gmp_strval($a,-36));
|
||||
printf("Decimal: %s, 36-based: %s\n", gmp_strval($a), gmp_strval($a,36));
|
||||
printf("Decimal: %s, -1-based: %s\n", gmp_strval($a), gmp_strval($a,-1));
|
||||
printf("Decimal: %s, 1-based: %s\n", gmp_strval($a), gmp_strval($a,1));
|
||||
printf("Decimal: %s, -37-based: %s\n", gmp_strval($a), gmp_strval($a,-37));
|
||||
printf("Decimal: %s, 37-based: %s\n", gmp_strval($a), gmp_strval($a,37));
|
||||
printf("Decimal: %s, 62-based: %s\n", gmp_strval($a), gmp_strval($a,62));
|
||||
printf("Decimal: %s, 63-based: %s\n\n", gmp_strval($a), gmp_strval($a,63));
|
||||
printf("Base 32 and 62-based: %s\n", gmp_strval(gmp_init("gh82179fbf5", 32), 62));
|
||||
?>
|
||||
--EXPECTF--
|
||||
Decimal: 71915494046709, -36-based: PHPISCOOL
|
||||
Decimal: 71915494046709, 36-based: phpiscool
|
||||
|
||||
Warning: gmp_strval(): Bad base for conversion: -1 in %s on line 5
|
||||
Decimal: 71915494046709, -1-based:
|
||||
|
||||
Warning: gmp_strval(): Bad base for conversion: 1 in %s on line 6
|
||||
Decimal: 71915494046709, 1-based:
|
||||
|
||||
Warning: gmp_strval(): Bad base for conversion: -37 in %s on line 7
|
||||
Decimal: 71915494046709, -37-based:
|
||||
Decimal: 71915494046709, 37-based: KHKATELJF
|
||||
Decimal: 71915494046709, 62-based: KQ6yq741
|
||||
|
||||
Warning: gmp_strval(): Bad base for conversion: 63 in %s on line 10
|
||||
Decimal: 71915494046709, 63-based:
|
||||
|
||||
Base 32 and 62-based: 1NHkAcdIiD
|
||||
@@ -5,10 +5,6 @@ Test iconv_get_encoding()/iconv_set_encoding() function : basic functionality
|
||||
extension_loaded('iconv') or die('skip');
|
||||
function_exists('iconv_get_encoding') or die("skip iconv_get_encoding() is not available in this build");
|
||||
?>
|
||||
--INI--
|
||||
iconv.input_encoding=ISO-8859-1
|
||||
iconv.internal_encoding=ISO-8859-1
|
||||
iconv.output_encoding=ISO-8859-1
|
||||
--FILE--
|
||||
<?php
|
||||
/* Prototype : mixed iconv_get_encoding([string type])
|
||||
@@ -95,4 +91,4 @@ array(3) {
|
||||
["internal_encoding"]=>
|
||||
string(5) "UTF-8"
|
||||
}
|
||||
Done
|
||||
Done
|
||||
@@ -5,10 +5,6 @@ Test iconv_substr() function : basic functionality
|
||||
extension_loaded('iconv') or die('skip');
|
||||
function_exists('iconv_substr') or die("skip iconv_substr() is not available in this build");
|
||||
?>
|
||||
--INI--
|
||||
iconv.input_encoding=ISO-8859-1
|
||||
iconv.internal_encoding=ISO-8859-1
|
||||
iconv.output_encoding=ISO-8859-1
|
||||
--FILE--
|
||||
<?php
|
||||
/* Prototype : string iconv_substr(string str, int offset, [int length, string charset])
|
||||
@@ -56,4 +52,4 @@ string(14) "a5e69cace8aa9e"
|
||||
|
||||
-- Multibyte string 2 --
|
||||
string(42) "e8aa9ee38386e382ade382b9e38388e381a7e38199"
|
||||
Done
|
||||
Done
|
||||
+5
-29
@@ -41,7 +41,6 @@
|
||||
#include "ext/standard/info.h"
|
||||
#include "ext/standard/file.h"
|
||||
#include "ext/standard/php_smart_str.h"
|
||||
#include "ext/pcre/php_pcre.h"
|
||||
|
||||
#ifdef ERROR
|
||||
#undef ERROR
|
||||
@@ -119,7 +118,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_append, 0, 0, 3)
|
||||
ZEND_ARG_INFO(0, folder)
|
||||
ZEND_ARG_INFO(0, message)
|
||||
ZEND_ARG_INFO(0, options)
|
||||
ZEND_ARG_INFO(0, date)
|
||||
ZEND_END_ARG_INFO()
|
||||
|
||||
ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_num_msg, 0, 0, 1)
|
||||
@@ -1267,47 +1265,25 @@ PHP_FUNCTION(imap_reopen)
|
||||
}
|
||||
/* }}} */
|
||||
|
||||
/* {{{ proto bool imap_append(resource stream_id, string folder, string message [, string options [, string internal_date]])
|
||||
/* {{{ proto bool imap_append(resource stream_id, string folder, string message [, string options])
|
||||
Append a new message to a specified mailbox */
|
||||
PHP_FUNCTION(imap_append)
|
||||
{
|
||||
zval *streamind;
|
||||
char *folder, *message, *internal_date = NULL, *flags = NULL;
|
||||
int folder_len, message_len, internal_date_len = 0, flags_len = 0;
|
||||
char *folder, *message, *flags = NULL;
|
||||
int folder_len, message_len, flags_len = 0;
|
||||
pils *imap_le_struct;
|
||||
STRING st;
|
||||
char* regex = "/[0-3][0-9]-((Jan)|(Feb)|(Mar)|(Apr)|(May)|(Jun)|(Jul)|(Aug)|(Sep)|(Oct)|(Nov)|(Dec))-[0-9]{4} [0-2][0-9]:[0-5][0-9]:[0-5][0-9] [+-][0-9]{4}/";
|
||||
const int regex_len = strlen(regex);
|
||||
pcre_cache_entry *pce; /* Compiled regex */
|
||||
zval *subpats = NULL; /* Parts (not used) */
|
||||
long regex_flags = 0; /* Flags (not used) */
|
||||
long start_offset = 0; /* Start offset (not used) */
|
||||
int global = 0;
|
||||
|
||||
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rss|ss", &streamind, &folder, &folder_len, &message, &message_len, &flags, &flags_len, &internal_date, &internal_date_len) == FAILURE) {
|
||||
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rss|s", &streamind, &folder, &folder_len, &message, &message_len, &flags, &flags_len) == FAILURE) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (internal_date) {
|
||||
/* Make sure the given internal_date string matches the RFC specifiedformat */
|
||||
if ((pce = pcre_get_compiled_regex_cache(regex, regex_len TSRMLS_CC))== NULL) {
|
||||
RETURN_FALSE;
|
||||
}
|
||||
|
||||
php_pcre_match_impl(pce, internal_date, internal_date_len, return_value, subpats, global,
|
||||
0, regex_flags, start_offset TSRMLS_CC);
|
||||
|
||||
if (!Z_LVAL_P(return_value)) {
|
||||
php_error_docref(NULL TSRMLS_CC, E_WARNING, "internal date not correctly formatted");
|
||||
internal_date = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
ZEND_FETCH_RESOURCE(imap_le_struct, pils *, &streamind, -1, "imap", le_imap);
|
||||
|
||||
INIT (&st, mail_string, (void *) message, message_len);
|
||||
|
||||
if (mail_append_full(imap_le_struct->imap_stream, folder, (flags ? flags : NIL), (internal_date ? internal_date : NIL), &st)) {
|
||||
if (mail_append_full(imap_le_struct->imap_stream, folder, (flags ? flags : NIL), NIL, &st)) {
|
||||
RETURN_TRUE;
|
||||
} else {
|
||||
RETURN_FALSE;
|
||||
|
||||
@@ -15,18 +15,6 @@ imap_body();
|
||||
echo "Checking with incorrect parameter type\n";
|
||||
imap_body('');
|
||||
imap_body(false);
|
||||
require_once(dirname(__FILE__).'/imap_include.inc');
|
||||
$stream_id = imap_open($default_mailbox, $username, $password) or
|
||||
die("Cannot connect to mailbox $default_mailbox: " . imap_last_error());
|
||||
imap_body($stream_id);
|
||||
imap_body($stream_id,-1);
|
||||
imap_body($stream_id,1,-1);
|
||||
|
||||
//Access not existing
|
||||
var_dump(imap_body($stream_id, 999, FT_UID));
|
||||
|
||||
imap_close($stream_id);
|
||||
|
||||
?>
|
||||
--EXPECTF--
|
||||
Checking with no parameters
|
||||
@@ -37,12 +25,3 @@ Checking with incorrect parameter type
|
||||
Warning: imap_body() expects at least 2 parameters, 1 given in %s on line %d
|
||||
|
||||
Warning: imap_body() expects at least 2 parameters, 1 given in %s on line %d
|
||||
|
||||
Warning: imap_body() expects at least 2 parameters, 1 given in %s on line %d
|
||||
|
||||
Warning: imap_body(): Bad message number in %s on line %d
|
||||
|
||||
Warning: imap_body(): invalid value for the options parameter in %s on line %d
|
||||
|
||||
Warning: imap_body(): Bad message number in %s on line %d
|
||||
bool(false)
|
||||
@@ -27,9 +27,6 @@ echo "Msg Count in new mailbox: ". $check->Nmsgs . "\n";
|
||||
// show body for msg 1
|
||||
var_dump(imap_body($imap_stream, 1));
|
||||
|
||||
//Access via FT_UID
|
||||
var_dump(imap_body($imap_stream, 1, FT_UID));
|
||||
|
||||
imap_close($imap_stream);
|
||||
?>
|
||||
===Done===
|
||||
@@ -43,6 +40,5 @@ Create a new mailbox for test
|
||||
Create a temporary mailbox and add 1 msgs
|
||||
.. mailbox '%s' created
|
||||
Msg Count in new mailbox: 1
|
||||
%unicode|string%(%d) "1: this is a test message, please ignore%a"
|
||||
%unicode|string%(%d) "1: this is a test message, please ignore%a"
|
||||
===Done===
|
||||
string(%d) "1: this is a test message, please ignore%a"
|
||||
===Done===
|
||||
@@ -77,7 +77,7 @@ require_once('clean.inc');
|
||||
*** Testing string imap_bodystruct : basic functionality ***
|
||||
Create a new mailbox for test and add a multipart msgs
|
||||
Create a temporary mailbox and add 1 msgs
|
||||
.. mailbox '{%s}%s' created
|
||||
.. mailbox '{localhost/norsh}INBOX.phpttest' created
|
||||
|
||||
Get and validate structure of body part 1
|
||||
ifsubtype is 0 or 1
|
||||
|
||||
@@ -56,7 +56,7 @@ require_once('clean.inc');
|
||||
*** Testing imap_clearflag_full() : basic functionality ***
|
||||
Create a new mailbox for test
|
||||
Create a temporary mailbox and add 10 msgs
|
||||
.. mailbox '{%s}%s' created
|
||||
.. mailbox '{localhost/norsh}INBOX.%s' created
|
||||
Initial msg count in new_mailbox : 10
|
||||
Set some flags
|
||||
bool(true)
|
||||
|
||||
@@ -118,7 +118,7 @@ require_once(dirname(__FILE__).'/clean.inc');
|
||||
--EXPECTF--
|
||||
*** Testing imap_close() : usage variations ***
|
||||
Create a temporary mailbox and add 3 msgs
|
||||
.. mailbox '{%s}%s' created
|
||||
.. mailbox '{localhost/norsh}INBOX.phpttest' created
|
||||
|
||||
-- Iteration 1 --
|
||||
bool(true)
|
||||
|
||||
@@ -66,7 +66,7 @@ require_once(dirname(__FILE__).'/clean.inc');
|
||||
--EXPECTF--
|
||||
*** Testing imap_close() : usage variations ***
|
||||
Create a temporary mailbox and add 3 msgs
|
||||
.. mailbox '{%s}%s' created
|
||||
.. mailbox '{localhost/norsh}INBOX.phpttest' created
|
||||
|
||||
-- Iteration 1 --
|
||||
bool(true)
|
||||
|
||||
@@ -77,7 +77,7 @@ require_once(dirname(__FILE__).'/clean.inc');
|
||||
--EXPECTF--
|
||||
*** Testing imap_fetch_overview() : basic functionality ***
|
||||
Create a temporary mailbox and add 2 msgs
|
||||
.. mailbox '{%s}%s' created
|
||||
.. mailbox '{localhost/norsh}INBOX.phpttest' created
|
||||
|
||||
-- All possible arguments --
|
||||
|
||||
|
||||
Loaded 100 of 905 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user