Imported Upstream version 5.1.2upstream/5.1.2

6 files changed, 23 insertions, 61 deletions

diff --git a/scripts/dev/conv_z_macros b/scripts/dev/conv_z_macros
index 94a0ede0a..187de1cb9 100755
--- a/scripts/dev/conv_z_macros
+++ b/scripts/dev/conv_z_macros
@@ -3,12 +3,12 @@
 #  +----------------------------------------------------------------------+
 #  | PHP Version 5                                                        |
 #  +----------------------------------------------------------------------+
-#  | Copyright (c) 1997-2005 The PHP Group                                |
+#  | Copyright (c) 1997-2006 The PHP Group                                |
 #  +----------------------------------------------------------------------+
-#  | This source file is subject to version 3.0 of the PHP license,       |
+#  | This source file is subject to version 3.01 of the PHP license,      |
 #  | that is bundled with this package in the file LICENSE, and is        |
 #  | available through the world-wide-web at the following url:           |
-#  | http://www.php.net/license/3_0.txt.                                  |
+#  | http://www.php.net/license/3_01.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.               |
@@ -16,7 +16,7 @@
 #  | Author: Sascha Schumann <sascha@schumann.cx>                         |
 #  +----------------------------------------------------------------------+
 #
-# $Id: conv_z_macros,v 1.4 2005/08/03 14:08:56 sniper Exp $
+# $Id: conv_z_macros,v 1.4.2.1 2006/01/01 12:50:19 sniper Exp $
 
 for i in $@; do
 	echo -n "Processing $i... "
diff --git a/scripts/dev/credits b/scripts/dev/credits
index 0ea312d50..f99c0316a 100755
--- a/scripts/dev/credits
+++ b/scripts/dev/credits
@@ -1,6 +1,6 @@
 #!/bin/sh
 awkprog='
-BEGIN { FS = "\n"; RS = "" }
+BEGIN { FS = "\n|\r\n|\r"; RS = "" }
 { print "CREDIT_LINE(\""$1"\", \""$2"\");" }'
 
 for what in ext sapi
diff --git a/scripts/dev/search_underscores.php b/scripts/dev/search_underscores.php
index 526d5b972..445228b8c 100755
--- a/scripts/dev/search_underscores.php
+++ b/scripts/dev/search_underscores.php
@@ -5,12 +5,12 @@
    +----------------------------------------------------------------------+
    | PHP Version 5                                                        |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2005 The PHP Group                                |
+   | Copyright (c) 1997-2006 The PHP Group                                |
    +----------------------------------------------------------------------+
-   | This source file is subject to version 3.0 of the PHP license,       |
+   | This source file is subject to version 3.01 of the PHP license,      |
    | that is bundled with this package in the file LICENSE, and is        |
    | available through the world-wide-web at the following url:           |
-   | http://www.php.net/license/3_0.txt.                                  |
+   | http://www.php.net/license/3_01.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.               |
diff --git a/scripts/man1/php-config.1.in b/scripts/man1/php-config.1.in
index ff88d21b5..78d2b4b1f 100644
--- a/scripts/man1/php-config.1.in
+++ b/scripts/man1/php-config.1.in
@@ -1,26 +1,7 @@
-./"    +----------------------------------------------------------------------+
-./"    | PHP Version 5                                                        |
-./"    +----------------------------------------------------------------------+
-./"    | Copyright (c) 1997-2005 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: Jakub Vrana <vrana@php.net>                                  |
-./"    +----------------------------------------------------------------------+
-./" 
-./" $Id: php-config.1.in,v 1.3.2.1 2005/11/21 23:08:02 sniper Exp $
-./" 
-.TH php\-config 1 "Apr 2005" "The PHP Group" "Scripting Language"
+.TH php\-config 1 "2006" "The PHP Group" "Scripting Language"
 .SH NAME
 .TP 15
