Prepare files for 5.5.1

.travis.yml

@@ -8,15 +8,7 @@ notifications:
     email: false
 
 env:
-    global:
-      - MYSQL_TEST_HOST=127.0.0.1
-      - MYSQL_TEST_USER=travis
-      - PDO_MYSQL_TEST_DSN="mysql:host=127.0.0.1;dbname=test"
-      - PDO_MYSQL_TEST_USER=travis
-      - PDO_MYSQL_TEST_PASS=
-      - PDO_MYSQL_TEST_HOST=127.0.0.1
-    matrix:
-      - REPORT_EXIT_STATUS=1
+    - REPORT_EXIT_STATUS=1
 
 before_script:
     # Compile PHP

Makefile.global

@@ -10,7 +10,7 @@ all: $(all_targets)
 	@echo "Build complete."
 	@echo "Don't forget to run 'make test'."
 	@echo
-
+	
 build-modules: $(PHP_MODULES) $(PHP_ZEND_EX)
 
 build-binaries: $(PHP_BINARIES)
@@ -115,19 +115,10 @@ clean:
 	find . -name \*.la -o -name \*.a | xargs rm -f 
 	find . -name \*.so | xargs rm -f
 	find . -name .libs -a -type d|xargs rm -rf
-	rm -f libphp$(PHP_MAJOR_VERSION).la $(SAPI_CLI_PATH) $(SAPI_CGI_PATH) $(SAPI_MILTER_PATH) $(SAPI_LITESPEED_PATH) $(SAPI_FPM_PATH) $(OVERALL_TARGET) modules/* libs/*
+	rm -f libphp$(PHP_MAJOR_VERSION).la $(SAPI_CLI_PATH) $(OVERALL_TARGET) modules/* libs/*
 
 distclean: clean
-	rm -f Makefile config.cache config.log config.status Makefile.objects Makefile.fragments libtool main/php_config.h main/internal_functions_cli.c main/internal_functions.c stamp-h sapi/apache/libphp$(PHP_MAJOR_VERSION).module sapi/apache_hooks/libphp$(PHP_MAJOR_VERSION).module buildmk.stamp Zend/zend_dtrace_gen.h Zend/zend_dtrace_gen.h.bak Zend/zend_config.h TSRM/tsrm_config.h
-	rm -f php5.spec main/build-defs.h scripts/phpize
-	rm -f ext/date/lib/timelib_config.h ext/mbstring/oniguruma/config.h ext/mbstring/libmbfl/config.h ext/mysqlnd/php_mysqlnd_config.h
-	rm -f scripts/man1/phpize.1 scripts/php-config scripts/man1/php-config.1 sapi/cli/php.1 sapi/cgi/php-cgi.1 ext/phar/phar.1 ext/phar/phar.phar.1
-	rm -f sapi/fpm/php-fpm.conf sapi/fpm/init.d.php-fpm sapi/fpm/php-fpm.service sapi/fpm/php-fpm.8 sapi/fpm/status.html
-	rm -f ext/iconv/php_have_bsd_iconv.h ext/iconv/php_have_glibc_iconv.h ext/iconv/php_have_ibm_iconv.h ext/iconv/php_have_iconv.h ext/iconv/php_have_libiconv.h ext/iconv/php_iconv_aliased_libiconv.h ext/iconv/php_iconv_supports_errno.h ext/iconv/php_php_iconv_h_path.h ext/iconv/php_php_iconv_impl.h
-	rm -f ext/phar/phar.phar ext/phar/phar.php
-	if test "$(srcdir)" != "$(builddir)"; then \
-	  rm -f ext/phar/phar/phar.inc; \
-	fi
+	rm -f Makefile config.cache config.log config.status Makefile.objects Makefile.fragments libtool main/php_config.h stamp-h sapi/apache/libphp$(PHP_MAJOR_VERSION).module buildmk.stamp
 	$(EGREP) define'.*include/php' $(top_srcdir)/configure | $(SED) 's/.*>//'|xargs rm -f
 
 .PHONY: all clean install distclean test

NEWS

@@ -1,125 +1,6 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-05 Sep 2013, PHP 5.5.4RC1
-
-- Core:
-  . Fixed bug #60598 (cli/apache sapi segfault on objects manipulation).
-    (Laruence)
-  . Improved fputcsv() to allow specifying escape character.
-  . Fixed bug #65490 (Duplicate calls to get lineno & filename for 
-    DTRACE_FUNCTION_*). (Chris Jones)
-  . Fixed bug #65483 (quoted-printable encode stream filter incorrectly encoding
-    spaces). (Michael M Slusarz)
-  . Fixed bug #65470 (Segmentation fault in zend_error() with
-    --enable-dtrace). (Chris Jones, Kris Van Hees)
-  . Fixed bug #65225 (PHP_BINARY incorrectly set). (Patrick Allaert)
-  . Fixed bug #62692 (PHP fails to build with DTrace). (Chris Jones, Kris Van Hees)
-  . Fixed bug #61759 (class_alias() should accept classes with leading
-    backslashes). (Julien)
-  . Fixed bug #46311 (Pointer aliasing issue results in miscompile on gcc4.4).
-    (Nikita Popov)
-
-- cURL:
-  . Fixed bug #65458 (curl memory leak). (Adam)
-
-- Datetime:
-  . Fixed bug #65554 (createFromFormat broken when weekday name is followed
-    by some delimiters). (Valentin Logvinskiy, Stas).
-  . Fixed bug #65564 (stack-buffer-overflow in DateTimeZone stuff caught
-    by AddressSanitizer). (Remi).
-
-- OPCache:
-  . Fixed bug #65561 (Zend Opcache on Solaris 11 x86 needs ZEND_MM_ALIGNMENT=4).
-    (Terry Ellison)
-  . Fixed bug #65510 (5.5.2 crashes in _get_zval_ptr_ptr_var). (Dmitry)
-
-- Openssl:
-  . Fixed bug #64802 (openssl_x509_parse fails to parse subject properly in
-    some cases). (Mark Jones)
-
-- Session:
-  . Fixed bug #65475 (Session ID is not initialized properly when strict session
-    is enabled). (Yasuo)
-  . Fixed bug #51127/#65359 Request #25630/#43980/#54383 (Added php_serialize 
-    session serialize handler that uses plain serialize()). (Yasuo)
-
-- Standard:
-  . Fix issue with return types of password API helper functions. Found via static
-    analysis by cjones. (Anthony Ferrara) 
-
-22 Aug 2013, PHP 5.5.3
-
-- Openssl:
-  . Fixed UMR in fix for CVE-2013-4248.
-
-15 Aug 2013, PHP 5.5.2
-
-- Core:
-  . Fixed bug #65372 (Segfault in gc_zval_possible_root when return reference
-    fails). (Laruence)
-  . Fixed value of FILTER_SANITIZE_FULL_SPECIAL_CHARS constant (previously was
-    erroneously set to FILTER_SANITIZE_SPECIAL_CHARS value). (Andrey
-    avp200681 gmail com).
-  . Fixed bug #65304 (Use of max int in array_sum). (Laruence)
-  . Fixed bug #65291 (get_defined_constants() causes PHP to crash in a very
-    limited case). (Arpad)
-  . Fixed bug #62691 (solaris sed has no -i switch). (Chris Jones)
-  . Fixed bug #61345 (CGI mode - make install don't work). (Michael Heimpold)
-  . Fixed bug #61268 (--enable-dtrace leads make to clobber
-    Zend/zend_dtrace.d) (Chris Jones)
-
-- DOM:
-  . Added flags option to DOMDocument::schemaValidate() and 
-    DOMDocument::schemaValidateSource(). Added LIBXML_SCHEMA_CREATE flag. 
-    (Chris Wright)
-
-- OPcache:
-  . Added opcache.restrict_api configuration directive that may limit
-    usage of OPcache API functions only to particular script(s). (Dmitry)
-  . Added support for glob symbols in blacklist entries (?, *, **).
-    (Terry Elison, Dmitry)
-  . Fixed bug #65338 (Enabling both php_opcache and php_wincache AVs on
-    shutdown). (Dmitry)
-
-- Openssl:
-  . Fixed handling null bytes in subjectAltName (CVE-2013-4248).
-    (Christian Heimes)
-
-- PDO_mysql:
-  . Fixed bug #65299 (pdo mysql parsing errors). (Johannes)
-
-- Pgsql:
-  . Fixed bug #62978 (Disallow possible SQL injections with pg_select()/pg_update()
-    /pg_delete()/pg_insert()). (Yasuo)
-
-- Phar:
-  . Fixed bug #65028 (Phar::buildFromDirectory creates corrupt archives for 
-    some specific contents). (Stas)
-
-- Sessions:
-  . Implemented strict sessions RFC (https://wiki.php.net/rfc/strict_sessions)
-    which protects against session fixation attacks and session collisions.    
-    (CVE-2011-4718). (Yasuo Ohgaki)
-  . Fixed possible buffer overflow under Windows. Note: Not a security fix.
-    (Yasuo)
-  . Changed session.auto_start to PHP_INI_PERDIR. (Yasuo)
-
-- SOAP:
-  . Fixed bug #65018 (SoapHeader problems with SoapServer). (Dmitry)
-
-- SPL:
-  . Fixed bug #65328 (Segfault when getting SplStack object Value). (Laruence)
-  . Added RecursiveTreeIterator setPostfix and getPostifx methods. (Joshua 
-    Thijssen)
-  . Fixed bug #61697 (spl_autoload_functions returns lambda functions 
-    incorrectly). (Laruence)
-
-- Streams:
-  . Fixed bug #65268 (select() implementation uses outdated tick API). (Anatol)
-
-- Pgsql:
-  . Fixed bug #65336 (pg_escape_literal/identifier() scilently returns false).
-    (Yasuo)
+?? ??? 2013, PHP 5.5.2
 
 18 Jul 2013, PHP 5.5.1
 

TSRM/tsrm_win32.c

@@ -625,7 +625,7 @@ TSRM_API int shmget(int key, int size, int flags)
 	shm->info	 = info_handle;
 	shm->descriptor = MapViewOfFileEx(shm->info, FILE_MAP_ALL_ACCESS, 0, 0, 0, NULL);
 
-	if (NULL != shm->descriptor && created) {
+	if (created) {
 		shm->descriptor->shm_perm.key	= key;
 		shm->descriptor->shm_segsz		= size;
 		shm->descriptor->shm_ctime		= time(NULL);
@@ -639,10 +639,8 @@ TSRM_API int shmget(int key, int size, int flags)
 		shm->descriptor->shm_perm.mode	= shm->descriptor->shm_perm.seq	= 0;
 	}
 
-	if (NULL != shm->descriptor && (shm->descriptor->shm_perm.key != key || size > shm->descriptor->shm_segsz)) {
-		if (NULL != shm->segment) {
-			CloseHandle(shm->segment);
-		}
+	if (shm->descriptor->shm_perm.key != key || size > shm->descriptor->shm_segsz ) {
+		CloseHandle(shm->segment);
 		UnmapViewOfFile(shm->descriptor);
 		CloseHandle(shm->info);
 		return -1;

UPGRADING

@@ -179,16 +179,6 @@ PHP 5.5 UPGRADE NOTES
 - Functions in the socket extension now do not emit warnings when the
   errno is EAGAIN, EWOULDBLOCK or EINPROGRESS.
 
-- Since 5.5.2, spl_autoload_functions() returns different names for 
-  different lambda functions registered via spl_autoload_register().
-
-- Since 5.5.3, DOMDocument::schemaValidateSource() and 
-  DOMDocument::schemaValidate() accept flag parameter. Only flag 
-  available now is LIBXML_SCHEMA_CREATE. Default is 0.
-
-- Since 5.5.4, fputcsv() has fifth parameter escape_char, allowing to
-  specify escape char.
-
 ========================================
 5. New Functions
 ========================================
@@ -307,8 +297,6 @@ PHP 5.5 UPGRADE NOTES
 - SPL:
   - SplFixedArray::__wakeup()
   - SplDoublyLinkedList::add()
-  - RecursiveTreeIterator::getPostfix() (5.5.2)
-  - RecursiveTreeIterator::setPostfix() (5.5.2)
 
 - Zend OPcache:
  - opcache_get_configuration()
@@ -409,21 +397,12 @@ None
   - Added intl.use_exceptions INI directive, which controls what
     happens when global errors are set together with intl.error_level.
 
-- MSSQL:
-  - mssql.compatability_mode renamed to mssql.compatibility_mode in 5.5.2,
-    old directive still supported for BC reasons.
-
 - mysqlnd:
   - Added mysqlnd.sha256_server_public_key INI PERDIR setting that
     affects all APIs which use(are built) for mysqlnd. This allows
     ext/mysqli to be used with the new auth protocol, although at
     coarser level.
 
-- Sessions:
-  - Added session.use_strict_mode in 5.5.3, which prevents session
-    fixation attacks and session collisions. 
-    See also https://wiki.php.net/rfc/strict_sessions
-
 - Zend OPcache (See http://php.net/manual/en/book.opcache.php)
   - Added the following directives:
     - opcache.enable (default "1")

Zend/tests/bug60598.phpt

@@ -1,30 +0,0 @@
---TEST--
-Bug #60598 (cli/apache sapi segfault on objects manipulation)
---FILE--
-<?php
-define('OBJECT_COUNT', 10000);
-
-$containers = array();
-
-class Object {
-    protected $_guid = 0;
-    public function __construct() {
-		global $containers;
-		$this->guid = 1;
-        $containers[spl_object_hash($this)] = $this;
-    }
-    public function __destruct() {
-		global $containers;
-        $containers[spl_object_hash($this)] = NULL;
-    }
-}
-
-for ($i = 0; $i < OBJECT_COUNT; ++$i) {
-    new Object();
-}
-
-// You probably won't see this because of the "zend_mm_heap corrupted"
-?>
-If you see this, try to increase OBJECT_COUNT to 100,000
---EXPECT--
-If you see this, try to increase OBJECT_COUNT to 100,000

Zend/tests/bug60771.phpt

@@ -1,10 +1,10 @@
---TEST--
-test of larger than 8kb text file being parsed by require statement
---FILE--
-<?php
- file_put_contents('test.php',str_repeat('passed, ',1024));
- require('./test.php');
- unlink('test.php');
-?>
---EXPECT--
-passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed,Line truncated
+--TEST--
+test of larger than 8kb text file being parsed by require statement
+--FILE--
+<?php
+ file_put_contents('test.php',str_repeat('passed, ',1024));
+ require('test.php');
+ unlink('test.php');
+?>
+--EXPECT--
+passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed,Line truncated

Zend/tests/bug64896.phpt

@@ -1,47 +0,0 @@
---TEST--
-Bug #64896 (Segfault with gc_collect_cycles using unserialize on certain objects)
---XFAIL--
-We can not fix this bug without a significant (performace slow down) change to gc
---FILE--
-<?php
-$bar = NULL;
-class bad
-{
-	private $_private = array();
-
-	public function __construct()
-	{
-		$this->_private[] = 'php';
-	}
-
-	public function __destruct()
-	{
-		global $bar;
-		$bar = $this;
-	}
-}
-
-$foo = new stdclass;
-$foo->foo = $foo;
-$foo->bad = new bad;
-
-gc_disable();
-
-unserialize(serialize($foo));
-gc_collect_cycles();
-var_dump($bar); 
-/*  will output:
-object(bad)#4 (1) {
-  ["_private":"bad":private]=>
-  &UNKNOWN:0
-}
-*/
-?>
---EXPECTF--
-bject(bad)#%d (1) {
-  ["_private":"bad":private]=>
-  array(1) {
-    [0]=>
-    string(3) "php"
-  }
-}

Zend/tests/bug64979.phpt

@@ -1,32 +0,0 @@
---TEST--
-Bug #64578 (Closures with static variables can be generators)
---XFAIL--
-Bug #64979 not fixed yet.
---FILE--
-<?php
-
-function new_closure_gen() {
-	return function() { 
-		static $foo = 0; 
-		yield ++$foo; 
-	};
-}
-
-$closure1 = new_closure_gen();
-$closure2 = new_closure_gen();
-
-$gen1 = $closure1();
-$gen2 = $closure1();
-$gen3 = $closure2();
-
-foreach (array($gen1, $gen2, $gen3) as $gen) {
-  foreach ($gen as $val) {
-    print "$val\n";
-  }
-}
-
-?>
---EXPECT--
-int(1)
-int(2)
-int(1)

Zend/tests/bug65291.phpt

@@ -1,25 +0,0 @@
---TEST--
-Bug #65291 - get_defined_constants() causes PHP to crash in a very limited case.
---FILE--
-<?php
-
-trait TestTrait
-{
-	public static function testStaticFunction()
-	{
-		return __CLASS__;
-	}
-}
-class Tester
-{
-	use TestTrait;
-}
-
-$foo = Tester::testStaticFunction();
-get_defined_constants();
-get_defined_constants(true);
-
-echo $foo;
-?>
---EXPECT--
-Tester

Zend/tests/bug65372.phpt

@@ -1,40 +0,0 @@
---TEST--
-Bug #65372 (Segfault in gc_zval_possible_root when return reference fails)
---FILE--
-<?php
-
-class ParentClass
-{
-    private static $_OBJECTS;
-
-    public static function Get()
-    {
-        self::$_OBJECTS[1] = new ChildClass();
-        return self::$_OBJECTS[1];    
-    }
-}
-
-class ChildClass extends ParentClass
-{
-    public $Manager;
-
-    function __construct()
-    {
-        $this->Manager = $this;
-    }
-
-    public static function &GetCurrent()
-    {
-        return ChildClass::Get();
-    }
-
-    public static function &Get()
-    {
-        return parent::Get();
-    }
-}
-
-$staff = ChildClass::GetCurrent();
-?>
---EXPECTF--
-Notice: Only variable references should be returned by reference in %sbug65372.php on line 30

Zend/tests/bug65579.phpt

