summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSVN Migration <svn@php.net>2002-04-22 10:20:24 +0000
committerSVN Migration <svn@php.net>2002-04-22 10:20:24 +0000
commit0cf31a3d89b872e89110f19fd7393ad72934aadc (patch)
tree743c1179793d5b88ea17256ecffbadeb64a82118
parent83f57e03814967ea87018dcf329cb0eebb06fc95 (diff)
downloadphp-git-php-4.2.0.tar.gz
This commit was manufactured by cvs2svn to create tag 'php_4_2_0'.php-4.2.0
-rw-r--r--NEWS2
-rw-r--r--configure.in2
-rw-r--r--ext/mbstring/tests/common.inc53
-rw-r--r--main/php_version.h2
4 files changed, 3 insertions, 56 deletions
diff --git a/NEWS b/NEWS
index 723a2a3dca..9120c0e6da 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
PHP 4 NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? 2002, Version 4.2.0
+22 Apr 2002, Version 4.2.0
- ATTENTION!! register_globals defaults to 'off' now !!!
- Note: Apache2 support is EXPERIMENTAL.
- Moved ext/mailparse to PECL. See http://thebrainroom.com/opensource/php/
diff --git a/configure.in b/configure.in
index ed9f2c1386..3792febe90 100644
--- a/configure.in
+++ b/configure.in
@@ -36,7 +36,7 @@ for arg in $0 "$@"; do
done
AC_CANONICAL_HOST
-AM_INIT_AUTOMAKE(php, 4.2.1-dev, nodefine)
+AM_INIT_AUTOMAKE(php, 4.2.0, nodefine)
AM_CONFIG_HEADER(main/php_config.h)
AM_MAINTAINER_MODE
diff --git a/ext/mbstring/tests/common.inc b/ext/mbstring/tests/common.inc
deleted file mode 100644
index d4d1d9a495..0000000000
--- a/ext/mbstring/tests/common.inc
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-/*
- * Common definition and Settings
- */
-
-// Custom Error Hanlder for testing
-function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
- global $debug;
-
- $err_type = array (
- 1 => "Error", // E_ERROR
- 2 => "Warning", // E_WARINING
- 4 => "Parsing Error", // E_PARSE
- 8 => "Notice", // E_NOTICE
- 16 => "Core Error", // E_CORE_ERROR
- 32 => "Core Warning", // E_CORE_WARNING
- 64 => "Compile Error", // E_COMPILE_ERROR
- 128 => "Compile Warning", // E_COMPILE_WARNING
- 256 => "User Error", // E_USER_ERROR
- 512 => "User Warning", // E_USER_WARMING
- 1024=> "User Notice" // E_USER_NOTICE
- );
-
- if (!empty($debug)) {
- printf("%s: %s (%d)\n", $err_type[$err_no], $err_msg, $linenum);
- }
- else {
- printf("ERR: %s\n",$err_type[$err_no]);
- }
-}
-
-set_error_handler('test_error_handler');
-
-
-// Var def for testing
-$t_ary = array(
- 's1' => '日本語EUC-JPの文字列',
- 's2' => 'English Text'
- );
-
-class tc
-{
- var $s1 = '日本語EUC-JPの文字列';
- var $s2 = 'English Text';
-
- function tc()
- {
- }
-}
-
-$t_obj = new tc;
-
-?> \ No newline at end of file
diff --git a/main/php_version.h b/main/php_version.h
index 3d72e9a156..82d71ea6ef 100644
--- a/main/php_version.h
+++ b/main/php_version.h
@@ -1,3 +1,3 @@
/* automatically generated by configure */
/* edit configure.in to change version number */
-#define PHP_VERSION "4.2.1-dev"
+#define PHP_VERSION "4.2.0"