-.B php\-config
-Get information about PHP configuration
+php\-config \- get information about PHP configuration
 .SH SYNOPSIS
 .B php\-config
 [options]
@@ -69,17 +50,17 @@ PHP version
 .SH VERSION INFORMATION
 This manpage describes \fBphp\fP, version @PHP_VERSION@.
 .SH COPYRIGHT
-Copyright \(co 1997\-2005 The PHP Group
+Copyright \(co 1997\-2006 The PHP Group
 .LP
-This source file is subject to version 3.0 of the PHP license,
+This source file is subject to version 3.01 of the PHP license,
 that is bundled with this package in the file LICENSE, and is
-available through the world-wide-web at
+available through the world-wide-web at the following url:
 .PD 0
 .P
-.B http://www.php.net/license/3_0.txt
+.B http://www.php.net/license/3_01.txt
 .PD 1
 .P
 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
-.B license@php.net 
+.B license@php.net
 so we can mail you a copy immediately.
diff --git a/scripts/man1/phpize.1.in b/scripts/man1/phpize.1.in
index a090c12f8..2762304c8 100644
--- a/scripts/man1/phpize.1.in
+++ b/scripts/man1/phpize.1.in
@@ -1,26 +1,7 @@
-./"    +----------------------------------------------------------------------+
-./"    | PHP Version 5                                                        |
-./"    +----------------------------------------------------------------------+
-./"    | Copyright (c) 1997-2005 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: Jakub Vrana <vrana@php.net>                                  |
-./"    +----------------------------------------------------------------------+
-./" 
-./" $Id: phpize.1.in,v 1.2 2005/08/03 14:08:56 sniper Exp $
-./" 
-.TH phpize 1 "Apr 2005" "The PHP Group" "Scripting Language"
+.TH phpize 1 "2006" "The PHP Group" "Scripting Language"
 .SH NAME
 .TP 15
-.B phpize
-Prepare PHP extension for compiling
+phpize - prepare a PHP extension for compiling
 .SH SYNOPSIS
 .B phpize
 [options]
@@ -52,14 +33,14 @@ Prints API version information
 .SH VERSION INFORMATION
 This manpage describes \fBphp\fP, version @PHP_VERSION@.
 .SH COPYRIGHT
-Copyright \(co 1997\-2005 The PHP Group
+Copyright \(co 1997\-2006 The PHP Group
 .LP
-This source file is subject to version 3.0 of the PHP license,
+This source file is subject to version 3.01 of the PHP license,
 that is bundled with this package in the file LICENSE, and is
-available through the world-wide-web at
+available through the world-wide-web at the following url:
 .PD 0
 .P
-.B http://www.php.net/license/3_0.txt
+.B http://www.php.net/license/3_01.txt
 .PD 1
 .P
 If you did not receive a copy of the PHP license and are unable to
diff --git a/scripts/phpize.in b/scripts/phpize.in
index e038464c3..9455136de 100644
--- a/scripts/phpize.in
+++ b/scripts/phpize.in
@@ -10,10 +10,10 @@ builddir="`pwd`"
 FILES_BUILD="mkdep.awk scan_makefile_in.awk shtool libtool.m4"
 FILES="acinclude.m4 Makefile.global config.sub config.guess ltmain.sh run-tests*.php"
 CLEAN_FILES="$FILES *.o *.lo *.la .deps .libs/ build/ include/ modules/ install-sh \
-    mkinstalldirs missing config.nice config.sub config.guess configure configure.in \
+	mkinstalldirs missing config.nice config.sub config.guess configure configure.in \
 	aclocal.m4 config.h config.h.in conftest* ltmain.sh libtool config.cache autom4te.cache/ \
 	config.log config.status Makefile Makefile.fragments Makefile.objects confdefs.h \
-	run-tests*.php"
+	run-tests*.php tests/*.diff tests/*.exp tests/*.log tests/*.out tests/*.php"
 
 # function declaration
 phpize_usage()