@@ -1,29 +0,0 @@
---TEST--
-Bug #65579 (Using traits with get_class_methods causes segfault)
---FILE--
-<?php
-trait ParentTrait {
-    public function testMethod() { }
-}
-
-trait ChildTrait {
-    use ParentTrait {
-        testMethod as testMethodFromParentTrait;
-    }
-    public function testMethod() { }
-}
-
-class TestClass {
-    use ChildTrait;
-}
-
-$obj = new TestClass();
-var_dump(get_class_methods($obj));
-?>
---EXPECT--
-array(2) {
-  [0]=>
-  string(10) "testMethod"
-  [1]=>
-  string(25) "testmethodfromparenttrait"
-}

Zend/tests/closure_047.phpt

@@ -1,26 +0,0 @@
---TEST--
-Closure 047: Use in preg_replace_callback() using variables by reference
---FILE--
-<?php
-
-function replace_variables($text, $params) {
-	
-	preg_replace_callback( '/(\?)/', function($matches) use (&$params, &$text) {
-	
-		$text = preg_replace( '/(\?)/', array_shift( $params ), $text, 1 );
-	
-	}, $text );
-	
-	return $text;
-}
-
-echo replace_variables('a=?', array('0')) . "\n";
-echo replace_variables('a=?, b=?', array('0', '1')) . "\n";
-echo replace_variables('a=?, b=?, c=?', array('0', '1', '2')) . "\n";
-echo "Done\n";
-?>
---EXPECT--
-a=0
-a=0, b=1
-a=0, b=1, c=2
-Done

Zend/tests/closure_048.phpt

@@ -1,26 +0,0 @@
---TEST--
-Closure 048: Use in preg_replace_callback() using variables by reference
---FILE--
-<?php
-
-function replace_variables($text, $params) {
-	
-	$c = function($matches) use (&$params, &$text) {
-		$text = preg_replace( '/(\?)/', array_shift( $params ), $text, 1 );
-	};
-
-	preg_replace_callback( '/(\?)/', $c, $text );
-	
-	return $text;
-}
-
-echo replace_variables('a=?', array('0')) . "\n";
-echo replace_variables('a=?, b=?', array('0', '1')) . "\n";
-echo replace_variables('a=?, b=?, c=?', array('0', '1', '2')) . "\n";
-echo "Done\n";
-?>
---EXPECT--
-a=0
-a=0, b=1
-a=0, b=1, c=2
-Done

Zend/tests/traits/bugs/overridding-conflicting-methods.phpt

@@ -1,5 +1,5 @@
 --TEST--
-Overriding Conflicting Methods should not result in a notice/warning about collisions
+Overridding Conflicting Methods should not result in a notice/warning about collisions
 --FILE--
 <?php
 error_reporting(E_ALL);

Zend/zend.c

@@ -1092,19 +1092,17 @@ ZEND_API void zend_error(int type, const char *format, ...) /* {{{ */
 		error_filename = "Unknown";
 	}
 
+	va_start(args, format);
+
 #ifdef HAVE_DTRACE
 	if(DTRACE_ERROR_ENABLED()) {
 		char *dtrace_error_buffer;
-		va_start(args, format);
 		zend_vspprintf(&dtrace_error_buffer, 0, format, args);
-		DTRACE_ERROR(dtrace_error_buffer, (char *)error_filename, error_lineno);
+		DTRACE_ERROR(dtrace_error_buffer, error_filename, error_lineno);
 		efree(dtrace_error_buffer);
-		va_end(args);
 	}
 #endif /* HAVE_DTRACE */
 
