This commit was manufactured by cvs2svn to create tag 'php_4_3_3RC2'.php-4.3.3RC2

6 files changed, 25 insertions, 151 deletions

diff --git a/build/scan_makefile_in.awk b/build/scan_makefile_in.awk
deleted file mode 100644
index 0c6d20398f..0000000000
--- a/build/scan_makefile_in.awk
+++ /dev/null
@@ -1,32 +0,0 @@
-BEGIN {
-	mode=0
-	sources=""
-}
-	
-mode == 0 && /^LTLIBRARY_SOURCES.*\\$/ {
-	if (match($0, "[^=]*$")) {
-	sources=substr($0, RSTART, RLENGTH-1)
-	}
-	mode=1
-	next
-}
-
-mode == 0 && /^LTLIBRARY_SOURCES.*/ {
-	if (match($0, "[^=]*$")) {
-	sources=substr($0, RSTART, RLENGTH)
-	}
-}
-
-mode == 1 && /.*\\$/ {
-	sources=sources substr($0, 0, length - 1)
-	next
-}
-
-mode == 1 {
-	sources=sources $0
-	mode=0
-}
-
-END {
-	print sources
-}
diff --git a/configure.in b/configure.in
index 7df5a16468..d5b9224496 100644
--- a/configure.in
+++ b/configure.in
@@ -41,7 +41,7 @@ AC_CONFIG_HEADER(main/php_config.h)
 MAJOR_VERSION=4
 MINOR_VERSION=3
 RELEASE_VERSION=3
-EXTRA_VERSION="RC3-dev"
+EXTRA_VERSION="RC2"
 VERSION="$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION"
 
 dnl Define where extension directories are located in the configure context
diff --git a/ext/openssl/config0.m4 b/ext/openssl/config0.m4
deleted file mode 100644
index 157c35b66b..0000000000
--- a/ext/openssl/config0.m4
+++ /dev/null
@@ -1,17 +0,0 @@
-dnl
-dnl $Id$
-dnl
-
-PHP_ARG_WITH(openssl, for OpenSSL support,
-[  --with-openssl[=DIR]    Include OpenSSL support (requires OpenSSL >= 0.9.6)])
-
-if test "$PHP_OPENSSL" != "no"; then
-  PHP_SETUP_OPENSSL(OPENSSL_SHARED_LIBADD, 
-  [
-    PHP_NEW_EXTENSION(openssl, openssl.c xp_ssl.c, $ext_shared)
-    PHP_SUBST(OPENSSL_SHARED_LIBADD)
-    AC_DEFINE(HAVE_OPENSSL_EXT,1,[ ])
-  ], [
-    AC_MSG_ERROR([OpenSSL check failed. Please check config.log for more information.])
-  ])
-fi
diff --git a/main/php_version.h b/main/php_version.h
index 22f61c1080..7802543986 100644
--- a/main/php_version.h
+++ b/main/php_version.h
@@ -3,5 +3,5 @@
 #define PHP_MAJOR_VERSION 4
 #define PHP_MINOR_VERSION 3
 #define PHP_RELEASE_VERSION 3
-#define PHP_EXTRA_VERSION "RC3-dev"
-#define PHP_VERSION "4.3.3RC3-dev"
+#define PHP_EXTRA_VERSION "RC2"
+#define PHP_VERSION "4.3.3RC2"
diff --git a/pear/PEAR/Command/Mirror.php b/pear/PEAR/Command/Mirror.php
deleted file mode 100644
index 6c27f64c16..0000000000
--- a/pear/PEAR/Command/Mirror.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-//
-// +----------------------------------------------------------------------+
-// | PHP Version 4                                                        |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1997-2003 The PHP Group                                |
-// +----------------------------------------------------------------------+
-// | This source file is subject to version 3.0 of the PHP license,       |
-// | that is bundled with this package in the file LICENSE, and is        |
-// | available through the world-wide-web at the following url:           |
-// | http://www.php.net/license/3_0.txt.                                  |
-// | If you did not receive a copy of the PHP license and are unable to   |
-// | obtain it through the world-wide-web, please send a note to          |
-// | license@php.net so we can mail you a copy immediately.               |
-// +----------------------------------------------------------------------+
-// | Author: Alexander Merz <alexmerz@php.net>                            |
-// |                                                                      |
-// +----------------------------------------------------------------------+
-//
-// $Id$
-
-require_once "PEAR/Command/Common.php";
-require_once "PEAR/Command.php";
-require_once "PEAR/Remote.php";
-require_once "PEAR.php";
-
-/**
- * PEAR commands for providing file mirrors
- *
- */
-class PEAR_Command_Mirror extends PEAR_Command_Common
-{
-    // {{{ properties
-
-    var $commands = array(
-        'download-all' => array(
-            'summary' => 'Downloads each avaible Package from master_server',
-            'function' => 'doDownloadAll',
-            'shortcut' => 'da',
-            'options' => array(),
-            'doc' => '
-	    Request a list of avaible Packages from the Package-Server
-	    (master_server) and downloads them to current working dir'
-            ),
-        );
-
-    // }}}
-
-    // {{{ constructor
-
-    /**
-     * PEAR_Command_Mirror constructor.
-     *
-     * @access public
-     * @param object PEAR_Frontend a reference to an frontend
-     * @param object PEAR_Config a reference to the configuration data
-     */
-    function PEAR_Command_Mirror(&$ui, &$config)
-    {
-        parent::PEAR_Command_Common($ui, $config);
-    }
-
-    // }}}
-
-    // {{{ doDownloadAll()
-    /**
-    * retrieves a list of avaible Packages from master server
-    * and downloads them
-    *
-    * @access public
-    * @param string $command the command
-    * @param array $options the command options before the command
-    * @param array $params the stuff after the command name
-    * @return bool true if succesful
-    * @throw PEAR_Error 
-    */
-    function doDownloadAll($command, $options, $params)
-    {
-	$this->config->set("php_dir", "."); 
-	$remote = &new PEAR_Remote($this->config);
-	$remoteInfo = $remote->call("package.listAll");
-	if(PEAR::isError($remoteInfo)) {
-		return $remoteInfo;
-	}
-	$cmd = &PEAR_Command::factory("download", $this->config);
-	if(PEAR::isError($cmd)) {
-		return $cmd;
-	}	
-	foreach($remoteInfo as $pkgn=>$pkg) {   
-		// error handling not neccesary, because
-		// already done by the download command
-		$cmd->run("download", array(), array($pkgn));       
-  	} 
-
-        return true;
-    }
-
-    // }}}
-}
diff --git a/tests/lang/bug22836.phpt b/tests/lang/bug22836.phpt
new file mode 100644
index 0000000000..2fe95cddff
--- /dev/null
+++ b/tests/lang/bug22836.phpt
@@ -0,0 +1,22 @@
+--TEST--
+Bug #22836 (returning references to NULL)
+--FILE--
+<?php
+function &f()
+{
+	$x = "foo";
+        var_dump($x);
+        print "'$x'\n";
+        return ($a);
+}
+for ($i = 0; $i < 8; $i++) {
+	$h =& f();
+}
+?>
+--EXPECTF--
+string(3) "foo"
+'foo'
+
+Notice: Undefined variable:  a in %s on line %d
+
+Fatal error: Cannot return NULL by reference in %s on line %d