From: SVN Migration Date: Thu, 2 Jun 2005 21:32:50 +0000 (+0000) Subject: This commit was manufactured by cvs2svn to create branch 'PHP_4_4'. X-Git-Tag: php-4.4.0RC1~28 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0cf43df6047f1ca358f209b211b3b87a2e1c0b43;p=php This commit was manufactured by cvs2svn to create branch 'PHP_4_4'. --- diff --git a/ext/imap/tests/bug31142_1.phpt b/ext/imap/tests/bug31142_1.phpt deleted file mode 100644 index efb92b7b45..0000000000 --- a/ext/imap/tests/bug31142_1.phpt +++ /dev/null @@ -1,59 +0,0 @@ ---TEST-- -Bug #31142 test #1 (imap_mail_compose() generates incorrect output) ---SKIPIF-- - ---FILE-- - ---EXPECTF-- -From: joe@example.com -To: foo@example.com -cc: bar@example.com -MIME-Version: 1.0 -Content-Type: MULTIPART/mixed; BOUNDARY="%s" - ---%s -Content-Type: APPLICATION/octet-stream -Content-Transfer-Encoding: BASE64 -Content-Description: some file - -QUJD - ---%s -Content-Type: TEXT/plain; CHARSET=US-ASCII -Content-Description: description3 - -contents.data3 - - - ---%s-- diff --git a/ext/imap/tests/bug31142_2.phpt b/ext/imap/tests/bug31142_2.phpt deleted file mode 100644 index 2a81760a7b..0000000000 --- a/ext/imap/tests/bug31142_2.phpt +++ /dev/null @@ -1,30 +0,0 @@ ---TEST-- -Bug #31142 test #2 (imap_mail_compose() generates incorrect output) ---SKIPIF-- - ---FILE-- - ---EXPECT-- -From: host@domain.com -MIME-Version: 1.0 -Content-Type: TEXT/plain; CHARSET=iso-8859-2 -Content-Transfer-Encoding: QUOTED-PRINTABLE - -asn =C5=99kl \ No newline at end of file diff --git a/ext/pcre/config0.m4 b/ext/pcre/config0.m4 new file mode 100644 index 0000000000..2b8e607a31 --- /dev/null +++ b/ext/pcre/config0.m4 @@ -0,0 +1,56 @@ +dnl +dnl $Id$ +dnl + +dnl By default we'll compile and link against the bundled PCRE library +dnl if DIR is supplied, we'll use that for linking + +PHP_ARG_WITH(pcre-regex,for PCRE support, +[ --without-pcre-regex Do not include Perl Compatible Regular Expressions + support. Use --with-pcre-regex=DIR to specify DIR + where PCRE's include and library files are located, + if not using bundled library.],yes) + +if test "$PHP_PCRE_REGEX" != "no"; then + if test "$PHP_PCRE_REGEX" = "yes"; then + PHP_NEW_EXTENSION(pcre, pcrelib/maketables.c pcrelib/get.c pcrelib/study.c pcrelib/pcre.c php_pcre.c, $ext_shared,,-DSUPPORT_UTF8 -DSUPPORT_UCP -DLINK_SIZE=2 -DPOSIX_MALLOC_THRESHOLD=10 -DMATCH_LIMIT=10000000 -I@ext_srcdir@/pcrelib) + PHP_ADD_BUILD_DIR($ext_builddir/pcrelib) + AC_DEFINE(HAVE_BUNDLED_PCRE, 1, [ ]) + else + for i in $PHP_PCRE_REGEX $PHP_PCRE_REGEX/include $PHP_PCRE_REGEX/include/pcre; do + test -f $i/pcre.h && PCRE_INCDIR=$i + done + + if test -z "$PCRE_INCDIR"; then + AC_MSG_ERROR([Could not find pcre.h in $PHP_PCRE_REGEX]) + fi + + for j in $PHP_PCRE_REGEX $PHP_PCRE_REGEX/lib; do + test -f $j/libpcre.a -o -f $j/libpcre.$SHLIB_SUFFIX_NAME && PCRE_LIBDIR=$j + done + + if test -z "$PCRE_LIBDIR" ; then + AC_MSG_ERROR([Could not find libpcre.(a|$SHLIB_SUFFIX_NAME) in $PHP_PCRE_REGEX]) + fi + + changequote({,}) + pcre_major=`grep PCRE_MAJOR $PCRE_INCDIR/pcre.h | sed -e 's/[^0-9]//g'` + pcre_minor=`grep PCRE_MINOR $PCRE_INCDIR/pcre.h | sed -e 's/[^0-9]//g'` + changequote([,]) + pcre_minor_length=`echo "$pcre_minor" | wc -c | sed -e 's/[^0-9]//g'` + if test "$pcre_minor_length" -eq 2 ; then + pcre_minor="$pcre_minor"0 + fi + pcre_version=$pcre_major$pcre_minor + if test "$pcre_version" -lt 208; then + AC_MSG_ERROR([The PCRE extension requires PCRE library version >= 2.08]) + fi + + PHP_ADD_LIBRARY_WITH_PATH(pcre, $PCRE_LIBDIR, PCRE_SHARED_LIBADD) + + AC_DEFINE(HAVE_PCRE, 1, [ ]) + PHP_ADD_INCLUDE($PCRE_INCDIR) + PHP_NEW_EXTENSION(pcre, php_pcre.c, $ext_shared,,-DSUPPORT_UTF8 -DSUPPORT_UCP -DLINK_SIZE=2 -DPOSIX_MALLOC_THRESHOLD=10 -DMATCH_LIMIT=10000000) + fi + PHP_SUBST(PCRE_SHARED_LIBADD) +fi diff --git a/scripts/man1/php-config.1.in b/scripts/man1/php-config.1.in deleted file mode 100644 index 78b0252f84..0000000000 --- a/scripts/man1/php-config.1.in +++ /dev/null @@ -1,77 +0,0 @@ -./" +----------------------------------------------------------------------+ -./" | PHP Version 5 | -./" +----------------------------------------------------------------------+ -./" | Copyright (c) 1997-2004 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 | -./" +----------------------------------------------------------------------+ -./" -./" $Id$ -./" -.TH php\-config 1 "Apr 2005" "The PHP Group" "Scripting Language" -.SH NAME -.TP 15 -.B php\-config -Get information about PHP configuration -.SH SYNOPSIS -.B php\-config -[options] -.LP -.SH DESCRIPTION -.B php\-config -is a simple shell script for obtaining information about installed PHP configuration. -.SH OPTIONS -.TP 15 -.PD 0 -.B \-\-prefix -Directory prefix where PHP is installed, e.g. /usr/local -.TP -.PD 0 -.B \-\-includes -List of \-I options with all include files -.TP -.PD 0 -.B \-\-ldflags -LD Flags which PHP was compiled with -.TP -.PD 0 -.B \-\-libs -Extra libraries which PHP was compiled with -.TP -.PD 0 -.B \-\-extension-dir -Directory where extensions are searched by default -.TP -.PD 0 -.B \-\-version -PHP version -.TP -.PD 1 -.P -.SH SEE ALSO -.BR php (1) -.SH VERSION INFORMATION -This manpage describes \fBphp\fP, version @PHP_VERSION@. -.SH COPYRIGHT -Copyright \(co 1997\-2005 The PHP Group -.LP -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 -.PD 0 -.P -.B http://www.php.net/license/3_0.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 -so we can mail you a copy immediately. diff --git a/scripts/man1/phpize.1.in b/scripts/man1/phpize.1.in deleted file mode 100644 index 7ede86a8d5..0000000000 --- a/scripts/man1/phpize.1.in +++ /dev/null @@ -1,68 +0,0 @@ -./" +----------------------------------------------------------------------+ -./" | PHP Version 5 | -./" +----------------------------------------------------------------------+ -./" | Copyright (c) 1997-2004 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 | -./" +----------------------------------------------------------------------+ -./" -./" $Id$ -./" -.TH phpize 1 "Apr 2005" "The PHP Group" "Scripting Language" -.SH NAME -.TP 15 -.B phpize -Prepare PHP extension for compiling -.SH SYNOPSIS -.B phpize -[options] -.LP -.SH DESCRIPTION -.B phpize -is a shell script to prepare PHP extension for compiling. -.SH OPTIONS -.TP 15 -.PD 0 -.B \-\-clean -Remove all created files -.TP -.PD 0 -.B \-\-help -Prints usage information -.TP -.PD 0 -.B \-\-version -.TP -.PD 1 -.B \-v -Prints API version information -.TP -.PD 1 -.P -.SH SEE ALSO -.BR php (1) -.SH VERSION INFORMATION -This manpage describes \fBphp\fP, version @PHP_VERSION@. -.SH COPYRIGHT -Copyright \(co 1997\-2005 The PHP Group -.LP -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 -.PD 0 -.P -.B http://www.php.net/license/3_0.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 -so we can mail you a copy immediately.