-	va_start(args, format);
-
 	/* if we don't have a user defined error handler */
 	if (!EG(user_error_handler)
 		|| !(EG(user_error_handler_error_reporting) & type)

Zend/zend_API.c

@@ -2577,12 +2577,7 @@ ZEND_API int zend_register_class_alias_ex(const char *name, int name_len, zend_c
 	char *lcname = zend_str_tolower_dup(name, name_len);
 	int ret;
 
-	if (lcname[0] == '\\') {
-		ret = zend_hash_add(CG(class_table), lcname+1, name_len, &ce, sizeof(zend_class_entry *), NULL);
-	} else {
-		ret = zend_hash_add(CG(class_table), lcname, name_len+1, &ce, sizeof(zend_class_entry *), NULL);
-	}
-
+	ret = zend_hash_add(CG(class_table), lcname, name_len+1, &ce, sizeof(zend_class_entry *), NULL);
 	efree(lcname);
 	if (ret == SUCCESS) {
 		ce->refcount++;
@@ -3985,16 +3980,15 @@ ZEND_API const char* zend_find_alias_name(zend_class_entry *ce, const char *name
 {
 	zend_trait_alias *alias, **alias_ptr;
 
-	if ((alias_ptr = ce->trait_aliases)) {
-		alias = *alias_ptr;
-		while (alias) {
-			if (alias->alias_len == len &&
-				!strncasecmp(name, alias->alias, alias->alias_len)) {
-				return alias->alias;
-			}
-			alias_ptr++;
-			alias = *alias_ptr;
+	alias_ptr = ce->trait_aliases;
+	alias = *alias_ptr;
+	while (alias) {
+		if (alias->alias_len == len &&
+		    !strncasecmp(name, alias->alias, alias->alias_len)) {
+			return alias->alias;
 		}
+		alias_ptr++;
+		alias = *alias_ptr;
 	}
 
 	return name;

Zend/zend_builtin_functions.c

@@ -1399,8 +1399,15 @@ ZEND_FUNCTION(class_alias)
 		return;
 	}
 
-	found = zend_lookup_class_ex(class_name, class_name_len, NULL, autoload, &ce TSRMLS_CC);
+	if (!autoload) {
+		lc_name = do_alloca(class_name_len + 1, use_heap);
+		zend_str_tolower_copy(lc_name, class_name, class_name_len);
 	
+		found = zend_hash_find(EG(class_table), lc_name, class_name_len+1, (void **) &ce);
+		free_alloca(lc_name, use_heap);
+	} else {
+		found = zend_lookup_class(class_name, class_name_len, &ce TSRMLS_CC);
+	}
 	if (found == SUCCESS) {
 		if ((*ce)->type == ZEND_USER_CLASS) { 
 			if (zend_register_class_alias_ex(alias_name, alias_name_len, *ce TSRMLS_CC) == SUCCESS) {
@@ -1904,11 +1911,6 @@ static int add_constant_info(zend_constant *constant, void *arg TSRMLS_DC)
 	zval *name_array = (zval *)arg;
 	zval *const_val;
 
-	if (!constant->name) {
-		/* skip special constants */
-		return 0;
-	}
-
 	MAKE_STD_ZVAL(const_val);
 	*const_val = constant->value;
 	zval_copy_ctor(const_val);
@@ -1976,16 +1978,11 @@ ZEND_FUNCTION(get_defined_constants)
 		while (zend_hash_get_current_data_ex(EG(zend_constants), (void **) &val, &pos) != FAILURE) {
 			zval *const_val;
 
-			if (!val->name) {
-				/* skip special constants */
-				goto next_constant;
-			}
-
 			if (val->module_number == PHP_USER_CONSTANT) {
 				module_number = i;
 			} else if (val->module_number > i || val->module_number < 0) {
 				/* should not happen */
-				goto next_constant;
+				goto bad_module_id;
 			} else {
 				module_number = val->module_number;
 			}
@@ -2002,7 +1999,7 @@ ZEND_FUNCTION(get_defined_constants)
 			INIT_PZVAL(const_val);
 
 			add_assoc_zval_ex(modules[module_number], val->name, val->name_len, const_val);
-next_constant:
+bad_module_id:
 			zend_hash_move_forward_ex(EG(zend_constants), &pos);
 		}
 		efree(module_names);
@@ -2374,7 +2371,7 @@ ZEND_API void zend_fetch_debug_backtrace(zval *return_value, int skip_last, int
 				MAKE_STD_ZVAL(arg_array);
 				array_init(arg_array);
 
-				/* include_filename always points to the last filename of the last last called-function.
+				/* include_filename always points to the last filename of the last last called-fuction.
 				   if we have called include in the frame above - this is the file we have included.
 				 */
 

Zend/zend_compile.c

@@ -1734,7 +1734,7 @@ void zend_do_begin_function_declaration(znode *function_token, znode *function_n
 	}
 
 	{
-		/* Push a separator to the switch stack */
+		/* Push a seperator to the switch stack */
 		zend_switch_entry switch_entry;
 
 		switch_entry.cond.op_type = IS_UNUSED;
@@ -1828,7 +1828,7 @@ void zend_do_end_function_declaration(const znode *function_token TSRMLS_DC) /*
 	CG(active_op_array) = function_token->u.op_array;
 
 
-	/* Pop the switch and foreach separators */
+	/* Pop the switch and foreach seperators */
 	zend_stack_del_top(&CG(switch_cond_stack));
 	zend_stack_del_top(&CG(foreach_copy_stack));
 }
@@ -2671,7 +2671,7 @@ static int generate_free_foreach_copy(const zend_op *foreach_copy TSRMLS_DC) /*
 {
 	zend_op *opline;
 
-	/* If we reach the separator then stop applying the stack */
+	/* If we reach the seperator then stop applying the stack */
 	if (foreach_copy->result_type == IS_UNUSED && foreach_copy->op1_type == IS_UNUSED) {
 		return 1;
 	}

Zend/zend_dtrace.c

@@ -24,7 +24,7 @@
 
 #ifdef HAVE_DTRACE
 /* PHP DTrace probes {{{ */
-static inline const char *dtrace_get_executed_filename(TSRMLS_D)
+static inline char *dtrace_get_executed_filename(TSRMLS_D)
 {
 	if (EG(current_execute_data) && EG(current_execute_data)->op_array) {
 		return EG(current_execute_data)->op_array->filename;
@@ -36,9 +36,9 @@ static inline const char *dtrace_get_executed_filename(TSRMLS_D)
 ZEND_API zend_op_array *dtrace_compile_file(zend_file_handle *file_handle, int type TSRMLS_DC)
 {
 	zend_op_array *res;
-	DTRACE_COMPILE_FILE_ENTRY(file_handle->opened_path, (char *)file_handle->filename);
+	DTRACE_COMPILE_FILE_ENTRY(file_handle->opened_path, file_handle->filename);
 	res = compile_file(file_handle, type TSRMLS_CC);
-	DTRACE_COMPILE_FILE_RETURN(file_handle->opened_path, (char *)file_handle->filename);
+	DTRACE_COMPILE_FILE_RETURN(file_handle->opened_path, file_handle->filename);
 
 	return res;
 }
@@ -47,7 +47,7 @@ ZEND_API zend_op_array *dtrace_compile_file(zend_file_handle *file_handle, int t
 ZEND_API void dtrace_execute_ex(zend_execute_data *execute_data TSRMLS_DC)
 {
 	int lineno;
-	const char *scope, *filename, *funcname, *classname;
+	char *scope, *filename, *funcname, *classname;
 	scope = filename = funcname = classname = NULL;
 
 	/* we need filename and lineno for both execute and function probes */
@@ -58,46 +58,48 @@ ZEND_API void dtrace_execute_ex(zend_execute_data *execute_data TSRMLS_DC)
 	}
 
 	if (DTRACE_FUNCTION_ENTRY_ENABLED() || DTRACE_FUNCTION_RETURN_ENABLED()) {
+		filename = dtrace_get_executed_filename(TSRMLS_C);
 		classname = get_active_class_name(&scope TSRMLS_CC);
 		funcname = get_active_function_name(TSRMLS_C);
+		lineno = zend_get_executed_lineno(TSRMLS_C);
 	}
 
 	if (DTRACE_EXECUTE_ENTRY_ENABLED()) {
-		DTRACE_EXECUTE_ENTRY((char *)filename, lineno);
+		DTRACE_EXECUTE_ENTRY(filename, lineno);
 	}
 
 	if (DTRACE_FUNCTION_ENTRY_ENABLED() && funcname != NULL) {
-		DTRACE_FUNCTION_ENTRY((char *)funcname, (char *)filename, lineno, (char *)classname, (char *)scope);
+		DTRACE_FUNCTION_ENTRY(funcname, filename, lineno, classname, scope);
 	}
 
 	execute_ex(execute_data TSRMLS_CC);
 
 	if (DTRACE_FUNCTION_RETURN_ENABLED() && funcname != NULL) {
-		DTRACE_FUNCTION_RETURN((char *)funcname, (char *)filename, lineno, (char *)classname, (char *)scope);
+		DTRACE_FUNCTION_RETURN(funcname, filename, lineno, classname, scope);
 	}
 
 	if (DTRACE_EXECUTE_RETURN_ENABLED()) {
-		DTRACE_EXECUTE_RETURN((char *)filename, lineno);
+		DTRACE_EXECUTE_RETURN(filename, lineno);
 	}
 }
 
 ZEND_API void dtrace_execute_internal(zend_execute_data *execute_data_ptr, zend_fcall_info *fci, int return_value_used TSRMLS_DC)
 {
 	int lineno;
-	const char *filename;
+	char *filename;
 	if (DTRACE_EXECUTE_ENTRY_ENABLED() || DTRACE_EXECUTE_RETURN_ENABLED()) {
 		filename = dtrace_get_executed_filename(TSRMLS_C);
 		lineno = zend_get_executed_lineno(TSRMLS_C);
 	}
 
 	if (DTRACE_EXECUTE_ENTRY_ENABLED()) {
-		DTRACE_EXECUTE_ENTRY((char *)filename, lineno);
+		DTRACE_EXECUTE_ENTRY(filename, lineno);
 	}
 
 	execute_internal(execute_data_ptr, fci, return_value_used TSRMLS_CC);
 
 	if (DTRACE_EXECUTE_RETURN_ENABLED()) {
-		DTRACE_EXECUTE_RETURN((char *)filename, lineno);
+		DTRACE_EXECUTE_RETURN(filename, lineno);
 	}
 }
 

Zend/zend_exceptions.c

@@ -85,12 +85,12 @@ void zend_throw_exception_internal(zval *exception TSRMLS_DC) /* {{{ */
 {
 #ifdef HAVE_DTRACE
 	if (DTRACE_EXCEPTION_THROWN_ENABLED()) {
-		const char *classname;
-		zend_uint name_len;
+		char *classname;
+		int name_len;
 
 		if (exception != NULL) {
 			zend_get_object_classname(exception, &classname, &name_len TSRMLS_CC);
-			DTRACE_EXCEPTION_THROWN((char *)classname);
+			DTRACE_EXCEPTION_THROWN(classname);
 		} else {
 			DTRACE_EXCEPTION_THROWN(NULL);
 		}

Zend/zend_execute.h

@@ -293,7 +293,7 @@ static zend_always_inline void zend_vm_stack_clear_multiple(int nested TSRMLS_DC
  	void **end = p - (int)(zend_uintptr_t)*p;
 
 	while (p != end) {
-		zval *q = (zval *) *(--p);
+		zval *q = *(zval **)(--p);
 		*p = NULL;
 		i_zval_ptr_dtor(q ZEND_FILE_LINE_CC);
 	}

Zend/zend_execute_API.c

@@ -1054,7 +1054,7 @@ ZEND_API int zend_lookup_class_ex(const char *name, int name_length, const zend_
 	}
 
 	/* The compiler is not-reentrant. Make sure we __autoload() only during run-time
-	 * (doesn't impact functionality of __autoload()
+	 * (doesn't impact fuctionality of __autoload()
 	*/
 	if (!use_autoload || zend_is_compiling(TSRMLS_C)) {
 		if (!key) {

Zend/zend_globals.h

@@ -302,7 +302,7 @@ struct _zend_php_scanner_globals {
 	unsigned char *script_filtered;
 	size_t script_filtered_size;
 
-	/* input/output filters */
+	/* input/ouput filters */
 	zend_encoding_filter input_filter;
 	zend_encoding_filter output_filter;
 	const zend_encoding *script_encoding;

Zend/zend_hash.c

@@ -1168,7 +1168,7 @@ ZEND_API int zend_hash_get_current_key_ex(const HashTable *ht, char **str_index,
 			return HASH_KEY_IS_LONG;
 		}
 	}
-	return HASH_KEY_NON_EXISTENT;
+	return HASH_KEY_NON_EXISTANT;
 }
 
 ZEND_API void zend_hash_get_current_key_zval_ex(const HashTable *ht, zval *key, HashPosition *pos) {
@@ -1205,7 +1205,7 @@ ZEND_API int zend_hash_get_current_key_type_ex(HashTable *ht, HashPosition *pos)
 			return HASH_KEY_IS_LONG;
 		}
 	}
-	return HASH_KEY_NON_EXISTENT;
+	return HASH_KEY_NON_EXISTANT;
 }
 
 

Zend/zend_hash.h

@@ -27,8 +27,7 @@
 
 #define HASH_KEY_IS_STRING 1
 #define HASH_KEY_IS_LONG 2
-#define HASH_KEY_NON_EXISTENT 3
-#define HASH_KEY_NON_EXISTANT HASH_KEY_NON_EXISTENT /* Keeping old define (with typo) for backward compatibility */
+#define HASH_KEY_NON_EXISTANT 3
 
 #define HASH_UPDATE 		(1<<0)
 #define HASH_ADD			(1<<1)
@@ -173,7 +172,7 @@ ZEND_API ulong zend_hash_next_free_element(const HashTable *ht);
 
 /* traversing */
 #define zend_hash_has_more_elements_ex(ht, pos) \
-	(zend_hash_get_current_key_type_ex(ht, pos) == HASH_KEY_NON_EXISTENT ? FAILURE : SUCCESS)
+	(zend_hash_get_current_key_type_ex(ht, pos) == HASH_KEY_NON_EXISTANT ? FAILURE : SUCCESS)
 ZEND_API int zend_hash_move_forward_ex(HashTable *ht, HashPosition *pos);
 ZEND_API int zend_hash_move_backwards_ex(HashTable *ht, HashPosition *pos);
 ZEND_API int zend_hash_get_current_key_ex(const HashTable *ht, char **str_index, uint *str_length, ulong *num_index, zend_bool duplicate, HashPosition *pos);

Zend/zend_language_scanner.h

@@ -45,7 +45,7 @@ typedef struct _zend_lex_state {
 	unsigned char *script_filtered;
 	size_t script_filtered_size;
 
-	/* input/output filters */
+	/* input/ouput filters */
 	zend_encoding_filter input_filter;
 	zend_encoding_filter output_filter;
 	const zend_encoding *script_encoding;

Zend/zend_objects_API.c

@@ -57,11 +57,6 @@ ZEND_API void zend_objects_store_call_destructors(zend_objects_store *objects TS
 					obj->dtor(obj->object, i TSRMLS_CC);
 					obj = &objects->object_buckets[i].bucket.obj;
 					obj->refcount--;
-
-					if (obj->refcount == 0) {
-						/* in case gc_collect_cycle is triggered before free_storage */
-						GC_REMOVE_ZOBJ_FROM_BUFFER(obj);
-					}
 				}
 			}
 		}

Zend/zend_operators.c

@@ -2138,8 +2138,8 @@ ZEND_API void zendi_smart_strcmp(zval *result, zval *s1, zval *s2) /* {{{ */
 {
 	int ret1, ret2;
 	int oflow1, oflow2;
-	long lval1 = 0, lval2 = 0;
-	double dval1 = 0.0, dval2 = 0.0;
+	long lval1, lval2;
+	double dval1, dval2;
 
 	if ((ret1=is_numeric_string_ex(Z_STRVAL_P(s1), Z_STRLEN_P(s1), &lval1, &dval1, 0, &oflow1)) &&
 		(ret2=is_numeric_string_ex(Z_STRVAL_P(s2), Z_STRLEN_P(s2), &lval2, &dval2, 0, &oflow2))) {

Zend/zend_operators.h

@@ -132,7 +132,7 @@ static inline zend_uchar is_numeric_string_ex(const char *str, int length, long
 {
 	const char *ptr;
 	int base = 10, digits = 0, dp_or_e = 0;
-	double local_dval = 0.0;
+	double local_dval;
 	zend_uchar type;
 
 	if (!length) {

Zend/zend_vm_def.h

@@ -2920,12 +2920,9 @@ ZEND_VM_HANDLER(111, ZEND_RETURN_BY_REF, CONST|TMP|VAR|CV, ANY)
 			} else if (EX_T(opline->op1.var).var.ptr_ptr == &EX_T(opline->op1.var).var.ptr) {
 				zend_error(E_NOTICE, "Only variable references should be returned by reference");
 				if (EG(return_value_ptr_ptr)) {
-					zval *ret;
-
-					ALLOC_ZVAL(ret);
-					INIT_PZVAL_COPY(ret, *retval_ptr_ptr);
-					zval_copy_ctor(ret);
-					*EG(return_value_ptr_ptr) = ret;
+					retval_ptr = *retval_ptr_ptr;
+					*EG(return_value_ptr_ptr) = retval_ptr;
+					Z_ADDREF_P(retval_ptr);
 				}
 				break;
 			}
@@ -3010,7 +3007,7 @@ ZEND_VM_HANDLER(107, ZEND_CATCH, CONST, CV)
 
 #ifdef HAVE_DTRACE
 	if (DTRACE_EXCEPTION_CAUGHT_ENABLED()) {
-		DTRACE_EXCEPTION_CAUGHT((char *)ce->name);
+		DTRACE_EXCEPTION_CAUGHT(ce->name);
 	}
 #endif /* HAVE_DTRACE */
 
@@ -4214,7 +4211,7 @@ ZEND_VM_HANDLER(77, ZEND_FE_RESET, CONST|TMP|VAR|CV, ANY)
 				zend_uchar key_type;
 
 				key_type = zend_hash_get_current_key_ex(fe_ht, &str_key, &str_key_len, &int_key, 0, NULL);
-				if (key_type != HASH_KEY_NON_EXISTENT &&
+				if (key_type != HASH_KEY_NON_EXISTANT &&
 					(key_type == HASH_KEY_IS_LONG ||
 				     zend_check_property_access(zobj, str_key, str_key_len-1 TSRMLS_CC) == SUCCESS)) {
 					break;

Zend/zend_vm_execute.h

@@ -20,13 +20,6 @@
 
 #ifdef ZEND_WIN32
 # pragma warning(once : 4101)
-# pragma warning(once : 6235)
-# pragma warning(once : 6237)
-# pragma warning(once : 6239)
-# pragma warning(once : 6240)
-# pragma warning(once : 6285)
-# pragma warning(once : 6286)
-# pragma warning(once : 6326)
 #endif
 static user_opcode_handler_t zend_user_opcode_handlers[256] = {
 	(user_opcode_handler_t)NULL,
@@ -2417,12 +2410,9 @@ static int ZEND_FASTCALL  ZEND_RETURN_BY_REF_SPEC_CONST_HANDLER(ZEND_OPCODE_HAND
 			} else if (EX_T(opline->op1.var).var.ptr_ptr == &EX_T(opline->op1.var).var.ptr) {
 				zend_error(E_NOTICE, "Only variable references should be returned by reference");
 				if (EG(return_value_ptr_ptr)) {
-					zval *ret;
-
-					ALLOC_ZVAL(ret);
-					INIT_PZVAL_COPY(ret, *retval_ptr_ptr);
-					zval_copy_ctor(ret);
-					*EG(return_value_ptr_ptr) = ret;
+					retval_ptr = *retval_ptr_ptr;
+					*EG(return_value_ptr_ptr) = retval_ptr;
+					Z_ADDREF_P(retval_ptr);
 				}
 				break;
 			}
@@ -2890,7 +2880,7 @@ static int ZEND_FASTCALL  ZEND_FE_RESET_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_A
 				zend_uchar key_type;
 
 				key_type = zend_hash_get_current_key_ex(fe_ht, &str_key, &str_key_len, &int_key, 0, NULL);
-				if (key_type != HASH_KEY_NON_EXISTENT &&
+				if (key_type != HASH_KEY_NON_EXISTANT &&
 					(key_type == HASH_KEY_IS_LONG ||
 				     zend_check_property_access(zobj, str_key, str_key_len-1 TSRMLS_CC) == SUCCESS)) {
 					break;
@@ -7128,7 +7118,7 @@ static int ZEND_FASTCALL  ZEND_CATCH_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_A
 
 #ifdef HAVE_DTRACE
 	if (DTRACE_EXCEPTION_CAUGHT_ENABLED()) {
-		DTRACE_EXCEPTION_CAUGHT((char *)ce->name);
+		DTRACE_EXCEPTION_CAUGHT(ce->name);
 	}
 #endif /* HAVE_DTRACE */
 
@@ -7745,12 +7735,9 @@ static int ZEND_FASTCALL  ZEND_RETURN_BY_REF_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLE
 			} else if (EX_T(opline->op1.var).var.ptr_ptr == &EX_T(opline->op1.var).var.ptr) {
 				zend_error(E_NOTICE, "Only variable references should be returned by reference");
 				if (EG(return_value_ptr_ptr)) {
-					zval *ret;
-
-					ALLOC_ZVAL(ret);
-					INIT_PZVAL_COPY(ret, *retval_ptr_ptr);
-					zval_copy_ctor(ret);
-					*EG(return_value_ptr_ptr) = ret;
+					retval_ptr = *retval_ptr_ptr;
+					*EG(return_value_ptr_ptr) = retval_ptr;
+					Z_ADDREF_P(retval_ptr);
 				}
 				break;
 			}
@@ -8219,7 +8206,7 @@ static int ZEND_FASTCALL  ZEND_FE_RESET_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARG
 				zend_uchar key_type;
 
 				key_type = zend_hash_get_current_key_ex(fe_ht, &str_key, &str_key_len, &int_key, 0, NULL);
-				if (key_type != HASH_KEY_NON_EXISTENT &&
+				if (key_type != HASH_KEY_NON_EXISTANT &&
 					(key_type == HASH_KEY_IS_LONG ||
 				     zend_check_property_access(zobj, str_key, str_key_len-1 TSRMLS_CC) == SUCCESS)) {
 					break;
@@ -12974,12 +12961,9 @@ static int ZEND_FASTCALL  ZEND_RETURN_BY_REF_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLE
 			} else if (EX_T(opline->op1.var).var.ptr_ptr == &EX_T(opline->op1.var).var.ptr) {
 				zend_error(E_NOTICE, "Only variable references should be returned by reference");
 				if (EG(return_value_ptr_ptr)) {
-					zval *ret;
-
-					ALLOC_ZVAL(ret);
-					INIT_PZVAL_COPY(ret, *retval_ptr_ptr);
-					zval_copy_ctor(ret);
-					*EG(return_value_ptr_ptr) = ret;
+					retval_ptr = *retval_ptr_ptr;
+					*EG(return_value_ptr_ptr) = retval_ptr;
+					Z_ADDREF_P(retval_ptr);
 				}
 				break;
 			}
@@ -13560,7 +13544,7 @@ static int ZEND_FASTCALL  ZEND_FE_RESET_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARG
 				zend_uchar key_type;
 
 				key_type = zend_hash_get_current_key_ex(fe_ht, &str_key, &str_key_len, &int_key, 0, NULL);
-				if (key_type != HASH_KEY_NON_EXISTENT &&
+				if (key_type != HASH_KEY_NON_EXISTANT &&
 					(key_type == HASH_KEY_IS_LONG ||
 				     zend_check_property_access(zobj, str_key, str_key_len-1 TSRMLS_CC) == SUCCESS)) {
 					break;
@@ -30621,12 +30605,9 @@ static int ZEND_FASTCALL  ZEND_RETURN_BY_REF_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER
 			} else if (EX_T(opline->op1.var).var.ptr_ptr == &EX_T(opline->op1.var).var.ptr) {
 				zend_error(E_NOTICE, "Only variable references should be returned by reference");
 				if (EG(return_value_ptr_ptr)) {
-					zval *ret;
-
-					ALLOC_ZVAL(ret);
-					INIT_PZVAL_COPY(ret, *retval_ptr_ptr);
-					zval_copy_ctor(ret);
-					*EG(return_value_ptr_ptr) = ret;
+					retval_ptr = *retval_ptr_ptr;
+					*EG(return_value_ptr_ptr) = retval_ptr;
+					Z_ADDREF_P(retval_ptr);
 				}
 				break;
 			}
@@ -31194,7 +31175,7 @@ static int ZEND_FASTCALL  ZEND_FE_RESET_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS
 				zend_uchar key_type;
 
 				key_type = zend_hash_get_current_key_ex(fe_ht, &str_key, &str_key_len, &int_key, 0, NULL);
-				if (key_type != HASH_KEY_NON_EXISTENT &&
+				if (key_type != HASH_KEY_NON_EXISTANT &&
 					(key_type == HASH_KEY_IS_LONG ||
 				     zend_check_property_access(zobj, str_key, str_key_len-1 TSRMLS_CC) == SUCCESS)) {
 					break;

Zend/zend_vm_gen.php

@@ -1189,26 +1189,8 @@ function gen_vm($def, $skel) {
 	// Insert header
 	out($f, $GLOBALS['header_text']);
 
-	out($f, "#ifdef ZEND_WIN32\n");
 	// Suppress free_op1 warnings on Windows
-	out($f, "# pragma warning(once : 4101)\n");
-	if (ZEND_VM_SPEC) {
-		// Suppress (<non-zero constant> || <expression>) warnings on windows
-		out($f, "# pragma warning(once : 6235)\n");
-		// Suppress (<zero> && <expression>) warnings on windows
-		out($f, "# pragma warning(once : 6237)\n");
-		// Suppress (<non-zero constant> && <expression>) warnings on windows
-		out($f, "# pragma warning(once : 6239)\n");
-		// Suppress (<expression> && <non-zero constant>) warnings on windows
-		out($f, "# pragma warning(once : 6240)\n");
-		// Suppress (<non-zero constant> || <non-zero constant>) warnings on windows
-		out($f, "# pragma warning(once : 6285)\n");
-		// Suppress (<non-zero constant> || <expression>) warnings on windows
-		out($f, "# pragma warning(once : 6286)\n");
-		// Suppress constant with constant comparsion warnings on windows
-		out($f, "# pragma warning(once : 6326)\n");
-	}
-	out($f, "#endif\n");
+	out($f, "#ifdef ZEND_WIN32\n# pragma warning(once : 4101)\n#endif\n");
 	
 	// Support for ZEND_USER_OPCODE
 	out($f, "static user_opcode_handler_t zend_user_opcode_handlers[256] = {\n");

acinclude.m4

@@ -2925,17 +2925,17 @@ dnl providerdesc
 dnl header-file
   ac_hdrobj=$2
 
-dnl Add providerdesc.o or .lo into global objects when needed
+dnl Add providerdesc.o into global objects when needed
   case $host_alias in
   *freebsd*)
     PHP_GLOBAL_OBJS="[$]PHP_GLOBAL_OBJS [$]ac_bdir[$]ac_provsrc.o"
     PHP_LDFLAGS="$PHP_LDFLAGS -lelf"
     ;;
   *solaris*)
-    PHP_GLOBAL_OBJS="[$]PHP_GLOBAL_OBJS [$]ac_bdir[$]ac_provsrc.lo"
+    PHP_GLOBAL_OBJS="[$]PHP_GLOBAL_OBJS [$]ac_bdir[$]ac_provsrc.o"
     ;;
   *linux*)
-    PHP_GLOBAL_OBJS="[$]PHP_GLOBAL_OBJS [$]ac_bdir[$]ac_provsrc.lo"
+    PHP_GLOBAL_OBJS="[$]PHP_GLOBAL_OBJS [$]ac_bdir[$]ac_provsrc.o"
     ;;
   esac
 
@@ -2962,53 +2962,15 @@ dnl DTrace objects
   esac
 
 dnl Generate Makefile.objects entries
-dnl The empty $ac_provsrc command stops an implicit circular dependency
-dnl in GNU Make which causes the .d file to be overwritten (Bug 61268)
   cat>>Makefile.objects<<EOF
 
-$abs_srcdir/$ac_provsrc:;
-
 $ac_bdir[$]ac_hdrobj: $abs_srcdir/$ac_provsrc
-	CFLAGS="\$(CFLAGS_CLEAN)" dtrace -h -C -s $ac_srcdir[$]ac_provsrc -o \$[]@.bak && \$(SED) -e 's,PHP_,DTRACE_,g' \$[]@.bak > \$[]@
+	CFLAGS="\$(CFLAGS_CLEAN)" dtrace -h -C -s $ac_srcdir[$]ac_provsrc -o \$[]@ && \$(SED) -ibak 's,PHP_,DTRACE_,g' \$[]@
 
 \$(PHP_DTRACE_OBJS): $ac_bdir[$]ac_hdrobj
 
-EOF
-
-  case $host_alias in
-  *solaris*|*linux*)
-    dtrace_prov_name="`echo $ac_provsrc | $SED -e 's#\(.*\)\/##'`.o"
-    dtrace_lib_dir="`echo $ac_bdir[$]ac_provsrc | $SED -e 's#\(.*\)/[^/]*#\1#'`/.libs"
-    dtrace_d_obj="`echo $ac_bdir[$]ac_provsrc | $SED -e 's#\(.*\)/\([^/]*\)#\1/.libs/\2#'`.o"
-    dtrace_nolib_objs='$(PHP_DTRACE_OBJS:.lo=.o)'
-    for ac_lo in $PHP_DTRACE_OBJS; do
-      dtrace_lib_objs="[$]dtrace_lib_objs `echo $ac_lo | $SED -e 's,\.lo$,.o,' -e 's#\(.*\)\/#\1\/.libs\/#'`"
-    done;
-dnl Always attempt to create both PIC and non-PIC DTrace objects (Bug 63692)
-    cat>>Makefile.objects<<EOF
-$ac_bdir[$]ac_provsrc.lo: \$(PHP_DTRACE_OBJS)
-	echo "[#] Generated by Makefile for libtool" > \$[]@
-	@test -d "$dtrace_lib_dir" || mkdir $dtrace_lib_dir
-	if CFLAGS="\$(CFLAGS_CLEAN)" dtrace -G -o $dtrace_d_obj -s $abs_srcdir/$ac_provsrc $dtrace_lib_objs 2> /dev/null && test -f "$dtrace_d_obj"; then [\\]
-	  echo "pic_object=['].libs/$dtrace_prov_name[']" >> \$[]@ [;\\]
-	else [\\]
-	  echo "pic_object='none'" >> \$[]@ [;\\]
-	fi
-	if CFLAGS="\$(CFLAGS_CLEAN)" dtrace -G -o $ac_bdir[$]ac_provsrc.o -s $abs_srcdir/$ac_provsrc $dtrace_nolib_objs 2> /dev/null && test -f "$ac_bdir[$]ac_provsrc.o"; then [\\]
-	  echo "non_pic_object=[']$dtrace_prov_name[']" >> \$[]@ [;\\]
-	else [\\]
-	  echo "non_pic_object='none'" >> \$[]@ [;\\]
-	fi
-
-EOF
-
-    ;;
-  *)
-cat>>Makefile.objects<<EOF
 $ac_bdir[$]ac_provsrc.o: \$(PHP_DTRACE_OBJS)
 	CFLAGS="\$(CFLAGS_CLEAN)" dtrace -G -o \$[]@ -s $abs_srcdir/$ac_provsrc $dtrace_objs
 
 EOF
-    ;;
-  esac
 ])

build/libtool.m4

@@ -193,11 +193,11 @@ AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
 enable_win32_dll=yes, enable_win32_dll=no)
 
 AC_ARG_ENABLE([libtool-lock],
-[  --disable-libtool-lock  Avoid locking (might break parallel builds)])
+[  --disable-libtool-lock  avoid locking (might break parallel builds)])
 test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
 
 AC_ARG_WITH([pic],
-[  --with-pic              Try to use only PIC/non-PIC objects [default=use both]],
+[  --with-pic              try to use only PIC/non-PIC objects [default=use both]],
     [pic_mode="$withval"],
     [pic_mode=default])
 test -z "$pic_mode" && pic_mode=default
@@ -1919,7 +1919,7 @@ fi
 AC_DEFUN([_LT_AC_TAGCONFIG],
 [AC_REQUIRE([LT_AC_PROG_SED])dnl
 AC_ARG_WITH([tags],
-[  --with-tags[=TAGS]        Include additional configurations [automatic]
+[  --with-tags[=TAGS]      include additional configurations [automatic]
 ],
 [tagnames="$withval"])
 
@@ -2023,7 +2023,7 @@ AC_DEFUN([AC_ENABLE_SHARED],
 [define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
 AC_ARG_ENABLE([shared],
 changequote(<<, >>)dnl
-<<  --enable-shared[=PKGS]    Build shared libraries [default=>>AC_ENABLE_SHARED_DEFAULT],
+<<  --enable-shared[=PKGS]  build shared libraries [default=>>AC_ENABLE_SHARED_DEFAULT],
 changequote([, ])dnl
     [p=${PACKAGE-default}
     case $enableval in
@@ -2063,7 +2063,7 @@ AC_DEFUN([AC_ENABLE_STATIC],
 [define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
 AC_ARG_ENABLE([static],
 changequote(<<, >>)dnl
-<<  --enable-static[=PKGS]    Build static libraries [default=>>AC_ENABLE_STATIC_DEFAULT],
+<<  --enable-static[=PKGS]  build static libraries [default=>>AC_ENABLE_STATIC_DEFAULT],
 changequote([, ])dnl
     [p=${PACKAGE-default}
     case $enableval in
@@ -2103,8 +2103,7 @@ AC_DEFUN([AC_ENABLE_FAST_INSTALL],
 [define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
 AC_ARG_ENABLE([fast-install],
 changequote(<<, >>)dnl
-<<  --enable-fast-install[=PKGS]
-                          Optimize for fast installation [default=>>AC_ENABLE_FAST_INSTALL_DEFAULT],
+<<  --enable-fast-install[=PKGS]  optimize for fast installation [default=>>AC_ENABLE_FAST_INSTALL_DEFAULT],
 changequote([, ])dnl
     [p=${PACKAGE-default}
     case $enableval in
@@ -2242,7 +2241,7 @@ fi
 # find the pathname to the GNU or non-GNU linker
 AC_DEFUN([AC_PROG_LD],
 [AC_ARG_WITH([gnu-ld],
-[  --with-gnu-ld           Assume the C compiler uses GNU ld [default=no]],
+[  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
     [test "$withval" = no || with_gnu_ld=yes],
     [with_gnu_ld=no])
 AC_REQUIRE([LT_AC_PROG_SED])dnl

configure.in

@@ -119,8 +119,8 @@ int zend_sprintf(char *buffer, const char *format, ...);
 
 PHP_MAJOR_VERSION=5
 PHP_MINOR_VERSION=5
-PHP_RELEASE_VERSION=4
-PHP_EXTRA_VERSION="RC1"
+PHP_RELEASE_VERSION=1
+PHP_EXTRA_VERSION=""
 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`
 
@@ -1006,7 +1006,7 @@ dnl Check if all enabled by default extensions should be disabled
 dnl
 
 AC_ARG_ENABLE(all,
-[  --disable-all           Disable all extensions which are enabled by default
+[ --disable-all   Disable all extensions which are enabled by default
 ], [
   PHP_ENABLE_ALL=$enableval
 ])
@@ -1582,7 +1582,7 @@ cat <<X
 | see the file debug.log for error messages.                         |
 |                                                                    |
 | If you are unable to fix this, send the file debug.log to the      |
-| php-install@lists.php.net mailing list and include appropriate      |
+| php-install@lists.php.net mailing list and include appropiate      |
 | information about your setup.                                      |
 X
   fi

ext/bz2/bz2_filter.c

@@ -215,6 +215,7 @@ static php_stream_filter_status_t php_bz2_compress_filter(
 	size_t consumed = 0;
 	int status;
 	php_stream_filter_status_t exit_status = PSFS_FEED_ME;
+	bz_stream *streamp;
 
 	if (!thisfilter || !thisfilter->abstract) {
 		/* Should never happen */
@@ -222,6 +223,7 @@ static php_stream_filter_status_t php_bz2_compress_filter(
 	}
 
 	data = (php_bz2_filter_data *)(thisfilter->abstract);
+	streamp = &(data->strm);
 
 	while (buckets_in->head) {
 		size_t bin = 0, desired;

ext/bz2/config.m4

@@ -3,7 +3,7 @@ dnl $Id$
 dnl
 
 PHP_ARG_WITH(bz2, for BZip2 support,
-[  --with-bz2[=DIR]          Include BZip2 support])
+[  --with-bz2[=DIR]        Include BZip2 support])
 
 if test "$PHP_BZ2" != "no"; then
   if test -r $PHP_BZ2/include/bzlib.h; then

ext/com_dotnet/com_variant.c

@@ -53,7 +53,7 @@ static void safe_array_from_zval(VARIANT *v, zval *z, int codepage TSRMLS_DC)
 
 		if (HASH_KEY_IS_STRING == keytype) {
 			goto bogus;
-		} else if (HASH_KEY_NON_EXISTENT == keytype) {
+		} else if (HASH_KEY_NON_EXISTANT == keytype) {
 			break;
 		}
 		if (intindex > max_index) {

ext/com_dotnet/com_wrapper.c

@@ -467,7 +467,7 @@ static void generate_dispids(php_dispatchex *disp TSRMLS_DC)
 	/* properties */
 	if (Z_OBJPROP_P(disp->object)) {
 		zend_hash_internal_pointer_reset_ex(Z_OBJPROP_P(disp->object), &pos);
-		while (HASH_KEY_NON_EXISTENT != (keytype =
+		while (HASH_KEY_NON_EXISTANT != (keytype =
 				zend_hash_get_current_key_ex(Z_OBJPROP_P(disp->object), &name,
 			   	&namelen, &pid, 0, &pos))) {
 			char namebuf[32];
@@ -498,7 +498,7 @@ static void generate_dispids(php_dispatchex *disp TSRMLS_DC)
 	/* functions */
 	if (Z_OBJCE_P(disp->object)) {
 		zend_hash_internal_pointer_reset_ex(&Z_OBJCE_P(disp->object)->function_table, &pos);
-		while (HASH_KEY_NON_EXISTENT != (keytype =
+		while (HASH_KEY_NON_EXISTANT != (keytype =
 				zend_hash_get_current_key_ex(&Z_OBJCE_P(disp->object)->function_table,
 			 	&name, &namelen, &pid, 0, &pos))) {
 
@@ -598,7 +598,7 @@ PHP_COM_DOTNET_API IDispatch *php_com_wrapper_export_as_sink(zval *val, GUID *si
 	zend_hash_init(disp->name_to_dispid, 0, NULL, ZVAL_PTR_DTOR, 0);
 	
 	zend_hash_internal_pointer_reset_ex(id_to_name, &pos);
-	while (HASH_KEY_NON_EXISTENT != (keytype =
+	while (HASH_KEY_NON_EXISTANT != (keytype =
 				zend_hash_get_current_key_ex(id_to_name, &name, &namelen, &pid, 0, &pos))) {
 
 		if (keytype == HASH_KEY_IS_LONG) {

ext/curl/config.m4

@@ -3,7 +3,7 @@ dnl $Id$
 dnl
 
 PHP_ARG_WITH(curl, for cURL support,
-[  --with-curl[=DIR]         Include cURL support])
+[  --with-curl[=DIR]       Include cURL support])
 
 if test "$PHP_CURL" != "no"; then
   if test -r $PHP_CURL/include/curl/easy.h; then

ext/curl/interface.c

@@ -1717,9 +1717,9 @@ static void curl_free_post(void **post)
 
 /* {{{ curl_free_slist
  */
-static void curl_free_slist(void *slist)
+static void curl_free_slist(void **slist)
 {
-	curl_slist_free_all(*((struct curl_slist **) slist));
+	curl_slist_free_all((struct curl_slist *) *slist);
 }
 /* }}} */
 
@@ -1790,11 +1790,9 @@ static void alloc_curl_handle(php_curl **ch)
 	(*ch)->handlers->read->stream = NULL;
 
 	zend_llist_init(&(*ch)->to_free->str,   sizeof(char *),            (llist_dtor_func_t) curl_free_string, 0);
+	zend_llist_init(&(*ch)->to_free->slist, sizeof(struct curl_slist), (llist_dtor_func_t) curl_free_slist,  0);
 	zend_llist_init(&(*ch)->to_free->post,  sizeof(struct HttpPost),   (llist_dtor_func_t) curl_free_post,   0);
 	(*ch)->safe_upload = 0; /* for now, for BC reason we allow unsafe API */
-
-	(*ch)->to_free->slist = emalloc(sizeof(HashTable));
-	zend_hash_init((*ch)->to_free->slist, 4, NULL, curl_free_slist, 0);
 }
 /* }}} */
 
@@ -2045,7 +2043,6 @@ PHP_FUNCTION(curl_copy_handle)
 	}
 #endif
 
-	efree(dupch->to_free->slist);
 	efree(dupch->to_free);
 	dupch->to_free = ch->to_free;
 
@@ -2441,7 +2438,7 @@ string_copy:
 
 			ph = HASH_OF(*zvalue);
 			if (!ph) {
-				char *name = NULL;
+				char *name;
 				switch (option) {
 					case CURLOPT_HTTPHEADER:
 						name = "CURLOPT_HTTPHEADER";
@@ -2491,7 +2488,7 @@ string_copy:
 					return 1;
 				}
 			}
-			zend_hash_index_update(ch->to_free->slist, (ulong) option, &slist, sizeof(struct curl_slist *), NULL);
+			zend_llist_add_element(&ch->to_free->slist, &slist);
 
 			error = curl_easy_setopt(ch->cp, option, slist);
 
@@ -3269,9 +3266,8 @@ static void _php_curl_close_ex(php_curl *ch TSRMLS_DC)
 	/* cURL destructors should be invoked only by last curl handle */
 	if (Z_REFCOUNT_P(ch->clone) <= 1) {
 		zend_llist_clean(&ch->to_free->str);
+		zend_llist_clean(&ch->to_free->slist);
 		zend_llist_clean(&ch->to_free->post);
-		zend_hash_destroy(ch->to_free->slist);
-		efree(ch->to_free->slist);
 		efree(ch->to_free);
 		FREE_ZVAL(ch->clone);
 	} else {

ext/curl/php_curl.h

@@ -168,7 +168,7 @@ struct _php_curl_send_headers {
 struct _php_curl_free {
 	zend_llist str;
 	zend_llist post;
-	HashTable *slist;
+	zend_llist slist;
 };
 
 typedef struct {

ext/curl/tests/bug65458.phpt

@@ -1,25 +0,0 @@
---TEST--
-Bug #65458 (curl memory leak)
---SKIPIF--
-<?php
-if (!extension_loaded('curl')) exit("skip curl extension not loaded");
-?>
---FILE--
-<?php
-$ch = curl_init();
-$init = memory_get_usage();
-for ($i = 0; $i < 10000; $i++) {
-    curl_setopt($ch, CURLOPT_HTTPHEADER, [ "SOAPAction: getItems" ]);
-}
-
-$preclose = memory_get_usage();
-curl_close($ch);
-
-// This is a slightly tricky heuristic, but basically, we want to ensure
-// $preclose - $init has a delta in the order of bytes, not megabytes. Given
-// the number of iterations in the loop, if we're wasting memory here, we
-// should have megs and megs of extra allocations.
-var_dump(($preclose - $init) < 10000);
-?>
---EXPECT--
-bool(true)

ext/date/lib/parse_date.c

@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Sun Aug 25 15:12:48 2013 */
+/* Generated by re2c 0.13.5 on Fri Apr 26 11:10:28 2013 */
 #line 1 "ext/date/lib/parse_date.re"
 /*
    +----------------------------------------------------------------------+
@@ -616,8 +616,7 @@ static const timelib_relunit* timelib_lookup_relunit(char **ptr)
 	char *begin = *ptr, *end;
 	const timelib_relunit *tp, *value = NULL;
 
-	while (**ptr != '\0' && **ptr != ' ' && **ptr != ',' && **ptr != '\t' && **ptr != ';' && **ptr != ':' &&
-           **ptr != '/' && **ptr != '.' && **ptr != '-' && **ptr != '(' && **ptr != ')' ) {
+	while (**ptr != '\0' && **ptr != ' ' && **ptr != ',' && **ptr != '\t') {
 		++*ptr;
 	}
 	end = *ptr;
@@ -837,11 +836,11 @@ static int scan(Scanner *s, timelib_tz_get_wrapper tz_get_wrapper)
 std:
 	s->tok = cursor;
 	s->len = 0;
-#line 963 "ext/date/lib/parse_date.re"
+#line 962 "ext/date/lib/parse_date.re"
 
 
 
-#line 845 "ext/date/lib/parse_date.c"
+#line 844 "ext/date/lib/parse_date.c"
 {
 	YYCTYPE yych;
 	unsigned int yyaccept = 0;
@@ -961,7 +960,7 @@ std:
 	}
 yy2:
 	YYDEBUG(2, *YYCURSOR);
-#line 1049 "ext/date/lib/parse_date.re"
+#line 1048 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("firstdayof | lastdayof");
 		TIMELIB_INIT;
@@ -977,7 +976,7 @@ yy2:
 		TIMELIB_DEINIT;
 		return TIMELIB_LF_DAY_OF_MONTH;
 	}
-#line 981 "ext/date/lib/parse_date.c"
+#line 980 "ext/date/lib/parse_date.c"
 yy3:
 	YYDEBUG(3, *YYCURSOR);
 	++YYCURSOR;
@@ -1000,7 +999,7 @@ yy3:
 	}
 yy4:
 	YYDEBUG(4, *YYCURSOR);
-#line 1643 "ext/date/lib/parse_date.re"
+#line 1642 "ext/date/lib/parse_date.re"
 	{
 		int tz_not_found;
 		DEBUG_OUTPUT("tzcorrection | tz");
@@ -1013,7 +1012,7 @@ yy4:
 		TIMELIB_DEINIT;
 		return TIMELIB_TIMEZONE;
 	}
-#line 1017 "ext/date/lib/parse_date.c"
+#line 1016 "ext/date/lib/parse_date.c"
 yy5:
 	YYDEBUG(5, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -1324,12 +1323,12 @@ yy12:
 	if (yych <= '9') goto yy1385;
 yy13:
 	YYDEBUG(13, *YYCURSOR);
-#line 1738 "ext/date/lib/parse_date.re"
+#line 1737 "ext/date/lib/parse_date.re"
 	{
 		add_error(s, "Unexpected character");
 		goto std;
 	}
-#line 1333 "ext/date/lib/parse_date.c"
+#line 1332 "ext/date/lib/parse_date.c"
 yy14:
 	YYDEBUG(14, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -2386,11 +2385,11 @@ yy49:
 	if (yych <= '9') goto yy55;
 yy50:
 	YYDEBUG(50, *YYCURSOR);
-#line 1727 "ext/date/lib/parse_date.re"
+#line 1726 "ext/date/lib/parse_date.re"
 	{
 		goto std;
 	}
-#line 2394 "ext/date/lib/parse_date.c"
+#line 2393 "ext/date/lib/parse_date.c"
 yy51:
 	YYDEBUG(51, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -2399,12 +2398,12 @@ yy52:
 	YYDEBUG(52, *YYCURSOR);
 	++YYCURSOR;
 	YYDEBUG(53, *YYCURSOR);
-#line 1732 "ext/date/lib/parse_date.re"
+#line 1731 "ext/date/lib/parse_date.re"
 	{
 		s->pos = cursor; s->line++;
 		goto std;
 	}
-#line 2408 "ext/date/lib/parse_date.c"
+#line 2407 "ext/date/lib/parse_date.c"
 yy54:
 	YYDEBUG(54, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -2791,7 +2790,7 @@ yy72:
 	if (yych == 's') goto yy74;
 yy73:
 	YYDEBUG(73, *YYCURSOR);
-#line 1711 "ext/date/lib/parse_date.re"
+#line 1710 "ext/date/lib/parse_date.re"
 	{
 		timelib_ull i;
 		DEBUG_OUTPUT("relative");
@@ -2806,7 +2805,7 @@ yy73:
 		TIMELIB_DEINIT;
 		return TIMELIB_RELATIVE;
 	}
-#line 2810 "ext/date/lib/parse_date.c"
+#line 2809 "ext/date/lib/parse_date.c"
 yy74:
 	YYDEBUG(74, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -3568,7 +3567,7 @@ yy166:
 	}
 yy167:
 	YYDEBUG(167, *YYCURSOR);
-#line 1574 "ext/date/lib/parse_date.re"
+#line 1573 "ext/date/lib/parse_date.re"
 	{
 		const timelib_relunit* relunit;
 		DEBUG_OUTPUT("daytext");
@@ -3585,7 +3584,7 @@ yy167:
 		TIMELIB_DEINIT;
 		return TIMELIB_WEEKDAY;
 	}
-#line 3589 "ext/date/lib/parse_date.c"
+#line 3588 "ext/date/lib/parse_date.c"
 yy168:
 	YYDEBUG(168, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -4105,7 +4104,7 @@ yy193:
 	}
 yy194:
 	YYDEBUG(194, *YYCURSOR);
-#line 1633 "ext/date/lib/parse_date.re"
+#line 1632 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("monthtext");
 		TIMELIB_INIT;
@@ -4114,7 +4113,7 @@ yy194:
 		TIMELIB_DEINIT;
 		return TIMELIB_DATE_TEXT;
 	}
-#line 4118 "ext/date/lib/parse_date.c"
+#line 4117 "ext/date/lib/parse_date.c"
 yy195:
 	YYDEBUG(195, *YYCURSOR);
 	++YYCURSOR;
@@ -4165,7 +4164,7 @@ yy198:
 	}
 yy199:
 	YYDEBUG(199, *YYCURSOR);
-#line 1379 "ext/date/lib/parse_date.re"
+#line 1378 "ext/date/lib/parse_date.re"
 	{
 		int length = 0;
 		DEBUG_OUTPUT("datetextual | datenoyear");
@@ -4178,7 +4177,7 @@ yy199:
 		TIMELIB_DEINIT;
 		return TIMELIB_DATE_TEXT;
 	}
-#line 4182 "ext/date/lib/parse_date.c"
+#line 4181 "ext/date/lib/parse_date.c"
 yy200:
 	YYDEBUG(200, *YYCURSOR);
 	yyaccept = 6;
@@ -4447,7 +4446,7 @@ yy222:
 	}
 yy223:
 	YYDEBUG(223, *YYCURSOR);
-#line 1681 "ext/date/lib/parse_date.re"
+#line 1680 "ext/date/lib/parse_date.re"
 	{
 		int tz_not_found;
 		DEBUG_OUTPUT("dateshortwithtimeshort | dateshortwithtimelong | dateshortwithtimelongtz");
@@ -4476,7 +4475,7 @@ yy223:
 		TIMELIB_DEINIT;
 		return TIMELIB_SHORTDATE_WITH_TIME;
 	}
-#line 4480 "ext/date/lib/parse_date.c"
+#line 4479 "ext/date/lib/parse_date.c"
 yy224:
 	YYDEBUG(224, *YYCURSOR);
 	yyaccept = 7;
@@ -5174,7 +5173,7 @@ yy278:
 	YYDEBUG(278, *YYCURSOR);
 	++YYCURSOR;
 	YYDEBUG(279, *YYCURSOR);
-#line 1657 "ext/date/lib/parse_date.re"
+#line 1656 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("dateshortwithtimeshort12 | dateshortwithtimelong12");
 		TIMELIB_INIT;
@@ -5197,7 +5196,7 @@ yy278:
 		TIMELIB_DEINIT;
 		return TIMELIB_SHORTDATE_WITH_TIME;
 	}
-#line 5201 "ext/date/lib/parse_date.c"
+#line 5200 "ext/date/lib/parse_date.c"
 yy280:
 	YYDEBUG(280, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -5375,7 +5374,7 @@ yy294:
 	++YYCURSOR;
 yy295:
 	YYDEBUG(295, *YYCURSOR);
-#line 1351 "ext/date/lib/parse_date.re"
+#line 1350 "ext/date/lib/parse_date.re"
 	{
 		int length = 0;
 		DEBUG_OUTPUT("datenoday");
@@ -5388,7 +5387,7 @@ yy295:
 		TIMELIB_DEINIT;
 		return TIMELIB_DATE_NO_DAY;
 	}
-#line 5392 "ext/date/lib/parse_date.c"
+#line 5391 "ext/date/lib/parse_date.c"
 yy296:
 	YYDEBUG(296, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -6608,7 +6607,7 @@ yy362:
 	if (yych <= '9') goto yy365;
 yy364:
 	YYDEBUG(364, *YYCURSOR);
-#line 1495 "ext/date/lib/parse_date.re"
+#line 1494 "ext/date/lib/parse_date.re"
 	{
 		int length = 0;
 		DEBUG_OUTPUT("pgtextshort");
@@ -6621,7 +6620,7 @@ yy364:
 		TIMELIB_DEINIT;
 		return TIMELIB_PG_TEXT;
 	}
-#line 6625 "ext/date/lib/parse_date.c"
+#line 6624 "ext/date/lib/parse_date.c"
 yy365:
 	YYDEBUG(365, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -7259,7 +7258,7 @@ yy392:
 	}
 yy393:
 	YYDEBUG(393, *YYCURSOR);
-#line 1553 "ext/date/lib/parse_date.re"
+#line 1552 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("ago");
 		TIMELIB_INIT;
@@ -7279,7 +7278,7 @@ yy393:
 		TIMELIB_DEINIT;
 		return TIMELIB_AGO;
 	}
-#line 7283 "ext/date/lib/parse_date.c"
+#line 7282 "ext/date/lib/parse_date.c"
 yy394:
 	YYDEBUG(394, *YYCURSOR);
 	yyaccept = 5;
@@ -9029,7 +9028,7 @@ yy454:
 	++YYCURSOR;
 yy455:
 	YYDEBUG(455, *YYCURSOR);
-#line 1256 "ext/date/lib/parse_date.re"
+#line 1255 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("iso8601date4 | iso8601date2 | iso8601dateslash | dateslash");
 		TIMELIB_INIT;
@@ -9040,7 +9039,7 @@ yy455:
 		TIMELIB_DEINIT;
 		return TIMELIB_ISO_DATE;
 	}
-#line 9044 "ext/date/lib/parse_date.c"
+#line 9043 "ext/date/lib/parse_date.c"
 yy456:
 	YYDEBUG(456, *YYCURSOR);
 	yyaccept = 0;
@@ -9600,7 +9599,7 @@ yy475:
 	}
 yy476:
 	YYDEBUG(476, *YYCURSOR);
-#line 1393 "ext/date/lib/parse_date.re"
+#line 1392 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("datenoyearrev");
 		TIMELIB_INIT;
@@ -9611,7 +9610,7 @@ yy476:
 		TIMELIB_DEINIT;
 		return TIMELIB_DATE_TEXT;
 	}
-#line 9615 "ext/date/lib/parse_date.c"
+#line 9614 "ext/date/lib/parse_date.c"
 yy477:
 	YYDEBUG(477, *YYCURSOR);
 	yyaccept = 10;
@@ -9752,7 +9751,7 @@ yy488:
 	YYDEBUG(488, *YYCURSOR);
 	++YYCURSOR;
 	YYDEBUG(489, *YYCURSOR);
-#line 1111 "ext/date/lib/parse_date.re"
+#line 1110 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("timetiny12 | timeshort12 | timelong12");
 		TIMELIB_INIT;
@@ -9768,7 +9767,7 @@ yy488:
 		TIMELIB_DEINIT;
 		return TIMELIB_TIME12;
 	}
-#line 9772 "ext/date/lib/parse_date.c"
+#line 9771 "ext/date/lib/parse_date.c"
 yy490:
 	YYDEBUG(490, *YYCURSOR);
 	yyaccept = 11;
@@ -9781,7 +9780,7 @@ yy490:
 	}
 yy491:
 	YYDEBUG(491, *YYCURSOR);
-#line 1148 "ext/date/lib/parse_date.re"
+#line 1147 "ext/date/lib/parse_date.re"
 	{
 		int tz_not_found;
 		DEBUG_OUTPUT("timeshort24 | timelong24 | iso8601long");
@@ -9806,7 +9805,7 @@ yy491:
 		TIMELIB_DEINIT;
 		return TIMELIB_TIME24_WITH_ZONE;
 	}
-#line 9810 "ext/date/lib/parse_date.c"
+#line 9809 "ext/date/lib/parse_date.c"
 yy492:
 	YYDEBUG(492, *YYCURSOR);
 	yyaccept = 11;
@@ -10116,7 +10115,7 @@ yy523:
 	YYDEBUG(523, *YYCURSOR);
 	++YYCURSOR;
 	YYDEBUG(524, *YYCURSOR);
-#line 1128 "ext/date/lib/parse_date.re"
+#line 1127 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("mssqltime");
 		TIMELIB_INIT;
@@ -10135,7 +10134,7 @@ yy523:
 		TIMELIB_DEINIT;
 		return TIMELIB_TIME24_WITH_ZONE;
 	}
-#line 10139 "ext/date/lib/parse_date.c"
+#line 10138 "ext/date/lib/parse_date.c"
 yy525:
 	YYDEBUG(525, *YYCURSOR);
 	yyaccept = 11;
@@ -10241,7 +10240,7 @@ yy534:
 	if (yych <= '9') goto yy541;
 yy535:
 	YYDEBUG(535, *YYCURSOR);
-#line 1310 "ext/date/lib/parse_date.re"
+#line 1309 "ext/date/lib/parse_date.re"
 	{
 		int length = 0;
 		DEBUG_OUTPUT("datefull");
@@ -10255,7 +10254,7 @@ yy535:
 		TIMELIB_DEINIT;
 		return TIMELIB_DATE_FULL;
 	}
-#line 10259 "ext/date/lib/parse_date.c"
+#line 10258 "ext/date/lib/parse_date.c"
 yy536:
 	YYDEBUG(536, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -10992,7 +10991,7 @@ yy605:
 	YYDEBUG(606, *YYCURSOR);
 	++YYCURSOR;
 	YYDEBUG(607, *YYCURSOR);
-#line 1325 "ext/date/lib/parse_date.re"
+#line 1324 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("pointed date YYYY");
 		TIMELIB_INIT;
@@ -11003,7 +11002,7 @@ yy605:
 		TIMELIB_DEINIT;
 		return TIMELIB_DATE_FULL_POINTED;
 	}
-#line 11007 "ext/date/lib/parse_date.c"
+#line 11006 "ext/date/lib/parse_date.c"
 yy608:
 	YYDEBUG(608, *YYCURSOR);
 	yyaccept = 11;
@@ -11039,7 +11038,7 @@ yy611:
 	if (yych <= '9') goto yy605;
 yy612:
 	YYDEBUG(612, *YYCURSOR);
-#line 1337 "ext/date/lib/parse_date.re"
+#line 1336 "ext/date/lib/parse_date.re"
 	{
 		int length = 0;
 		DEBUG_OUTPUT("pointed date YY");
@@ -11052,7 +11051,7 @@ yy612:
 		TIMELIB_DEINIT;
 		return TIMELIB_DATE_FULL_POINTED;
 	}
-#line 11056 "ext/date/lib/parse_date.c"
+#line 11055 "ext/date/lib/parse_date.c"
 yy613:
 	YYDEBUG(613, *YYCURSOR);
 	yyaccept = 11;
@@ -11693,7 +11692,7 @@ yy656:
 	}
 yy657:
 	YYDEBUG(657, *YYCURSOR);
-#line 1296 "ext/date/lib/parse_date.re"
+#line 1295 "ext/date/lib/parse_date.re"
 	{
 		int length = 0;
 		DEBUG_OUTPUT("gnudateshort");
@@ -11706,7 +11705,7 @@ yy657:
 		TIMELIB_DEINIT;
 		return TIMELIB_ISO_DATE;
 	}
-#line 11710 "ext/date/lib/parse_date.c"
+#line 11709 "ext/date/lib/parse_date.c"
 yy658:
 	YYDEBUG(658, *YYCURSOR);
 	yyaccept = 13;
@@ -11812,7 +11811,7 @@ yy666:
 	}
 yy667:
 	YYDEBUG(667, *YYCURSOR);
-#line 1240 "ext/date/lib/parse_date.re"
+#line 1239 "ext/date/lib/parse_date.re"
 	{
 		int length = 0;
 		DEBUG_OUTPUT("americanshort | american");
@@ -11827,7 +11826,7 @@ yy667:
 		TIMELIB_DEINIT;
 		return TIMELIB_AMERICAN;
 	}
-#line 11831 "ext/date/lib/parse_date.c"
+#line 11830 "ext/date/lib/parse_date.c"
 yy668:
 	YYDEBUG(668, *YYCURSOR);
 	yyaccept = 14;
@@ -12060,7 +12059,7 @@ yy700:
 	if (yych <= ':') goto yy704;
 yy701:
 	YYDEBUG(701, *YYCURSOR);
-#line 1523 "ext/date/lib/parse_date.re"
+#line 1522 "ext/date/lib/parse_date.re"
 	{
 		int tz_not_found;
 		DEBUG_OUTPUT("clf");
@@ -12080,7 +12079,7 @@ yy701:
 		TIMELIB_DEINIT;
 		return TIMELIB_CLF;
 	}
-#line 12084 "ext/date/lib/parse_date.c"
+#line 12083 "ext/date/lib/parse_date.c"
 yy702:
 	YYDEBUG(702, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -12632,7 +12631,7 @@ yy763:
 	}
 yy764:
 	YYDEBUG(764, *YYCURSOR);
-#line 1268 "ext/date/lib/parse_date.re"
+#line 1267 "ext/date/lib/parse_date.re"
 	{
 		int length = 0;
 		DEBUG_OUTPUT("iso8601date2");
@@ -12645,7 +12644,7 @@ yy764:
 		TIMELIB_DEINIT;
 		return TIMELIB_ISO_DATE;
 	}
-#line 12649 "ext/date/lib/parse_date.c"
+#line 12648 "ext/date/lib/parse_date.c"
 yy765:
 	YYDEBUG(765, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -12684,7 +12683,7 @@ yy771:
 	YYDEBUG(771, *YYCURSOR);
 	++YYCURSOR;
 	YYDEBUG(772, *YYCURSOR);
-#line 1509 "ext/date/lib/parse_date.re"
+#line 1508 "ext/date/lib/parse_date.re"
 	{
 		int length = 0;
 		DEBUG_OUTPUT("pgtextreverse");
@@ -12697,7 +12696,7 @@ yy771:
 		TIMELIB_DEINIT;
 		return TIMELIB_PG_TEXT;
 	}
-#line 12701 "ext/date/lib/parse_date.c"
+#line 12700 "ext/date/lib/parse_date.c"
 yy773:
 	YYDEBUG(773, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -12835,7 +12834,7 @@ yy783:
 	}
 yy784:
 	YYDEBUG(784, *YYCURSOR);
-#line 1544 "ext/date/lib/parse_date.re"
+#line 1543 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("year4");
 		TIMELIB_INIT;
@@ -12843,7 +12842,7 @@ yy784:
 		TIMELIB_DEINIT;
 		return TIMELIB_CLF;
 	}
-#line 12847 "ext/date/lib/parse_date.c"
+#line 12846 "ext/date/lib/parse_date.c"
 yy785:
 	YYDEBUG(785, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -12994,7 +12993,7 @@ yy793:
 	}
 yy794:
 	YYDEBUG(794, *YYCURSOR);
-#line 1365 "ext/date/lib/parse_date.re"
+#line 1364 "ext/date/lib/parse_date.re"
 	{
 		int length = 0;
 		DEBUG_OUTPUT("datenodayrev");
@@ -13007,7 +13006,7 @@ yy794:
 		TIMELIB_DEINIT;
 		return TIMELIB_DATE_NO_DAY;
 	}
-#line 13011 "ext/date/lib/parse_date.c"
+#line 13010 "ext/date/lib/parse_date.c"
 yy795:
 	YYDEBUG(795, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -13222,7 +13221,7 @@ yy814:
 	if (yych <= '7') goto yy817;
 yy815:
 	YYDEBUG(815, *YYCURSOR);
-#line 1476 "ext/date/lib/parse_date.re"
+#line 1475 "ext/date/lib/parse_date.re"
 	{
 		timelib_sll w, d;
 		DEBUG_OUTPUT("isoweek");
@@ -13240,7 +13239,7 @@ yy815:
 		TIMELIB_DEINIT;
 		return TIMELIB_ISO_WEEK;
 	}
-#line 13244 "ext/date/lib/parse_date.c"
+#line 13243 "ext/date/lib/parse_date.c"
 yy816:
 	YYDEBUG(816, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -13250,7 +13249,7 @@ yy817:
 	YYDEBUG(817, *YYCURSOR);
 	++YYCURSOR;
 	YYDEBUG(818, *YYCURSOR);
-#line 1457 "ext/date/lib/parse_date.re"
+#line 1456 "ext/date/lib/parse_date.re"
 	{
 		timelib_sll w, d;
 		DEBUG_OUTPUT("isoweekday");
@@ -13268,7 +13267,7 @@ yy817:
 		TIMELIB_DEINIT;
 		return TIMELIB_ISO_WEEK;
 	}
-#line 13272 "ext/date/lib/parse_date.c"
+#line 13271 "ext/date/lib/parse_date.c"
 yy819:
 	YYDEBUG(819, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -13332,7 +13331,7 @@ yy821:
 	}
 yy822:
 	YYDEBUG(822, *YYCURSOR);
-#line 1443 "ext/date/lib/parse_date.re"
+#line 1442 "ext/date/lib/parse_date.re"
 	{
 		int length = 0;
 		DEBUG_OUTPUT("pgydotd");
@@ -13345,7 +13344,7 @@ yy822:
 		TIMELIB_DEINIT;
 		return TIMELIB_PG_YEARDAY;
 	}
-#line 13349 "ext/date/lib/parse_date.c"
+#line 13348 "ext/date/lib/parse_date.c"
 yy823:
 	YYDEBUG(823, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -13448,7 +13447,7 @@ yy842:
 	++YYCURSOR;
 yy843:
 	YYDEBUG(843, *YYCURSOR);
-#line 1417 "ext/date/lib/parse_date.re"
+#line 1416 "ext/date/lib/parse_date.re"
 	{
 		int tz_not_found;
 		DEBUG_OUTPUT("xmlrpc | xmlrpcnocolon | soap | wddx | exif");
@@ -13473,7 +13472,7 @@ yy843:
 		TIMELIB_DEINIT;
 		return TIMELIB_XMLRPC_SOAP;
 	}
-#line 13477 "ext/date/lib/parse_date.c"
+#line 13476 "ext/date/lib/parse_date.c"
 yy844:
 	YYDEBUG(844, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -13735,7 +13734,7 @@ yy848:
 	}
 yy849:
 	YYDEBUG(849, *YYCURSOR);
-#line 1405 "ext/date/lib/parse_date.re"
+#line 1404 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("datenocolon");
 		TIMELIB_INIT;
@@ -13746,7 +13745,7 @@ yy849:
 		TIMELIB_DEINIT;
 		return TIMELIB_DATE_NOCOLON;
 	}
-#line 13750 "ext/date/lib/parse_date.c"
+#line 13749 "ext/date/lib/parse_date.c"
 yy850:
 	YYDEBUG(850, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -14666,7 +14665,7 @@ yy973:
 	if (yych <= '9') goto yy996;
 yy974:
 	YYDEBUG(974, *YYCURSOR);
-#line 1282 "ext/date/lib/parse_date.re"
+#line 1281 "ext/date/lib/parse_date.re"
 	{
 		int length = 0;
 		DEBUG_OUTPUT("gnudateshorter");
@@ -14679,7 +14678,7 @@ yy974:
 		TIMELIB_DEINIT;
 		return TIMELIB_ISO_DATE;
 	}
-#line 14683 "ext/date/lib/parse_date.c"
+#line 14682 "ext/date/lib/parse_date.c"
 yy975:
 	YYDEBUG(975, *YYCURSOR);
 	yyaccept = 22;
@@ -15688,7 +15687,7 @@ yy1066:
 	}
 yy1068:
 	YYDEBUG(1068, *YYCURSOR);
-#line 1174 "ext/date/lib/parse_date.re"
+#line 1173 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("gnunocolon");
 		TIMELIB_INIT;
@@ -15710,7 +15709,7 @@ yy1068:
 		TIMELIB_DEINIT;
 		return TIMELIB_GNU_NOCOLON;
 	}
-#line 15714 "ext/date/lib/parse_date.c"
+#line 15713 "ext/date/lib/parse_date.c"
 yy1069:
 	YYDEBUG(1069, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -15802,7 +15801,7 @@ yy1075:
 	}
 yy1076:
 	YYDEBUG(1076, *YYCURSOR);
-#line 1220 "ext/date/lib/parse_date.re"
+#line 1219 "ext/date/lib/parse_date.re"
 	{
 		int tz_not_found;
 		DEBUG_OUTPUT("iso8601nocolon");
@@ -15821,7 +15820,7 @@ yy1076:
 		TIMELIB_DEINIT;
 		return TIMELIB_ISO_NOCOLON;
 	}
-#line 15825 "ext/date/lib/parse_date.c"
+#line 15824 "ext/date/lib/parse_date.c"
 yy1077:
 	YYDEBUG(1077, *YYCURSOR);
 	yyaccept = 25;
@@ -16719,7 +16718,7 @@ yy1117:
 	}
 yy1118:
 	YYDEBUG(1118, *YYCURSOR);
-#line 1616 "ext/date/lib/parse_date.re"
+#line 1615 "ext/date/lib/parse_date.re"
 	{
 		timelib_sll i;
 		int         behavior = 0;
@@ -16735,7 +16734,7 @@ yy1118:
 		TIMELIB_DEINIT;
 		return TIMELIB_RELATIVE;
 	}
-#line 16739 "ext/date/lib/parse_date.c"
+#line 16738 "ext/date/lib/parse_date.c"
 yy1119:
 	YYDEBUG(1119, *YYCURSOR);
 	++YYCURSOR;
@@ -16786,7 +16785,7 @@ yy1126:
 	YYDEBUG(1126, *YYCURSOR);
 	++YYCURSOR;
 	YYDEBUG(1127, *YYCURSOR);
-#line 1089 "ext/date/lib/parse_date.re"
+#line 1088 "ext/date/lib/parse_date.re"
 	{
 		timelib_sll i;
 		int         behavior = 0;
@@ -16807,7 +16806,7 @@ yy1126:
 		TIMELIB_DEINIT;
 		return TIMELIB_WEEK_DAY_OF_MONTH;
 	}
-#line 16811 "ext/date/lib/parse_date.c"
+#line 16810 "ext/date/lib/parse_date.c"
 yy1128:
 	YYDEBUG(1128, *YYCURSOR);
 	yyaccept = 26;
@@ -16915,7 +16914,7 @@ yy1141:
 	}
 yy1142:
 	YYDEBUG(1142, *YYCURSOR);
-#line 1592 "ext/date/lib/parse_date.re"
+#line 1591 "ext/date/lib/parse_date.re"
 	{
 		timelib_sll i;
 		int         behavior = 0;
@@ -16938,7 +16937,7 @@ yy1142:
 		TIMELIB_DEINIT;
 		return TIMELIB_RELATIVE;
 	}
-#line 16942 "ext/date/lib/parse_date.c"
+#line 16941 "ext/date/lib/parse_date.c"
 yy1143:
 	YYDEBUG(1143, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -19615,7 +19614,7 @@ yy1294:
 	goto yy1298;
 yy1295:
 	YYDEBUG(1295, *YYCURSOR);
-#line 1066 "ext/date/lib/parse_date.re"
+#line 1065 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("backof | frontof");
 		TIMELIB_INIT;
@@ -19637,7 +19636,7 @@ yy1295:
 		TIMELIB_DEINIT;
 		return TIMELIB_LF_DAY_OF_MONTH;
 	}
-#line 19641 "ext/date/lib/parse_date.c"
+#line 19640 "ext/date/lib/parse_date.c"
 yy1296:
 	YYDEBUG(1296, *YYCURSOR);
 	yyaccept = 28;
@@ -21328,7 +21327,7 @@ yy1385:
 	if (yych <= '9') goto yy1385;
 yy1387:
 	YYDEBUG(1387, *YYCURSOR);
-#line 1023 "ext/date/lib/parse_date.re"
+#line 1022 "ext/date/lib/parse_date.re"
 	{
 		timelib_ull i;
 
@@ -21353,7 +21352,7 @@ yy1387:
 		TIMELIB_DEINIT;
 		return TIMELIB_RELATIVE;
 	}
-#line 21357 "ext/date/lib/parse_date.c"
+#line 21356 "ext/date/lib/parse_date.c"
 yy1388:
 	YYDEBUG(1388, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -21789,7 +21788,7 @@ yy1416:
 	++YYCURSOR;
 yy1417:
 	YYDEBUG(1417, *YYCURSOR);
-#line 1011 "ext/date/lib/parse_date.re"
+#line 1010 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("tomorrow");
 		TIMELIB_INIT;
@@ -21800,7 +21799,7 @@ yy1417:
 		TIMELIB_DEINIT;
 		return TIMELIB_RELATIVE;
 	}
-#line 21804 "ext/date/lib/parse_date.c"
+#line 21803 "ext/date/lib/parse_date.c"
 yy1418:
 	YYDEBUG(1418, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -21835,7 +21834,7 @@ yy1419:
 	}
 yy1420:
 	YYDEBUG(1420, *YYCURSOR);
-#line 1001 "ext/date/lib/parse_date.re"
+#line 1000 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("midnight | today");
 		TIMELIB_INIT;
@@ -21844,7 +21843,7 @@ yy1420:
 		TIMELIB_DEINIT;
 		return TIMELIB_RELATIVE;
 	}
-#line 21848 "ext/date/lib/parse_date.c"
+#line 21847 "ext/date/lib/parse_date.c"
 yy1421:
 	YYDEBUG(1421, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -23856,7 +23855,7 @@ yy1499:
 	}
 yy1500:
 	YYDEBUG(1500, *YYCURSOR);
-#line 980 "ext/date/lib/parse_date.re"
+#line 979 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("now");
 		TIMELIB_INIT;
@@ -23864,7 +23863,7 @@ yy1500:
 		TIMELIB_DEINIT;
 		return TIMELIB_RELATIVE;
 	}
-#line 23868 "ext/date/lib/parse_date.c"
+#line 23867 "ext/date/lib/parse_date.c"
 yy1501:
 	YYDEBUG(1501, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -24003,7 +24002,7 @@ yy1507:
 	}
 yy1508:
 	YYDEBUG(1508, *YYCURSOR);
-#line 989 "ext/date/lib/parse_date.re"
+#line 988 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("noon");
 		TIMELIB_INIT;
@@ -24014,7 +24013,7 @@ yy1508:
 		TIMELIB_DEINIT;
 		return TIMELIB_RELATIVE;
 	}
-#line 24018 "ext/date/lib/parse_date.c"
+#line 24017 "ext/date/lib/parse_date.c"
 yy1509:
 	YYDEBUG(1509, *YYCURSOR);
 	yyaccept = 0;
@@ -24547,7 +24546,7 @@ yy1530:
 	++YYCURSOR;
 yy1531:
 	YYDEBUG(1531, *YYCURSOR);
-#line 968 "ext/date/lib/parse_date.re"
+#line 967 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("yesterday");
 		TIMELIB_INIT;
@@ -24558,7 +24557,7 @@ yy1531:
 		TIMELIB_DEINIT;
 		return TIMELIB_RELATIVE;
 	}
-#line 24562 "ext/date/lib/parse_date.c"
+#line 24561 "ext/date/lib/parse_date.c"
 yy1532:
 	YYDEBUG(1532, *YYCURSOR);
 	yyaccept = 0;
@@ -24731,7 +24730,7 @@ yy1537:
 		goto yy1531;
 	}
 }
-#line 1742 "ext/date/lib/parse_date.re"
+#line 1741 "ext/date/lib/parse_date.re"
 
 }
 

ext/date/lib/parse_date.re

@@ -614,8 +614,7 @@ static const timelib_relunit* timelib_lookup_relunit(char **ptr)
 	char *begin = *ptr, *end;
 	const timelib_relunit *tp, *value = NULL;
 
-	while (**ptr != '\0' && **ptr != ' ' && **ptr != ',' && **ptr != '\t' && **ptr != ';' && **ptr != ':' &&
-           **ptr != '/' && **ptr != '.' && **ptr != '-' && **ptr != '(' && **ptr != ')' ) {
+	while (**ptr != '\0' && **ptr != ' ' && **ptr != ',' && **ptr != '\t') {
 		++*ptr;
 	}
 	end = *ptr;

ext/date/php_date.c

@@ -1041,7 +1041,7 @@ char *php_date_short_day_name(timelib_sll y, timelib_sll m, timelib_sll d)
 static char *date_format(char *format, int format_len, timelib_time *t, int localtime)
 {
 	smart_str            string = {0};
-	int                  i, length = 0;
+	int                  i, length;
 	char                 buffer[97];
 	timelib_time_offset *offset = NULL;
 	timelib_sll          isoweek, isoyear;
@@ -1396,7 +1396,7 @@ PHPAPI void php_date_set_tzdb(timelib_tzdb *tzdb)
 }
 /* }}} */
 
-/* {{{ php_parse_date: Backwards compatibility function */
+/* {{{ php_parse_date: Backwards compability function */
 PHPAPI signed long php_parse_date(char *string, signed long *now)
 {
 	timelib_time *parsed_time;
@@ -2198,13 +2198,13 @@ static HashTable *date_object_get_properties(zval *object TSRMLS_DC)
 	/* first we add the date and time in ISO format */
 	MAKE_STD_ZVAL(zv);
 	ZVAL_STRING(zv, date_format("Y-m-d H:i:s", 12, dateobj->time, 1), 0);
-	zend_hash_update(props, "date", 5, &zv, sizeof(zv), NULL);
+	zend_hash_update(props, "date", 5, &zv, sizeof(zval), NULL);
 
 	/* then we add the timezone name (or similar) */
 	if (dateobj->time->is_localtime) {
 		MAKE_STD_ZVAL(zv);
 		ZVAL_LONG(zv, dateobj->time->zone_type);
-		zend_hash_update(props, "timezone_type", 14, &zv, sizeof(zv), NULL);
+		zend_hash_update(props, "timezone_type", 14, &zv, sizeof(zval), NULL);
 
 		MAKE_STD_ZVAL(zv);
 		switch (dateobj->time->zone_type) {
@@ -2227,7 +2227,7 @@ static HashTable *date_object_get_properties(zval *object TSRMLS_DC)
 				ZVAL_STRING(zv, dateobj->time->tz_abbr, 1);
 				break;
 		}
-		zend_hash_update(props, "timezone", 9, &zv, sizeof(zv), NULL);
+		zend_hash_update(props, "timezone", 9, &zv, sizeof(zval), NULL);
 	}
 
 	return props;
@@ -2305,7 +2305,7 @@ static HashTable *date_object_get_properties_timezone(zval *object TSRMLS_DC)
 
 	MAKE_STD_ZVAL(zv);
 	ZVAL_LONG(zv, tzobj->type);
-	zend_hash_update(props, "timezone_type", 14, &zv, sizeof(zv), NULL);
+	zend_hash_update(props, "timezone_type", 14, &zv, sizeof(zval), NULL);
 
 	MAKE_STD_ZVAL(zv);
 	switch (tzobj->type) {
@@ -2327,7 +2327,7 @@ static HashTable *date_object_get_properties_timezone(zval *object TSRMLS_DC)
 			ZVAL_STRING(zv, tzobj->tzi.z.abbr, 1);
 			break;
 	}
-	zend_hash_update(props, "timezone", 9, &zv, sizeof(zv), NULL);
+	zend_hash_update(props, "timezone", 9, &zv, sizeof(zval), NULL);
 
 	return props;
 }
@@ -2394,7 +2394,7 @@ static HashTable *date_object_get_properties_interval(zval *object TSRMLS_DC)
 #define PHP_DATE_INTERVAL_ADD_PROPERTY(n,f) \
 	MAKE_STD_ZVAL(zv); \
 	ZVAL_LONG(zv, (long)intervalobj->diff->f); \
-	zend_hash_update(props, n, strlen(n) + 1, &zv, sizeof(zv), NULL);
+	zend_hash_update(props, n, strlen(n) + 1, &zv, sizeof(zval), NULL);
 
 	PHP_DATE_INTERVAL_ADD_PROPERTY("y", y);
 	PHP_DATE_INTERVAL_ADD_PROPERTY("m", m);
@@ -2411,7 +2411,7 @@ static HashTable *date_object_get_properties_interval(zval *object TSRMLS_DC)
 	} else {
 		MAKE_STD_ZVAL(zv);
 		ZVAL_FALSE(zv);
-		zend_hash_update(props, "days", 5, &zv, sizeof(zv), NULL);
+		zend_hash_update(props, "days", 5, &zv, sizeof(zval), NULL);
 	}
 	PHP_DATE_INTERVAL_ADD_PROPERTY("special_type", special.type);
 	PHP_DATE_INTERVAL_ADD_PROPERTY("special_amount", special.amount);
@@ -2538,8 +2538,8 @@ PHPAPI int php_date_initialize(php_date_obj *dateobj, /*const*/ char *time_str,
 	timelib_time   *now;
 	timelib_tzinfo *tzi = NULL;
 	timelib_error_container *err = NULL;
-	int type = TIMELIB_ZONETYPE_ID, new_dst = 0;
-	char *new_abbr = NULL;
+	int type = TIMELIB_ZONETYPE_ID, new_dst;
+	char *new_abbr;
 	timelib_sll     new_offset;
 	
 	if (dateobj->time) {
@@ -4064,11 +4064,7 @@ zval *date_interval_read_property(zval *object, zval *member, int type, const ze
 	ALLOC_INIT_ZVAL(retval);
 	Z_SET_REFCOUNT_P(retval, 0);
 
-	if (value != -99999) {
-		ZVAL_LONG(retval, value);
-	} else {
-		ZVAL_FALSE(retval);
-	}
+	ZVAL_LONG(retval, value);
 
 	if (member == &tmp_member) {
 		zval_dtor(member);

ext/date/php_date.h

@@ -182,7 +182,7 @@ ZEND_END_MODULE_GLOBALS(date)
 #define DATEG(v) (date_globals.v)
 #endif
 
-/* Backwards compatibility wrapper */
+/* Backwards compability wrapper */
 PHPAPI signed long php_parse_date(char *string, signed long *now);
 PHPAPI void php_mktime(INTERNAL_FUNCTION_PARAMETERS, int gmt);
 PHPAPI int php_idate(char format, time_t ts, int localtime TSRMLS_DC);

ext/date/tests/DateInterval_days_prop1.phpt

@@ -1,10 +0,0 @@
---TEST--
-Wrong var_dump(DateInterval->days) value
---FILE--
-<?php
-
-$interval = new DateInterval('P2Y4DT6H8M');
-
-var_dump($interval->days);
---EXPECT--
-bool(false)

ext/date/tests/DateTime_fix_createFromFormat.phpt

@@ -1,29 +0,0 @@
---TEST--
-Test fix for DateTime when date have textual day with dot or other special char at end
---FILE--
-<?php
-
-//Set the default time zone 
-date_default_timezone_set('Europe/London');
-
-echo "*** Testing clone on DateTime objects ***\n";
-
-// Create a DateTime object..
-$orig = new DateTime('2012-11-29 17:00:00');
-
-// String to parse
-$string = "Thu., Nov. 29, 2012 5:00PM";
-
-// Create a DateTime object from format
-$fromFormat = DateTime::createFromFormat( "D., M# j, Y g:iA", $string );
-
-echo "Format method: " . $orig->format("D., M. j, Y g:iA") . "\n";
-echo "createFromFormat method: " . $fromFormat->format("D., M. j, Y g:iA") . "\n";
-
-?>
-===DONE===
---EXPECTF--
-*** Testing clone on DateTime objects ***
-Format method: Thu., Nov. 29, 2012 5:00PM
-createFromFormat method: Thu., Nov. 29, 2012 5:00PM
-===DONE===

ext/date/tests/bug65184.phpt

@@ -6,8 +6,6 @@ if (strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') {
     die("skip Test is valid for Windows");
 }
 ?>
---INI--
-date.timezone = UTC
 --FILE--
 <?php
 	setlocale(LC_ALL, 'Japanese_Japan.932');

ext/dba/config.m4

@@ -557,10 +557,10 @@ PHP_ARG_WITH(cdb,,
 [  --without-cdb[=DIR]       DBA: CDB support (bundled)], $php_dba_enable, no)
 
 PHP_ARG_ENABLE(inifile,,
-[  --disable-inifile       DBA: INI support (bundled)], $php_dba_enable, no)
+[  --disable-inifile         DBA: INI support (bundled)], $php_dba_enable, no)
 
 PHP_ARG_ENABLE(flatfile,,
-[  --disable-flatfile      DBA: FlatFile support (bundled)], $php_dba_enable, no)
+[  --disable-flatfile        DBA: FlatFile support (bundled)], $php_dba_enable, no)
 
 # CDB
 if test "$PHP_CDB" = "yes"; then

ext/dom/document.c

@@ -1973,15 +1973,14 @@ static void _dom_document_schema_validate(INTERNAL_FUNCTION_PARAMETERS, int type
 	xmlDoc *docp;
 	dom_object *intern;
 	char *source = NULL, *valid_file = NULL;
-	int source_len = 0, valid_opts = 0;
-	long flags = 0;
+	int source_len = 0;
 	xmlSchemaParserCtxtPtr  parser;
 	xmlSchemaPtr            sptr;
 	xmlSchemaValidCtxtPtr   vptr;
 	int                     is_valid;
 	char resolved_path[MAXPATHLEN + 1];
 
-	if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Op|l", &id, dom_document_class_entry, &source, &source_len, &flags) == FAILURE) {
+	if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Op", &id, dom_document_class_entry, &source, &source_len) == FAILURE) {
 		return;
 	}
 
@@ -2030,13 +2029,6 @@ static void _dom_document_schema_validate(INTERNAL_FUNCTION_PARAMETERS, int type
 		RETURN_FALSE;
 	}
 
-#if LIBXML_VERSION >= 20614
-	if (flags & XML_SCHEMA_VAL_VC_I_CREATE) {
-		valid_opts |= XML_SCHEMA_VAL_VC_I_CREATE;
-	}
-#endif
-
-	xmlSchemaSetValidOptions(vptr, valid_opts);
 	xmlSchemaSetValidErrors(vptr, php_libxml_error_handler, php_libxml_error_handler, vptr);
 	is_valid = xmlSchemaValidateDoc(vptr, docp);
 	xmlSchemaFree(sptr);
@@ -2050,14 +2042,14 @@ static void _dom_document_schema_validate(INTERNAL_FUNCTION_PARAMETERS, int type
 }
 /* }}} */
 
-/* {{{ proto boolean dom_document_schema_validate_file(string filename, int flags); */
+/* {{{ proto boolean dom_document_schema_validate_file(string filename); */
 PHP_FUNCTION(dom_document_schema_validate_file)
 {
 	_dom_document_schema_validate(INTERNAL_FUNCTION_PARAM_PASSTHRU, DOM_LOAD_FILE);
 }
 /* }}} end dom_document_schema_validate_file */
 
-/* {{{ proto boolean dom_document_schema_validate(string source, int flags); */
+/* {{{ proto boolean dom_document_schema_validate(string source); */
 PHP_FUNCTION(dom_document_schema_validate_xml)
 {
 	_dom_document_schema_validate(INTERNAL_FUNCTION_PARAM_PASSTHRU, DOM_LOAD_STRING);

ext/dom/php_dom.c

@@ -1089,11 +1089,7 @@ void dom_xpath_objects_free_storage(void *object TSRMLS_DC)
 void dom_objects_free_storage(void *object TSRMLS_DC)
 {
 	dom_object *intern = (dom_object *)object;
-#if defined(__GNUC__) && __GNUC__ >= 3
-	int retcount __attribute__((unused)); /* keep compiler quiet */
-#else
 	int retcount;
-#endif
 
 	zend_object_std_dtor(&intern->std TSRMLS_CC);
 

ext/dom/tests/DOMDocument_loadXML_basic.phpt

@@ -1,21 +0,0 @@
---TEST--
-Test DOMDocument::loadXML() basic behavior
---DESCRIPTION--
-This test verifies the basic behaviour of the method
-Environment variables used in the test:
-- XML_FILE: the xml file to load
-- LOAD_OPTIONS: the second parameter to pass to the method
-- EXPECTED_RESULT: the expected result
---CREDITS--
-Antonio Diaz Ruiz <dejalatele@gmail.com>
---INI--
-assert.bail=true
---SKIPIF--
-<?php include('skipif.inc'); ?>
---ENV--
-XML_FILE=/book.xml
-LOAD_OPTIONS=0
-EXPECTED_RESULT=1
---FILE_EXTERNAL--
-domdocumentloadxml_test_method.php
---EXPECT--

ext/dom/tests/DOMDocument_loadXML_error1.phpt

@@ -1,26 +0,0 @@
---TEST--
-Test DOMDocument::loadXML() detects not-well formed XML 
---DESCRIPTION--
-This test verifies the method detects an opening and ending tag mismatch 
-Environment variables used in the test:
-- XML_FILE: the xml file to load
-- LOAD_OPTIONS: the second parameter to pass to the method
-- EXPECTED_RESULT: the expected result
---CREDITS--
-Antonio Diaz Ruiz <dejalatele@gmail.com>
---INI--
-assert.bail=true
---SKIPIF--
-<?php include('skipif.inc'); ?>
---ENV--
-XML_FILE=/not_well_formed.xml
-LOAD_OPTIONS=0
-EXPECTED_RESULT=0
---FILE_EXTERNAL--
-domdocumentloadxml_test_method.php
---EXPECTF--
-Warning: DOMDocument::load%r(XML){0,1}%r(): Opening and ending tag mismatch: title line 5 and book %s
-
-Warning: DOMDocument::load%r(XML){0,1}%r(): expected '>' %s
-
-Warning: DOMDocument::load%r(XML){0,1}%r(): Premature end of data in tag books %s

ext/dom/tests/DOMDocument_loadXML_error2.phpt

@@ -1,30 +0,0 @@
---TEST--
-Test DOMDocument::loadXML() detects not-well formed XML 
---DESCRIPTION--
-This test verifies the method detects attributes values not closed between " or '
-Environment variables used in the test:
-- XML_FILE: the xml file to load
-- LOAD_OPTIONS: the second parameter to pass to the method
-- EXPECTED_RESULT: the expected result
---CREDITS--
-Antonio Diaz Ruiz <dejalatele@gmail.com>
---INI--
-assert.bail=true
---SKIPIF--
-<?php include('skipif.inc'); ?>
---ENV--
-XML_FILE=/not_well_formed2.xml
-LOAD_OPTIONS=0
-EXPECTED_RESULT=0
---FILE_EXTERNAL--
-domdocumentloadxml_test_method.php
---EXPECTF--
-Warning: DOMDocument::load%r(XML){0,1}%r(): AttValue: " or ' expected %s
-
-Warning: DOMDocument::load%r(XML){0,1}%r(): attributes construct error %s
-
-Warning: DOMDocument::load%r(XML){0,1}%r(): Couldn't find end of Start Tag book %s
-
-Warning: DOMDocument::load%r(XML){0,1}%r(): Opening and ending tag mismatch: books %s
-
-Warning: DOMDocument::load%r(XML){0,1}%r(): Extra content at the end of the document %s

ext/dom/tests/DOMDocument_loadXML_error3.phpt

@@ -1,22 +0,0 @@
---TEST--
-Test DOMDocument::loadXML() detects not-well formed XML 
---DESCRIPTION--
-This test verifies the method detects a typo in tag names
-Environment variables used in the test:
-- XML_FILE: the xml file to load
-- LOAD_OPTIONS: the second parameter to pass to the method
-- EXPECTED_RESULT: the expected result
---CREDITS--
-Antonio Diaz Ruiz <dejalatele@gmail.com>
---INI--
-assert.bail=true
---SKIPIF--
-<?php include('skipif.inc'); ?>
---ENV--
-XML_FILE=/not_well_formed3.xml
-LOAD_OPTIONS=0
-EXPECTED_RESULT=0
---FILE_EXTERNAL--
-domdocumentloadxml_test_method.php
---EXPECTF--
-Warning: DOMDocument::load%r(XML){0,1}%r(): Opening and ending tag mismatch: boOk line 8 and book %s

ext/dom/tests/DOMDocument_loadXML_error4.phpt

@@ -1,22 +0,0 @@
---TEST--
-Test DOMDocument::loadXML() detects not-well formed XML 
---DESCRIPTION--
-This test verifies the method detects an unsupported xml version
-Environment variables used in the test:
-- XML_FILE: the xml file to load
-- LOAD_OPTIONS: the second parameter to pass to the method
-- EXPECTED_RESULT: the expected result
---CREDITS--
-Antonio Diaz Ruiz <dejalatele@gmail.com>
---INI--
-assert.bail=true
---SKIPIF--
-<?php include('skipif.inc'); ?>
---ENV--
-XML_FILE=/not_well_formed4.xml
-LOAD_OPTIONS=0
-EXPECTED_RESULT=0
---FILE_EXTERNAL--
-domdocumentloadxml_test_method.php
---EXPECTF--
-Warning: DOMDocument::load%r(XML){0,1}%r(): Unsupported version '3.1' %s

ext/dom/tests/DOMDocument_loadXML_error5.phpt

@@ -1,22 +0,0 @@
---TEST--
-Test DOMDocument::loadXML() detects not-well formed XML 
---DESCRIPTION--
-This test verifies the method detects extra content at the end of the document 
-Environment variables used in the test:
-- XML_FILE: the xml file to load
-- LOAD_OPTIONS: the second parameter to pass to the method
-- EXPECTED_RESULT: the expected result
---CREDITS--
-Antonio Diaz Ruiz <dejalatele@gmail.com>
---INI--
-assert.bail=true
---SKIPIF--
-<?php include('skipif.inc'); ?>
---ENV--
-XML_FILE=/not_well_formed5.xml
-LOAD_OPTIONS=0
-EXPECTED_RESULT=0
---FILE_EXTERNAL--
-domdocumentloadxml_test_method.php
---EXPECTF--
-Warning: DOMDocument::load%r(XML){0,1}%r(): Extra content at the end of the document %s

ext/dom/tests/DOMDocument_loadXML_variation1.phpt

@@ -1,21 +0,0 @@
---TEST--
-Test DOMDocument::loadXML() with LIBXML_DTDLOAD option
---DESCRIPTION--
-This test verifies the right behaviour of the LIBXML_DTDLOAD constant
-Environment variables used in the test:
-- XML_FILE: the xml file to load
-- LOAD_OPTIONS: the second parameter to pass to the method
-- EXPECTED_RESULT: the expected result
---CREDITS--
-Antonio Diaz Ruiz <dejalatele@gmail.com>
---INI--
-assert.bail=true
---SKIPIF--
-<?php include('skipif.inc'); ?>
---ENV--
-XML_FILE=/book_with_dtd2.xml
-LOAD_OPTIONS=LIBXML_DTDLOAD
-EXPECTED_RESULT=1
---FILE_EXTERNAL--
-domdocumentloadxml_test_method.php
---EXPECT--

ext/dom/tests/DOMDocument_loadXML_variation2.phpt

@@ -1,22 +0,0 @@
---TEST--
-Test DOMDocument::loadXML() with LIBXML_DTDVALID option
---DESCRIPTION--
-This test verifies the right behaviour of the LIBXML_DTDVALID constant
-Environment variables used in the test:
-- XML_FILE: the xml file to load
-- LOAD_OPTIONS: the second parameter to pass to the method
-- EXPECTED_RESULT: the expected result
---CREDITS--
-Antonio Diaz Ruiz <dejalatele@gmail.com>
---INI--
-assert.bail=true
---SKIPIF--
-<?php include('skipif.inc'); ?>
---ENV--
-XML_FILE=/wrong_book_with_dtd2.xml
-LOAD_OPTIONS=LIBXML_DTDVALID
-EXPECTED_RESULT=1
---FILE_EXTERNAL--
-domdocumentloadxml_test_method.php
---EXPECTF--
-Warning: DOMDocument::load%r(XML){0,1}%r(): Element book content does not follow the DTD, expecting (title , author), got (title author author ) %s

ext/dom/tests/DOMDocument_loadXML_variation3.phpt

@@ -1,22 +0,0 @@
---TEST--
-Test DOMDocument::loadXML() with LIBXML_DTDVALID and LIBXML_NOERROR options
---DESCRIPTION--
-This test vrifies the right behaviour of the LIBXML_NOERROR constant
-which avoids the display of the warning message
-Environment variables used in the test:
-- XML_FILE: the xml file to load
-- LOAD_OPTIONS: the second parameter to pass to the method
-- EXPECTED_RESULT: the expected result
---CREDITS--
-Antonio Diaz Ruiz <dejalatele@gmail.com>
---INI--
-assert.bail=true
---SKIPIF--
-<?php include('skipif.inc'); ?>
---ENV--
-XML_FILE=/wrong_book_with_dtd.xml
-LOAD_OPTIONS=LIBXML_DTDVALID | LIBXML_NOERROR
-EXPECTED_RESULT=1
---FILE_EXTERNAL--
-domdocumentloadxml_test_method.php
---EXPECT--

ext/dom/tests/DOMDocument_loadXML_variation4.phpt

@@ -1,32 +0,0 @@
---TEST--
-Test DOMDocument::loadXML() with LIBXML_DTDATTR, LIBXML_NOCDATA, LIBXML_NOENT, LIBXML_NOBLANKS
---DESCRIPTION--
-This test verifies the right behaviour of the following constants:
-LIBXML_DTDATTR, LIBXML_NOCDATA, LIBXML_NOENT and LIBXML_NOBLANKS
-Environment variables used in the test:
-- XML_FILE: the xml file to load
-- LOAD_OPTIONS: the second parameter to pass to the method
-- EXPECTED_RESULT: the expected result
---CREDITS--
-Antonio Diaz Ruiz <dejalatele@gmail.com>
---INI--
-assert.bail=true
---SKIPIF--
-<?php include('skipif.inc'); ?>
---ENV--
-XML_FILE=/book_with_dtd2.xml
-LOAD_OPTIONS=LIBXML_DTDATTR|LIBXML_NOCDATA|LIBXML_NOENT|LIBXML_NOBLANKS
-EXPECTED_RESULT=1
---FILE_EXTERNAL--
-domdocumentloadxml_test_method_savexml.php
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE books [
-<!ENTITY entitest "entity is only for test purposes">
-<!ATTLIST title default CDATA "default title">
-<!ELEMENT books (book)*>
-<!ELEMENT book (title , author)>
-<!ELEMENT title (#PCDATA)>
-<!ELEMENT author (#PCDATA)>
-]>
-<books><book><title default="default title">The Grapes of Wrath</title><author>John Steinbeck</author></book><book><title default="default title">The Pearl</title><author>John Steinbeck</author></book><book><title default="default title">entity is only for test purposes</title><author>data for test</author></book></books>

ext/dom/tests/DOMDocument_load_basic.phpt

@@ -1,21 +0,0 @@
---TEST--
-Test DOMDocument::load() basic behavior
---DESCRIPTION--
-This test verifies the basic behaviour of the method
-Environment variables used in the test:
-- XML_FILE: the xml file to load
-- LOAD_OPTIONS: the second parameter to pass to the method
-- EXPECTED_RESULT: the expected result
---CREDITS--
-Antonio Diaz Ruiz <dejalatele@gmail.com>
---INI--
-assert.bail=true
---SKIPIF--
-<?php include('skipif.inc'); ?>
---ENV--
-XML_FILE=/book.xml
-LOAD_OPTIONS=0
-EXPECTED_RESULT=1
---FILE_EXTERNAL--
-domdocumentload_test_method.php
---EXPECT--

ext/dom/tests/DOMDocument_load_error1.phpt

@@ -1,26 +0,0 @@
---TEST--
-Test DOMDocument::load() detects not-well formed XML 
---DESCRIPTION--
-This test verifies the method detects an opening and ending tag mismatch 
-Environment variables used in the test:
-- XML_FILE: the xml file to load
-- LOAD_OPTIONS: the second parameter to pass to the method
-- EXPECTED_RESULT: the expected result
---CREDITS--
-Antonio Diaz Ruiz <dejalatele@gmail.com>
---INI--
-assert.bail=true
---SKIPIF--
-<?php include('skipif.inc'); ?>
---ENV--
-XML_FILE=/not_well_formed.xml
-LOAD_OPTIONS=0
-EXPECTED_RESULT=0
---FILE_EXTERNAL--
-domdocumentload_test_method.php
---EXPECTF--
-Warning: DOMDocument::load%r(XML){0,1}%r(): Opening and ending tag mismatch: title line 5 and book %s
-
-Warning: DOMDocument::load%r(XML){0,1}%r(): expected '>' %s
-
-Warning: DOMDocument::load%r(XML){0,1}%r(): Premature end of data in tag books %s

ext/dom/tests/DOMDocument_load_error2.phpt

@@ -1,30 +0,0 @@
---TEST--
-Test DOMDocument::load() detects not-well formed XML 
---DESCRIPTION--
-This test verifies the method detects attributes values not closed between " or '
-Environment variables used in the test:
-- XML_FILE: the xml file to load
-- LOAD_OPTIONS: the second parameter to pass to the method
-- EXPECTED_RESULT: the expected result
---CREDITS--
-Antonio Diaz Ruiz <dejalatele@gmail.com>
---INI--
-assert.bail=true
---SKIPIF--
-<?php include('skipif.inc'); ?>
---ENV--
-XML_FILE=/not_well_formed2.xml
-LOAD_OPTIONS=0
-EXPECTED_RESULT=0
---FILE_EXTERNAL--
-domdocumentload_test_method.php
---EXPECTF--
-Warning: DOMDocument::load%r(XML){0,1}%r(): AttValue: " or ' expected %s
-
-Warning: DOMDocument::load%r(XML){0,1}%r(): attributes construct error %s
-
-Warning: DOMDocument::load%r(XML){0,1}%r(): Couldn't find end of Start Tag book %s
-
-Warning: DOMDocument::load%r(XML){0,1}%r(): Opening and ending tag mismatch: books %s
-
-Warning: DOMDocument::load%r(XML){0,1}%r(): Extra content at the end of the document %s

ext/dom/tests/DOMDocument_load_error3.phpt

@@ -1,22 +0,0 @@
---TEST--
-Test DOMDocument::load() detects not-well formed XML 
---DESCRIPTION--
-This test verifies the method detects and opening and ending tag mismatch 
-Environment variables used in the test:
-- XML_FILE: the xml file to load
-- LOAD_OPTIONS: the second parameter to pass to the method
-- EXPECTED_RESULT: the expected result
---CREDITS--
-Antonio Diaz Ruiz <dejalatele@gmail.com>
---INI--
-assert.bail=true
---SKIPIF--
-<?php include('skipif.inc'); ?>
---ENV--
-XML_FILE=/not_well_formed3.xml
-LOAD_OPTIONS=0
-EXPECTED_RESULT=0
---FILE_EXTERNAL--
-domdocumentload_test_method.php
---EXPECTF--
-Warning: DOMDocument::load%r(XML){0,1}%r(): Opening and ending tag mismatch: boOk line 8 and book %s

ext/dom/tests/DOMDocument_load_error4.phpt

@@ -1,22 +0,0 @@
---TEST--
-Test DOMDocument::load() detects not-well formed XML 
---DESCRIPTION--
-This test verifies the method detects an unsupported xml version 
-Environment variables used in the test:
-- XML_FILE: the xml file to load
-- LOAD_OPTIONS: the second parameter to pass to the method
-- EXPECTED_RESULT: the expected result
---CREDITS--
-Antonio Diaz Ruiz <dejalatele@gmail.com>
---INI--
-assert.bail=true
---SKIPIF--
-<?php include('skipif.inc'); ?>
---ENV--
-XML_FILE=/not_well_formed4.xml
-LOAD_OPTIONS=0
-EXPECTED_RESULT=0
---FILE_EXTERNAL--
-domdocumentload_test_method.php
---EXPECTF--
-Warning: DOMDocument::load%r(XML){0,1}%r(): Unsupported version '3.1' %s

ext/dom/tests/DOMDocument_load_error5.phpt

@@ -1,22 +0,0 @@
---TEST--
-Test DOMDocument::load() detects not-well formed XML 
---DESCRIPTION--
-This test verifies the method detects extra content at the end of the document 
-Environment variables used in the test:
-- XML_FILE: the xml file to load
-- LOAD_OPTIONS: the second parameter to pass to the method
-- EXPECTED_RESULT: the expected result
---CREDITS--
-Antonio Diaz Ruiz <dejalatele@gmail.com>
---INI--
-assert.bail=true
---SKIPIF--
-<?php include('skipif.inc'); ?>
---ENV--
-XML_FILE=/not_well_formed5.xml
-LOAD_OPTIONS=0
-EXPECTED_RESULT=0
---FILE_EXTERNAL--
-domdocumentload_test_method.php
---EXPECTF--
-Warning: DOMDocument::load%r(XML){0,1}%r(): Extra content at the end of the document %s

ext/dom/tests/DOMDocument_load_variation1.phpt

@@ -1,21 +0,0 @@
---TEST--
-Test DOMDocument::load() with LIBXML_DTDLOAD option
---DESCRIPTION--
-This test verifies the right behaviour of the LIBXML_DTDLOAD constant
-Environment variables used in the test:
-- XML_FILE: the xml file to load
-- LOAD_OPTIONS: the second parameter to pass to the method
-- EXPECTED_RESULT: the expected result
---CREDITS--
-Antonio Diaz Ruiz <dejalatele@gmail.com>
---INI--
-assert.bail=true
---SKIPIF--
-<?php include('skipif.inc'); ?>
---ENV--
-XML_FILE=/book_with_dtd.xml
-LOAD_OPTIONS=LIBXML_DTDLOAD
-EXPECTED_RESULT=1
---FILE_EXTERNAL--
-domdocumentload_test_method.php
---EXPECT--

ext/dom/tests/DOMDocument_load_variation2.phpt

@@ -1,22 +0,0 @@
---TEST--
-Test DOMDocument::load() with LIBXML_DTDVALID option
---DESCRIPTION--
-This test verifies the right behaviour of the LIBXML_DTDVALID constant
-Environment variables used in the test:
-- XML_FILE: the xml file to load
-- LOAD_OPTIONS: the second parameter to pass to the method
-- EXPECTED_RESULT: the expected result
---CREDITS--
-Antonio Diaz Ruiz <dejalatele@gmail.com>
---INI--
-assert.bail=true
---SKIPIF--
-<?php include('skipif.inc'); ?>
---ENV--
-XML_FILE=/wrong_book_with_dtd.xml
-LOAD_OPTIONS=LIBXML_DTDVALID
-EXPECTED_RESULT=1
---FILE_EXTERNAL--
-domdocumentload_test_method.php
---EXPECTF--
-Warning: DOMDocument::load%r(XML){0,1}%r(): Element book content does not follow the DTD, expecting (title , author), got (title author author ) %s

ext/dom/tests/DOMDocument_load_variation3.phpt

@@ -1,22 +0,0 @@
---TEST--
-Test DOMDocument::load() with LIBXML_DTDVALID and LIBXML_NOERROR options
---DESCRIPTION--
-This test vrifies the right behaviour of the LIBXML_NOERROR constant
-which avoids the display of the warning message
-Environment variables used in the test:
-- XML_FILE: the xml file to load
-- LOAD_OPTIONS: the second parameter to pass to the method
-- EXPECTED_RESULT: the expected result
---CREDITS--
-Antonio Diaz Ruiz <dejalatele@gmail.com>
---INI--
-assert.bail=true
---SKIPIF--
-<?php include('skipif.inc'); ?>
---ENV--
-XML_FILE=/wrong_book_with_dtd.xml
-LOAD_OPTIONS=LIBXML_DTDVALID | LIBXML_NOERROR
-EXPECTED_RESULT=1
---FILE_EXTERNAL--
-domdocumentload_test_method.php
---EXPECT--

ext/dom/tests/DOMDocument_load_variation4.phpt

@@ -1,25 +0,0 @@
---TEST--
-Test DOMDocument::load() with LIBXML_DTDATTR, LIBXML_NOCDATA, LIBXML_NOENT, LIBXML_NOBLANKS
---DESCRIPTION--
-This test verifies the right behaviour of the following constants:
-LIBXML_DTDATTR, LIBXML_NOCDATA, LIBXML_NOENT and LIBXML_NOBLANKS
-Environment variables used in the test:
-- XML_FILE: the xml file to load
-- LOAD_OPTIONS: the second parameter to pass to the method
-- EXPECTED_RESULT: the expected result
---CREDITS--
-Antonio Diaz Ruiz <dejalatele@gmail.com>
---INI--
-assert.bail=true
---SKIPIF--
-<?php include('skipif.inc'); ?>
---ENV--
-XML_FILE=/book_with_dtd.xml
-LOAD_OPTIONS=LIBXML_DTDATTR|LIBXML_NOCDATA|LIBXML_NOENT|LIBXML_NOBLANKS
-EXPECTED_RESULT=1
---FILE_EXTERNAL--
-domdocumentload_test_method_savexml.php
---EXPECT--
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE books SYSTEM "books.dtd">
-<books><book><title default="default title">The Grapes of Wrath</title><author>John Steinbeck</author></book><book><title default="default title">The Pearl</title><author>John Steinbeck</author></book><book><title default="default title">entity is only for test purposes</title><author>data for test</author></book></books>

ext/dom/tests/DOMDocument_schemaValidateSource_addAttrs.phpt

@@ -1,25 +0,0 @@
---TEST--
-DomDocument::schemaValidateSource() - Add missing attribute default values from schema
---CREDITS--
-Chris Wright <info@daverandom.com>
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-
-$doc = new DOMDocument;
-
-$doc->load(dirname(__FILE__)."/book-attr.xml");
-
-$xsd = file_get_contents(dirname(__FILE__)."/book.xsd");
-
-$doc->schemaValidateSource($xsd, LIBXML_SCHEMA_CREATE);
-
-foreach ($doc->getElementsByTagName('book') as $book) {
-    var_dump($book->getAttribute('is-hardback'));
-}
-
-?>
---EXPECT--
-string(5) "false"
-string(4) "true"

ext/dom/tests/DOMDocument_schemaValidateSource_error4.phpt

@@ -17,5 +17,5 @@ var_dump($result);
 
 ?>
 --EXPECTF--
-Warning: DOMDocument::schemaValidateSource() expects at least 1 parameter, 0 given in %s.php on line %d
+Warning: DOMDocument::schemaValidateSource() expects exactly 1 parameter, 0 given in %s.php on line %d
 NULL

ext/dom/tests/DOMDocument_schemaValidateSource_missingAttrs.phpt

@@ -1,25 +0,0 @@
---TEST--
-DomDocument::schemaValidateSource() - Don't add missing attribute default values from schema
---CREDITS--
-Chris Wright <info@daverandom.com>
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-
-$doc = new DOMDocument;
-
-$doc->load(dirname(__FILE__)."/book-attr.xml");
-
-$xsd = file_get_contents(dirname(__FILE__)."/book.xsd");
-
-$doc->schemaValidateSource($xsd);
-
-foreach ($doc->getElementsByTagName('book') as $book) {
-    var_dump($book->getAttribute('is-hardback'));
-}
-
-?>
---EXPECT--
-string(0) ""
-string(4) "true"

ext/dom/tests/DOMDocument_schemaValidate_addAttrs.phpt

@@ -1,23 +0,0 @@
---TEST--
-DomDocument::schemaValidate() - Add missing attribute default values from schema
---CREDITS--
-Chris Wright <info@daverandom.com>
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-
-$doc = new DOMDocument;
-
-$doc->load(dirname(__FILE__)."/book-attr.xml");
-
-$doc->schemaValidate(dirname(__FILE__)."/book.xsd", LIBXML_SCHEMA_CREATE);
-
-foreach ($doc->getElementsByTagName('book') as $book) {
-    var_dump($book->getAttribute('is-hardback'));
-}
-
-?>
---EXPECT--
-string(5) "false"
-string(4) "true"

ext/dom/tests/DOMDocument_schemaValidate_error4.phpt

@@ -17,5 +17,5 @@ var_dump($result);
 
 ?>
 --EXPECTF--
-Warning: DOMDocument::schemaValidate() expects at least 1 parameter, 0 given in %s.php on line %d
+Warning: DOMDocument::schemaValidate() expects exactly 1 parameter, 0 given in %s.php on line %d
 NULL

ext/dom/tests/DOMDocument_schemaValidate_missingAttrs.phpt

@@ -1,23 +0,0 @@
---TEST--
-DomDocument::schemaValidate() - Don't add missing attribute default values from schema
---CREDITS--
-Chris Wright <info@daverandom.com>
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
---FILE--
-<?php
-
-$doc = new DOMDocument;
-
-$doc->load(dirname(__FILE__)."/book-attr.xml");
-
-$doc->schemaValidate(dirname(__FILE__)."/book.xsd");
-
-foreach ($doc->getElementsByTagName('book') as $book) {
-    var_dump($book->getAttribute('is-hardback'));
-}
-
-?>
---EXPECT--
-string(0) ""
-string(4) "true"

ext/dom/tests/book-attr.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" ?>
-<books>
- <book>
-  <title>The Grapes of Wrath</title>
-  <author>John Steinbeck</author>
- </book>
- <book is-hardback="true">
-  <title>The Pearl</title>
-  <author>John Steinbeck</author>
- </book>
-</books>

ext/dom/tests/book.xsd

@@ -9,7 +9,6 @@
        <xs:element name="title" type="xs:string"/>
        <xs:element name="author" type="xs:string"/>
       </xs:sequence>
-      <xs:attribute name="is-hardback" type="xs:boolean" default="false" use="optional" />
      </xs:complexType>
     </xs:element>
    </xs:sequence>

ext/dom/tests/book_with_dtd.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE books SYSTEM "books.dtd">
-<books>
-    <book>
-    <title>The Grapes of Wrath</title>
-    <author>John Steinbeck</author>
-    </book>
-    <book>
-    <title>The Pearl</title>
-    <author>John Steinbeck</author>
-    </book>
-    <book>
-    <title>&entitest;</title>
-    <author><![CDATA[data for test]]></author>
-    </book>
-</books>

ext/dom/tests/book_with_dtd2.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE books [
-<!ENTITY entitest "entity is only for test purposes">
-<!ATTLIST title default CDATA "default title">
-<!ELEMENT books (book*)>
-<!ELEMENT book (title, author)>
-<!ELEMENT title (#PCDATA)>
-<!ELEMENT author (#PCDATA)>
-]>
-<books>
-    <book>
-    <title>The Grapes of Wrath</title>
-    <author>John Steinbeck</author>
-    </book>
-    <book>
-    <title>The Pearl</title>
-    <author>John Steinbeck</author>
-    </book>
-    <book>
-    <title>&entitest;</title>
-    <author><![CDATA[data for test]]></author>
-    </book>
-</books>

ext/dom/tests/books.dtd

@@ -1,7 +0,0 @@
-<!ENTITY entitest "entity is only for test purposes">
-<!ATTLIST title 
-  default CDATA "default title">
-  <!ELEMENT books (book*)>
-  <!ELEMENT book (title, author)>
-  <!ELEMENT title (#PCDATA)>
-  <!ELEMENT author (#PCDATA)>

ext/dom/tests/bug44648.phpt

@@ -1,5 +1,5 @@
 --TEST--
-Bug #44648 (Attribute names not checked for well formedness)
+Bug #44648 (Attribute names not checked for wellformedness)
 --SKIPIF--
 <?php require_once('skipif.inc'); ?>
 --FILE--

ext/dom/tests/domdocumentload_test_method.php

@@ -1,12 +0,0 @@
-<?php
-include(dirname(__FILE__) . '/domdocumentload_utilities.php');
-
-$doc = new DOMDocument();
-
-$libxml_options = libxml_options_to_int(getenv('LOAD_OPTIONS'));
-
-$result = $doc->load(dirname(__FILE__) . getenv('XML_FILE'), $libxml_options);
-
-$expectedResult = (bool) getenv('EXPECTED_RESULT');
-assert('$result === $expectedResult');
-?>

ext/dom/tests/domdocumentload_test_method_savexml.php

@@ -1,14 +0,0 @@
-<?php
-include(dirname(__FILE__) . '/domdocumentload_utilities.php');
-
-$doc = new DOMDocument();
-
-$libxml_options = libxml_options_to_int(getenv('LOAD_OPTIONS'));
-
-$result = $doc->load(dirname(__FILE__) . getenv('XML_FILE'), $libxml_options);
-
-$expectedResult = (bool) getenv('EXPECTED_RESULT');
-assert('$result === $expectedResult');
-
-echo $doc->saveXML();
-?>

ext/dom/tests/domdocumentload_utilities.php

@@ -1,16 +0,0 @@
-<?php
-
-function libxml_options_to_int($libxmlOptions) {
-     
-    $defined_constants = get_defined_constants(true);
-    $env_array = explode('|', $libxmlOptions);
-    $libxml_constants = array_intersect_key($defined_constants['libxml'], array_flip($env_array));
-
-    $sum = 0;
-    foreach($libxml_constants as $value) { 
-        $sum = $sum|$value;
-    }
-
-    return $sum;
-}
-?>

ext/dom/tests/domdocumentloadxml_test_method.php

@@ -1,12 +0,0 @@
-<?php
-include(dirname(__FILE__) . '/domdocumentload_utilities.php');
-
-$doc = new DOMDocument();
-
-$libxml_options = libxml_options_to_int(getenv('LOAD_OPTIONS'));
-$result = $doc->loadXML(file_get_contents(dirname(__FILE__) . getenv('XML_FILE')), 
-    $libxml_options);
-
-$expectedResult = (bool) getenv('EXPECTED_RESULT');
-assert('$result === $expectedResult');
-?>

ext/dom/tests/domdocumentloadxml_test_method_savexml.php

@@ -1,14 +0,0 @@
-<?php
-include(dirname(__FILE__) . '/domdocumentload_utilities.php');
-
-$doc = new DOMDocument();
-
-$libxml_options = libxml_options_to_int(getenv('LOAD_OPTIONS'));
-$result = $doc->loadXML(file_get_contents(dirname(__FILE__) . getenv('XML_FILE')), 
-    $libxml_options);
-
-$expectedResult = (bool) getenv('EXPECTED_RESULT');
-assert('$result === $expectedResult');
-
-echo $doc->saveXML();
-?>

ext/dom/tests/not_well_formed.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" ?>
-<!-- Opening and ending tag mismatch -->
-<books>
- <book>
-  <title>The Grapes of Wrath
-  <author>John Steinbeck</author>
- </book>
- <book>
-  <title>The Pearl</title>
-  <author>John Steinbeck</author>
- </book>
-</books>

ext/dom/tests/not_well_formed2.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" ?>
-<!-- AttValue: " or ' expected -->
-<books>
- <book number=nine>
-  <title>The Grapes of Wrath</title>
-  <author>John Steinbeck</author>
- </book>
- <book>
-  <title>The Pearl</title>
-  <author>John Steinbeck</author>
- </book>
-</books>

ext/dom/tests/not_well_formed3.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" ?>
-<!-- Opening and ending tag mismatch -->
-<books>
- <book>
-  <title>The Grapes of Wrath</title>
-  <author>John Steinbeck</author>
- </book>
- <boOk>
-  <title>The Pearl</title>
-  <author>John Steinbeck</author>
- </book>
-</books>

ext/dom/tests/not_well_formed4.xml

@@ -1,12 +0,0 @@
-<?xml version="3.1" ?>
-<!-- Unsupported version '3.1' -->
-<books>
- <book>
-  <title>The Grapes of Wrath</title>
-  <author>John Steinbeck</author>
- </book>
- <book>
-  <title>The Pearl</title>
-  <author>John Steinbeck</author>
- </book>
-</books>

ext/dom/tests/not_well_formed5.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" ?>
-<!-- Extra content at the end of the document -->
- <book>
-  <title>The Grapes of Wrath</title>
-  <author>John Steinbeck</author>
- </book>
- <book>
-  <title>The Pearl</title>
-  <author>John Steinbeck</author>
- </book>

ext/dom/tests/wrong_book_with_dtd.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE books SYSTEM "books.dtd">
-<books>
-    <book>
-    <title>The Grapes of Wrath</title>
-    <author>John Steinbeck</author>
-    <author>John Steinbeck</author>
-    </book>
-    <book>
-    <title>The Pearl</title>
-    <author>John Steinbeck</author>
-    </book>
-</books>

ext/dom/tests/wrong_book_with_dtd2.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE books [
-<!ENTITY entitest "entity is only for test purposes">
-<!ATTLIST title default CDATA "default title">
-<!ELEMENT books (book)*>
-<!ELEMENT book (title , author)>
-<!ELEMENT title (#PCDATA)>
-<!ELEMENT author (#PCDATA)>
-]>
-<books>
-    <book>
-    <title>The Grapes of Wrath</title>
-    <author>John Steinbeck</author>
-    <author>John Steinbeck</author>
-    </book>
-    <book>
-    <title>The Pearl</title>
-    <author>John Steinbeck</author>
-    </book>
-</books>

ext/dom/xpath.c

@@ -74,7 +74,7 @@ const zend_function_entry php_dom_xpath_class_functions[] = {
 
 static void dom_xpath_ext_function_php(xmlXPathParserContextPtr ctxt, int nargs, int type) /* {{{ */
 {
-	zval **args = NULL;
+	zval **args;
 	zval *retval;
 	int result, i, ret;
 	int error = 0;

ext/enchant/config.m4

@@ -3,7 +3,7 @@ dnl $Id$
 dnl
 
 PHP_ARG_WITH(enchant,for ENCHANT support,
-[  --with-enchant[=DIR]      Include enchant support.
+[  --with-enchant[=DIR]     Include enchant support.
                           GNU Aspell version 1.1.3 or higher required.])
 
 if test "$PHP_ENCHANT" != "no"; then