Imported Upstream version 5.2.2upstream/5.2.2

6 files changed, 9 insertions, 13 deletions

diff --git a/ext/ncurses/ncurses.c b/ext/ncurses/ncurses.c
index 2216ec413..a4e7c51b5 100644
--- a/ext/ncurses/ncurses.c
+++ b/ext/ncurses/ncurses.c
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | PHP Version 5                                                        |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2006 The PHP Group                                |
+   | Copyright (c) 1997-2007 The PHP Group                                |
    +----------------------------------------------------------------------+
    | 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        |
@@ -98,11 +98,12 @@ PHP_MINIT_FUNCTION(ncurses)
 	PHP_NCURSES_CONST(KEY_UP);
 	PHP_NCURSES_CONST(KEY_LEFT);
 	PHP_NCURSES_CONST(KEY_RIGHT);
+	PHP_NCURSES_CONST(KEY_HOME);
+	PHP_NCURSES_CONST(KEY_END);
 	PHP_NCURSES_CONST(KEY_BACKSPACE);
 	PHP_NCURSES_CONST(KEY_MOUSE);
 	PHP_NCURSES_CONST(KEY_F0);
 
-
 	/* TODO:this macro sux, we have 65 function key,
 	   so we need a little loop */
 	PHP_NCURSES_FKEY_CONST(1);
@@ -150,7 +151,6 @@ PHP_MINIT_FUNCTION(ncurses)
 	PHP_NCURSES_CONST(KEY_COMMAND);
 	PHP_NCURSES_CONST(KEY_COPY);
 	PHP_NCURSES_CONST(KEY_CREATE);
-	PHP_NCURSES_CONST(KEY_END);
 	PHP_NCURSES_CONST(KEY_EXIT);
 	PHP_NCURSES_CONST(KEY_FIND);
 	PHP_NCURSES_CONST(KEY_HELP);
@@ -277,10 +277,6 @@ PHP_MINFO_FUNCTION(ncurses)
 		php_info_print_table_row(2, "color support", "no");
 #endif
 	php_info_print_table_end();
-
-	/* Remove comments if you have entries in php.ini
-	DISPLAY_INI_ENTRIES();
-	*/
 }
 /* }}} */
 
diff --git a/ext/ncurses/ncurses_fe.c b/ext/ncurses/ncurses_fe.c
index db5aaee21..8ca6e7104 100644
--- a/ext/ncurses/ncurses_fe.c
+++ b/ext/ncurses/ncurses_fe.c
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | PHP Version 5                                                        |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2006 The PHP Group                                |
+   | Copyright (c) 1997-2007 The PHP Group                                |
    +----------------------------------------------------------------------+
    | 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        |
diff --git a/ext/ncurses/ncurses_functions.c b/ext/ncurses/ncurses_functions.c
index fd3e0e82e..d0cb3825a 100644
--- a/ext/ncurses/ncurses_functions.c
+++ b/ext/ncurses/ncurses_functions.c
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | PHP Version 5                                                        |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2006 The PHP Group                                |
+   | Copyright (c) 1997-2007 The PHP Group                                |
    +----------------------------------------------------------------------+
    | 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        |
@@ -1473,7 +1473,7 @@ PHP_FUNCTION(ncurses_instr)
 	str = (char *)emalloc(COLS + 1);
 	retval = instr(str);
 
-	ZVAL_STRING(param, str, strlen(str));
+	ZVAL_STRING(param, str, 1);
 	efree(str);
 
 	RETURN_LONG(retval);
diff --git a/ext/ncurses/package.xml b/ext/ncurses/package.xml
index a5c3af3e4..b5122901b 100644
--- a/ext/ncurses/package.xml
+++ b/ext/ncurses/package.xml
@@ -44,7 +44,7 @@ line.
   <version>5.0rc1</version>
   <date>2004-03-19</date>
   <notes>
-package.xml added to support intallation using pear installer
+package.xml added to support installation using pear installer
   </notes>
   <configureoptions>
    <configureoption name="with-ncurses" default="autodetect" prompt="path to ncurses installation?"/>
diff --git a/ext/ncurses/php_ncurses.h b/ext/ncurses/php_ncurses.h
index a9910f1b9..12cdd8640 100644
--- a/ext/ncurses/php_ncurses.h
+++ b/ext/ncurses/php_ncurses.h
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | PHP Version 5                                                        |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2006 The PHP Group                                |
+   | Copyright (c) 1997-2007 The PHP Group                                |
    +----------------------------------------------------------------------+
    | 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        |
diff --git a/ext/ncurses/php_ncurses_fe.h b/ext/ncurses/php_ncurses_fe.h
index 42eb203fe..190e3d700 100644
--- a/ext/ncurses/php_ncurses_fe.h
+++ b/ext/ncurses/php_ncurses_fe.h
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | PHP Version 5                                                        |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2006 The PHP Group                                |
+   | Copyright (c) 1997-2007 The PHP Group                                |
    +----------------------------------------------------------------------+
    | 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        |