Merge branch 'PHP-5.3' into PHP-5.4

Conflicts:
	ext/interbase/interbase.rc

diff --cc ext/date/lib/parse_date.c
Simple merge

diff --cc ext/date/lib/parse_iso_intervals.c
Simple merge

diff --cc ext/dba/libflatfile/flatfile.c
Simple merge

diff --cc ext/dba/libinifile/inifile.c
Simple merge

diff --cc ext/standard/url_scanner_ex.c
index d883d4dfa32931a5d914d7253092fe71a57ae3bc,943242f343f6aed28d75fc674978d1521bf40a61..c7e4a38d286eaf04f93fce703fb93602ee04dda5
--- 1/ext/standard/url_scanner_ex.c
--- 2/ext/standard/url_scanner_ex.c
+++ b/ext/standard/url_scanner_ex.c
@@@ -2,9 -2,9 +2,9 @@@
  #line 1 "ext/standard/url_scanner_ex.re"
  /*
    +----------------------------------------------------------------------+
 -  | PHP Version 5                                                        |
 +  | PHP Version 6                                                        |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2006 The PHP Group                                |
+   | Copyright (c) 1997-2012 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 --cc sapi/cli/cli.h
index 2c069c4491a32c1262d9a217dce42b55ca29fd45,0000000000000000000000000000000000000000..3e9ca430849ab31749c56e0975aba5ba1b9c7dbf
mode 100644,000000..100644
--- 1/sapi/cli/cli.h
--- /dev/null
+++ b/sapi/cli/cli.h
@@@ -1,52 -1,0 +1,52 @@@
-   | Copyright (c) 1997-2010 The PHP Group                                |
 +/*
 +  +----------------------------------------------------------------------+
 +  | PHP Version 5                                                        |
 +  +----------------------------------------------------------------------+
++  | Copyright (c) 1997-2012 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        |
 +  | available through the world-wide-web at the following url:           |
 +  | 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.               |
 +  +----------------------------------------------------------------------+
 +  | Author: Johannes Schlueter <johannes@php.net>                        |
 +  +----------------------------------------------------------------------+
 +*/
 +
 +/* $Id$ */
 +
 +#ifndef CLI_H
 +#define CLI_H
 +
 +#ifdef PHP_WIN32
 +#   define PHP_CLI_API __declspec(dllexport)
 +#elif defined(__GNUC__) && __GNUC__ >= 4
 +#   define PHP_CLI_API __attribute__ ((visibility("default")))
 +#else
 +#   define PHP_CLI_API
 +#endif
 +
 +
 +extern PHP_CLI_API size_t sapi_cli_single_write(const char *str, uint str_length TSRMLS_DC);
 +
 +typedef struct  {
 +      size_t (*cli_shell_write)(const char *str, uint str_length TSRMLS_DC);
 +      int (*cli_shell_ub_write)(const char *str, uint str_length TSRMLS_DC);
 +      int (*cli_shell_run)(TSRMLS_D);
 +} cli_shell_callbacks_t;
 +
 +extern PHP_CLI_API cli_shell_callbacks_t *php_cli_get_shell_callbacks();
 +
 +#endif /* CLI_H */
 +
 +/*
 + * Local variables:
 + * tab-width: 4
 + * c-basic-offset: 4
 + * End:
 + * vim600: noet sw=4 ts=4 fdm=marker
 + * vim<600: noet sw=4 ts=4
 + */

diff --cc sapi/fpm/fpm/fpm_main.c
Simple merge