Update to php4-core-4.3.1
This commit is contained in:
parent
c5447381a2
commit
1c06d46b39
@ -1,16 +1,16 @@
|
||||
# $OpenBSD: Makefile,v 1.7 2003/02/06 05:28:49 brad Exp $
|
||||
# $OpenBSD: Makefile,v 1.8 2003/04/03 10:26:25 avsm Exp $
|
||||
|
||||
COMMENT= "server-side HTML-embedded scripting language"
|
||||
PKGNAME= php4-core-${V}p1
|
||||
PKGNAME= php4-core-${V}
|
||||
|
||||
CONFIGURE_ARGS+= --with-apxs=/usr/sbin/apxs \
|
||||
--without-mysql \
|
||||
--without-xml \
|
||||
--enable-xml \
|
||||
--enable-cli \
|
||||
--with-iconv=${LOCALBASE} \
|
||||
--with-gettext=${LOCALBASE} \
|
||||
--enable-dio \
|
||||
--without-pear \
|
||||
--with-pear=${PEAR_DIR} \
|
||||
--enable-bcmath \
|
||||
--enable-session \
|
||||
--enable-trans-sid \
|
||||
|
@ -1,3 +1,3 @@
|
||||
MD5 (php-4.2.3.tar.gz) = 2a4a963d79d97ea2725c860c77e908a2
|
||||
RMD160 (php-4.2.3.tar.gz) = 37a2ede463cd9af1874fec4a5cfc874dead865ca
|
||||
SHA1 (php-4.2.3.tar.gz) = 3e57e8c056bd2f173bba8705293cdfa15aeb93bc
|
||||
MD5 (php-4.3.1.tar.gz) = d4a34efe145b43ed10dbd95825686065
|
||||
RMD160 (php-4.3.1.tar.gz) = be60c86f7d285ba7ad899524b077fe013fd1a7fe
|
||||
SHA1 (php-4.3.1.tar.gz) = eb6bec44b0ae23f474724ccb053acb7ef10047bb
|
||||
|
12
www/php4/core/patches/patch-aclocal_m4
Normal file
12
www/php4/core/patches/patch-aclocal_m4
Normal file
@ -0,0 +1,12 @@
|
||||
$OpenBSD: patch-aclocal_m4,v 1.1 2003/04/03 10:26:25 avsm Exp $
|
||||
--- aclocal.m4.orig Wed Jan 22 11:09:53 2003
|
||||
+++ aclocal.m4 Wed Jan 22 11:10:12 2003
|
||||
@@ -3976,7 +3976,7 @@ openbsd*)
|
||||
shlibpath_overrides_runpath=yes
|
||||
fi
|
||||
library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
|
||||
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
|
||||
+ finish_cmds=
|
||||
shlibpath_var=LD_LIBRARY_PATH
|
||||
;;
|
||||
|
@ -1,28 +1,38 @@
|
||||
$OpenBSD: patch-configure_in,v 1.3 2002/07/22 16:47:33 avsm Exp $
|
||||
--- configure.in.orig Sun Jul 21 08:49:33 2002
|
||||
+++ configure.in Mon Jul 22 10:43:06 2002
|
||||
@@ -791,7 +791,7 @@ unset with_pic
|
||||
$OpenBSD: patch-configure_in,v 1.4 2003/04/03 10:26:25 avsm Exp $
|
||||
--- configure.in.orig Fri Dec 27 04:07:18 2002
|
||||
+++ configure.in Wed Jan 22 10:48:47 2003
|
||||
@@ -34,9 +34,7 @@ dnl check for working sed
|
||||
PHP_PROG_SED
|
||||
|
||||
PHP_CONFIG_NICE(config.nice)
|
||||
-for arg in $0 "$@"; do
|
||||
- CONFIGURE_COMMAND="$CONFIGURE_COMMAND '$arg'"
|
||||
-done
|
||||
+CONFIGURE_COMMAND="Built via the OpenBSD Ports Tree"
|
||||
|
||||
AC_CANONICAL_HOST
|
||||
AC_CONFIG_HEADER(main/php_config.h)
|
||||
@@ -806,14 +804,14 @@ unset with_pic
|
||||
|
||||
case $php_build_target in
|
||||
program|static)
|
||||
- standard_libtool_flag='-prefer-non-pic -static'
|
||||
+ standard_libtool_flag='-static'
|
||||
if test "$lib_build_shared" != "yes"; then
|
||||
if test -z "$PHP_MODULES"; then
|
||||
enable_shared=no
|
||||
fi
|
||||
@@ -800,7 +800,7 @@ program|static)
|
||||
;;
|
||||
shared)
|
||||
enable_static=no
|
||||
- standard_libtool_flag=-prefer-pic
|
||||
+ standard_libtool_flag=
|
||||
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -avoid-version"
|
||||
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -avoid-version -module"
|
||||
;;
|
||||
esac
|
||||
@@ -920,7 +920,7 @@ EXPANDED_LIBDIR=$libdir
|
||||
EXPANDED_SYSCONFDIR=`eval echo $sysconfdir`
|
||||
@@ -926,7 +924,7 @@ EXPANDED_SYSCONFDIR=`eval echo $sysconfd
|
||||
EXPANDED_DATADIR=$datadir
|
||||
EXPANDED_PHP_CONFIG_FILE_PATH=`eval echo "$PHP_CONFIG_FILE_PATH"`
|
||||
EXPANDED_PHP_CONFIG_FILE_SCAN_DIR=`eval echo "$PHP_CONFIG_FILE_SCAN_DIR"`
|
||||
-INCLUDE_PATH=.:$EXPANDED_PEAR_INSTALLDIR
|
||||
+INCLUDE_PATH=.:$libdir
|
||||
|
||||
|
@ -1,12 +0,0 @@
|
||||
$OpenBSD: patch-ext_iconv_iconv_c,v 1.1 2002/07/17 22:41:44 naddy Exp $
|
||||
--- ext/iconv/iconv.c.orig Thu Jul 18 00:01:35 2002
|
||||
+++ ext/iconv/iconv.c Thu Jul 18 00:01:59 2002
|
||||
@@ -87,7 +87,7 @@ ZEND_DECLARE_MODULE_GLOBALS(iconv)
|
||||
ZEND_GET_MODULE(iconv)
|
||||
#endif
|
||||
|
||||
-static int php_iconv_string(const char * in_str, unsigned int in_len, char ** out_str, unsigned int * out_len, const char * in_encoding, const char * out_encoding, int *err TSRMLS_DC);
|
||||
+static int php_iconv_string(const char * in_str, size_t in_len, char ** out_str, size_t * out_len, const char * in_encoding, const char * out_encoding, int *err TSRMLS_DC);
|
||||
|
||||
/* {{{ PHP_INI
|
||||
*/
|
@ -1,106 +0,0 @@
|
||||
$OpenBSD: patch-ext_standard_string_c,v 1.1 2003/02/06 05:28:49 brad Exp $
|
||||
--- ext/standard/string.c.orig Mon Jun 24 04:19:43 2002
|
||||
+++ ext/standard/string.c Wed Feb 5 23:54:56 2003
|
||||
@@ -616,7 +616,7 @@ PHP_FUNCTION(wordwrap)
|
||||
{
|
||||
const char *text, *breakchar = "\n";
|
||||
char *newtext;
|
||||
- int textlen, breakcharlen = 1, newtextlen;
|
||||
+ int textlen, breakcharlen = 1, newtextlen, alloced, chk;
|
||||
long current = 0, laststart = 0, lastspace = 0;
|
||||
long linelength = 75;
|
||||
zend_bool docut = 0;
|
||||
@@ -642,38 +642,40 @@ PHP_FUNCTION(wordwrap)
|
||||
for (current = 0; current < textlen; current++) {
|
||||
if (text[current] == breakchar[0]) {
|
||||
laststart = lastspace = current;
|
||||
- }
|
||||
- else if (text[current] == ' ') {
|
||||
+ } else if (text[current] == ' ') {
|
||||
if (current - laststart >= linelength) {
|
||||
newtext[current] = breakchar[0];
|
||||
laststart = current;
|
||||
}
|
||||
lastspace = current;
|
||||
- }
|
||||
- else if (current - laststart >= linelength
|
||||
- && laststart != lastspace) {
|
||||
+ } else if (current - laststart >= linelength && laststart != lastspace) {
|
||||
newtext[lastspace] = breakchar[0];
|
||||
laststart = lastspace;
|
||||
}
|
||||
}
|
||||
|
||||
RETURN_STRINGL(newtext, textlen, 0);
|
||||
- }
|
||||
- else {
|
||||
+ } else {
|
||||
/* Multiple character line break or forced cut */
|
||||
if (linelength > 0) {
|
||||
- newtextlen = textlen + (textlen/linelength + 1) * breakcharlen + 1;
|
||||
- }
|
||||
- else {
|
||||
- newtextlen = textlen * (breakcharlen + 1) + 1;
|
||||
+ chk = (int)(textlen/linelength + 1);
|
||||
+ alloced = textlen + chk * breakcharlen + 1;
|
||||
+ } else {
|
||||
+ chk = textlen;
|
||||
+ alloced = textlen * (breakcharlen + 1) + 1;
|
||||
}
|
||||
- newtext = emalloc(newtextlen);
|
||||
+ newtext = emalloc(alloced);
|
||||
|
||||
/* now keep track of the actual new text length */
|
||||
newtextlen = 0;
|
||||
|
||||
laststart = lastspace = 0;
|
||||
for (current = 0; current < textlen; current++) {
|
||||
+ if (chk <= 0) {
|
||||
+ alloced += (int) (((textlen - current + 1)/linelength + 1) * breakcharlen) + 1;
|
||||
+ newtext = erealloc(newtext, alloced);
|
||||
+ chk = (int) ((textlen - current)/linelength) + 1;
|
||||
+ }
|
||||
/* when we hit an existing break, copy to new buffer, and
|
||||
* fix up laststart and lastspace */
|
||||
if (text[current] == breakchar[0]
|
||||
@@ -683,6 +685,7 @@ PHP_FUNCTION(wordwrap)
|
||||
newtextlen += current-laststart+breakcharlen;
|
||||
current += breakcharlen - 1;
|
||||
laststart = lastspace = current + 1;
|
||||
+ chk--;
|
||||
}
|
||||
/* if it is a space, check if it is at the line boundary,
|
||||
* copy and insert a break, or just keep track of it */
|
||||
@@ -693,6 +696,7 @@ PHP_FUNCTION(wordwrap)
|
||||
memcpy(newtext+newtextlen, breakchar, breakcharlen);
|
||||
newtextlen += breakcharlen;
|
||||
laststart = current + 1;
|
||||
+ chk--;
|
||||
}
|
||||
lastspace = current;
|
||||
}
|
||||
@@ -706,6 +710,7 @@ PHP_FUNCTION(wordwrap)
|
||||
memcpy(newtext+newtextlen, breakchar, breakcharlen);
|
||||
newtextlen += breakcharlen;
|
||||
laststart = lastspace = current;
|
||||
+ chk--;
|
||||
}
|
||||
/* if the current word puts us over the linelength, copy
|
||||
* back up until the last space, insert a break, and move
|
||||
@@ -717,6 +722,7 @@ PHP_FUNCTION(wordwrap)
|
||||
memcpy(newtext+newtextlen, breakchar, breakcharlen);
|
||||
newtextlen += breakcharlen;
|
||||
laststart = lastspace = lastspace + 1;
|
||||
+ chk--;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -727,6 +733,8 @@ PHP_FUNCTION(wordwrap)
|
||||
}
|
||||
|
||||
newtext[newtextlen] = '\0';
|
||||
+ /* free unused memory */
|
||||
+ newtext = erealloc(newtext, newtextlen+1);
|
||||
|
||||
RETURN_STRINGL(newtext, newtextlen, 0);
|
||||
}
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-ltmain_sh,v 1.2 2002/08/12 04:27:41 avsm Exp $
|
||||
--- ltmain.sh.orig Thu Aug 8 03:07:04 2002
|
||||
+++ ltmain.sh Thu Aug 8 03:07:34 2002
|
||||
@@ -4412,40 +4412,6 @@ relink_command=\"$relink_command\""
|
||||
$OpenBSD: patch-ltmain_sh,v 1.3 2003/04/03 10:26:25 avsm Exp $
|
||||
--- ltmain.sh.orig Sun Jun 30 00:24:48 2002
|
||||
+++ ltmain.sh Mon Jan 20 14:01:25 2003
|
||||
@@ -4446,40 +4446,6 @@ relink_command=\"$relink_command\""
|
||||
# Exit here if they wanted silent mode.
|
||||
test "$show" = ":" && exit 0
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-main_php_open_temporary_file_c,v 1.1.1.1 2002/06/24 19:23:41 avsm Exp $
|
||||
--- main/php_open_temporary_file.c.orig Thu May 10 19:32:30 2001
|
||||
+++ main/php_open_temporary_file.c Thu May 10 19:32:44 2001
|
||||
@@ -110,7 +110,7 @@ static FILE *php_do_open_temporary_file(
|
||||
$OpenBSD: patch-main_php_open_temporary_file_c,v 1.2 2003/04/03 10:26:25 avsm Exp $
|
||||
--- main/php_open_temporary_file.c.orig Sun Jan 19 17:05:39 2003
|
||||
+++ main/php_open_temporary_file.c Sun Jan 19 17:05:52 2003
|
||||
@@ -128,7 +128,7 @@ static FILE *php_do_open_temporary_file(
|
||||
trailing_slash = "/";
|
||||
}
|
||||
|
||||
|
@ -1,17 +1,17 @@
|
||||
$OpenBSD: patch-php_ini-dist,v 1.6 2002/09/11 23:16:48 avsm Exp $
|
||||
--- php.ini-dist.orig Wed Aug 14 23:35:36 2002
|
||||
+++ php.ini-dist Sat Aug 24 12:54:49 2002
|
||||
@@ -356,9 +356,6 @@ default_mimetype = "text/html"
|
||||
$OpenBSD: patch-php_ini-dist,v 1.7 2003/04/03 10:26:25 avsm Exp $
|
||||
--- php.ini-dist.orig Thu Dec 26 13:27:08 2002
|
||||
+++ php.ini-dist Sun Feb 16 22:38:40 2003
|
||||
@@ -404,9 +404,6 @@ default_mimetype = "text/html"
|
||||
|
||||
; UNIX: "/path1:/path2"
|
||||
;include_path = ".:/php/includes"
|
||||
;
|
||||
-;
|
||||
-; Windows: "\path1;\path2"
|
||||
-;include_path = ".;c:\php\includes"
|
||||
-
|
||||
|
||||
; The root of the PHP pages, used only if nonempty.
|
||||
; if PHP was not compiled with FORCE_REDIRECT, you SHOULD set doc_root
|
||||
; if you are running php as a CGI under any web server (other than IIS)
|
||||
@@ -371,7 +368,7 @@ doc_root =
|
||||
@@ -420,7 +417,7 @@ doc_root =
|
||||
user_dir =
|
||||
|
||||
; Directory in which the loadable extensions (modules) reside.
|
||||
@ -20,7 +20,7 @@ $OpenBSD: patch-php_ini-dist,v 1.6 2002/09/11 23:16:48 avsm Exp $
|
||||
|
||||
; Whether or not to enable the dl() function. The dl() function does NOT work
|
||||
; properly in multithreaded servers, such as IIS or Zeus, and is automatically
|
||||
@@ -410,85 +407,11 @@ upload_max_filesize = 2M
|
||||
@@ -474,7 +471,7 @@ upload_max_filesize = 2M
|
||||
;;;;;;;;;;;;;;;;;;
|
||||
|
||||
; Whether to allow the treatment of URLs (like http:// or ftp://) as files.
|
||||
@ -29,6 +29,9 @@ $OpenBSD: patch-php_ini-dist,v 1.6 2002/09/11 23:16:48 avsm Exp $
|
||||
|
||||
; Define the anonymous ftp password (your email address)
|
||||
;from="john@doe.com"
|
||||
@@ -492,80 +489,6 @@ default_socket_timeout = 60
|
||||
; fgets() and file() will work regardless of the source of the file.
|
||||
; auto_detect_line_endings = Off
|
||||
|
||||
-
|
||||
-;;;;;;;;;;;;;;;;;;;;;;
|
||||
@ -57,36 +60,36 @@ $OpenBSD: patch-php_ini-dist,v 1.6 2002/09/11 23:16:48 avsm Exp $
|
||||
-;Note that MySQL and ODBC support is now built in, so no dll is needed for it.
|
||||
-;
|
||||
-;extension=php_bz2.dll
|
||||
-;extension=php_ctype.dll
|
||||
-;extension=php_cpdf.dll
|
||||
-;extension=php_crack.dll
|
||||
-;extension=php_curl.dll
|
||||
-;extension=php_cybercash.dll
|
||||
-;extension=php_db.dll
|
||||
-;extension=php_dba.dll
|
||||
-;extension=php_dbase.dll
|
||||
-;extension=php_dbx.dll
|
||||
-;extension=php_domxml.dll
|
||||
-;extension=php_dotnet.dll
|
||||
-;extension=php_exif.dll
|
||||
-;extension=php_fbsql.dll
|
||||
-;extension=php_fdf.dll
|
||||
-;extension=php_filepro.dll
|
||||
-;extension=php_gd.dll
|
||||
-;extension=php_gd2.dll
|
||||
-;extension=php_gettext.dll
|
||||
-;extension=php_hyperwave.dll
|
||||
-;extension=php_iconv.dll
|
||||
-;extension=php_ifx.dll
|
||||
-;extension=php_iisfunc.dll
|
||||
-;extension=php_imap.dll
|
||||
-;extension=php_ingres.dll
|
||||
-;extension=php_interbase.dll
|
||||
-;extension=php_java.dll
|
||||
-;extension=php_ldap.dll
|
||||
-;extension=php_mbstring.dll
|
||||
-;extension=php_mcrypt.dll
|
||||
-;extension=php_mhash.dll
|
||||
-;extension=php_mime_magic.dll
|
||||
-;extension=php_ming.dll
|
||||
-;extension=php_mssql.dll
|
||||
-;extension=php_msql.dll
|
||||
-;extension=php_oci8.dll
|
||||
-;extension=php_openssl.dll
|
||||
-;extension=php_oracle.dll
|
||||
@ -97,17 +100,17 @@ $OpenBSD: patch-php_ini-dist,v 1.6 2002/09/11 23:16:48 avsm Exp $
|
||||
-;extension=php_snmp.dll
|
||||
-;extension=php_sockets.dll
|
||||
-;extension=php_sybase_ct.dll
|
||||
-;extension=php_tokenizer.dll
|
||||
-;extension=php_w32api.dll
|
||||
-;extension=php_xmlrpc.dll
|
||||
-;extension=php_xslt.dll
|
||||
-;extension=php_yaz.dll
|
||||
-;extension=php_zlib.dll
|
||||
-;extension=php_zip.dll
|
||||
-
|
||||
-
|
||||
;;;;;;;;;;;;;;;;;;;
|
||||
; Module Settings ;
|
||||
;;;;;;;;;;;;;;;;;;;
|
||||
@@ -500,11 +423,6 @@ allow_url_fopen = On
|
||||
@@ -577,13 +500,8 @@ default_socket_timeout = 60
|
||||
define_syslog_variables = Off
|
||||
|
||||
[mail function]
|
||||
@ -117,15 +120,16 @@ $OpenBSD: patch-php_ini-dist,v 1.6 2002/09/11 23:16:48 avsm Exp $
|
||||
-; For Win32 only.
|
||||
-sendmail_from = me@localhost.com
|
||||
|
||||
; For Unix only. You may supply arguments as well (default: "sendmail -t -i").
|
||||
-; For Unix only. You may supply arguments as well (default: "sendmail -t -i").
|
||||
+;You may supply arguments as well (default: "sendmail -t -i").
|
||||
;sendmail_path =
|
||||
@@ -885,6 +803,41 @@ sockets.use_system_read = On
|
||||
;fbsql.max_results = 128
|
||||
;fbsql.batchSize = 1000
|
||||
|
||||
-; Local Variables:
|
||||
-; tab-width: 4
|
||||
-; End:
|
||||
[Java]
|
||||
@@ -1091,3 +1009,57 @@ sockets.use_system_read = On
|
||||
; Local Variables:
|
||||
; tab-width: 4
|
||||
; End:
|
||||
+
|
||||
+;;;;;;;;;;;;;;;;;;;;;;
|
||||
+; Dynamic Extensions ;
|
||||
+;;;;;;;;;;;;;;;;;;;;;;
|
||||
@ -133,34 +137,49 @@ $OpenBSD: patch-php_ini-dist,v 1.6 2002/09/11 23:16:48 avsm Exp $
|
||||
+; If you wish to have an extension loaded automatically, use the following
|
||||
+; syntax:
|
||||
+;
|
||||
+; extension=modulename.extension
|
||||
+; extension=modulename.so
|
||||
+;
|
||||
+; For example under UNIX:
|
||||
+;
|
||||
+; extension=msql.so
|
||||
+;
|
||||
+; Note that it should be the name of the module only; no directory information
|
||||
+; Note that it should be the name of the module only; no directory information
|
||||
+; needs to go here. Specify the location of the extension with the
|
||||
+; extension_dir directive above.
|
||||
+
|
||||
+;extension=bz2.so
|
||||
+;extension=cpdf.so
|
||||
+;extension=crack.so
|
||||
+;extension=curl.so
|
||||
+;extension=db.so
|
||||
+;extension=dba.so
|
||||
+;extension=dbase.so
|
||||
+;extension=dbx.so
|
||||
+;extension=domxml.so
|
||||
+;extension=exif.so
|
||||
+;extension=fbsql.so
|
||||
+;extension=fdf.so
|
||||
+;extension=filepro.so
|
||||
+;extension=gd.so
|
||||
+;extension=gmp.so
|
||||
+;extension=hyperwave.so
|
||||
+;extension=ifx.so
|
||||
+;extension=imap.so
|
||||
+;extension=interbase.so
|
||||
+;extension=java.so
|
||||
+;extension=ldap.so
|
||||
+;extension=mbstring.so
|
||||
+;extension=mcrypt.so
|
||||
+;extension=mhash.so
|
||||
+;extension=mysql.so
|
||||
+;extension=ncurses.so
|
||||
+;extension=odbc.so
|
||||
+;extension=ming.so
|
||||
+;extension=mssql.so
|
||||
+;extension=msql.so
|
||||
+;extension=oci8.so
|
||||
+;extension=openssl.so
|
||||
+;extension=oracle.so
|
||||
+;extension=pdf.so
|
||||
+;extension=pgsql.so
|
||||
+;extension=printer.so
|
||||
+;extension=shmop.so
|
||||
+;extension=snmp.so
|
||||
+;extension=sockets.so
|
||||
+;extension=sybase_ct.so
|
||||
+;extension=xml.so
|
||||
+;extension=xmlrpc.so
|
||||
+;extension=xslt.so
|
||||
+;extension=yaz.so
|
||||
+;extension=zip.so
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-php_ini-recommended,v 1.6 2002/09/11 23:16:48 avsm Exp $
|
||||
--- php.ini-recommended.orig Wed Aug 14 23:35:36 2002
|
||||
+++ php.ini-recommended Sat Aug 24 12:54:49 2002
|
||||
@@ -361,9 +361,6 @@ default_mimetype = "text/html"
|
||||
$OpenBSD: patch-php_ini-recommended,v 1.7 2003/04/03 10:26:25 avsm Exp $
|
||||
--- php.ini-recommended.orig Thu Dec 26 13:27:08 2002
|
||||
+++ php.ini-recommended Sun Feb 16 22:39:08 2003
|
||||
@@ -420,9 +420,6 @@ default_mimetype = "text/html"
|
||||
; UNIX: "/path1:/path2"
|
||||
;include_path = ".:/php/includes"
|
||||
;
|
||||
@ -11,7 +11,7 @@ $OpenBSD: patch-php_ini-recommended,v 1.6 2002/09/11 23:16:48 avsm Exp $
|
||||
; The root of the PHP pages, used only if nonempty.
|
||||
; if PHP was not compiled with FORCE_REDIRECT, you SHOULD set doc_root
|
||||
; if you are running php as a CGI under any web server (other than IIS)
|
||||
@@ -376,7 +373,7 @@ doc_root =
|
||||
@@ -435,7 +432,7 @@ doc_root =
|
||||
user_dir =
|
||||
|
||||
; Directory in which the loadable extensions (modules) reside.
|
||||
@ -20,7 +20,7 @@ $OpenBSD: patch-php_ini-recommended,v 1.6 2002/09/11 23:16:48 avsm Exp $
|
||||
|
||||
; Whether or not to enable the dl() function. The dl() function does NOT work
|
||||
; properly in multithreaded servers, such as IIS or Zeus, and is automatically
|
||||
@@ -417,85 +414,11 @@ upload_max_filesize = 2M
|
||||
@@ -489,7 +486,7 @@ upload_max_filesize = 2M
|
||||
;;;;;;;;;;;;;;;;;;
|
||||
|
||||
; Whether to allow the treatment of URLs (like http:// or ftp://) as files.
|
||||
@ -29,8 +29,10 @@ $OpenBSD: patch-php_ini-recommended,v 1.6 2002/09/11 23:16:48 avsm Exp $
|
||||
|
||||
; Define the anonymous ftp password (your email address)
|
||||
;from="john@doe.com"
|
||||
@@ -508,79 +505,6 @@ default_socket_timeout = 60
|
||||
; auto_detect_line_endings = Off
|
||||
|
||||
|
||||
-
|
||||
-;;;;;;;;;;;;;;;;;;;;;;
|
||||
-; Dynamic Extensions ;
|
||||
-;;;;;;;;;;;;;;;;;;;;;;
|
||||
@ -57,36 +59,36 @@ $OpenBSD: patch-php_ini-recommended,v 1.6 2002/09/11 23:16:48 avsm Exp $
|
||||
-;Note that MySQL and ODBC support is now built in, so no dll is needed for it.
|
||||
-;
|
||||
-;extension=php_bz2.dll
|
||||
-;extension=php_ctype.dll
|
||||
-;extension=php_cpdf.dll
|
||||
-;extension=php_crack.dll
|
||||
-;extension=php_curl.dll
|
||||
-;extension=php_cybercash.dll
|
||||
-;extension=php_db.dll
|
||||
-;extension=php_dba.dll
|
||||
-;extension=php_dbase.dll
|
||||
-;extension=php_dbx.dll
|
||||
-;extension=php_domxml.dll
|
||||
-;extension=php_dotnet.dll
|
||||
-;extension=php_exif.dll
|
||||
-;extension=php_fbsql.dll
|
||||
-;extension=php_fdf.dll
|
||||
-;extension=php_filepro.dll
|
||||
-;extension=php_gd.dll
|
||||
-;extension=php_gd2.dll
|
||||
-;extension=php_gettext.dll
|
||||
-;extension=php_hyperwave.dll
|
||||
-;extension=php_iconv.dll
|
||||
-;extension=php_ifx.dll
|
||||
-;extension=php_iisfunc.dll
|
||||
-;extension=php_imap.dll
|
||||
-;extension=php_ingres.dll
|
||||
-;extension=php_interbase.dll
|
||||
-;extension=php_java.dll
|
||||
-;extension=php_ldap.dll
|
||||
-;extension=php_mbstring.dll
|
||||
-;extension=php_mcrypt.dll
|
||||
-;extension=php_mhash.dll
|
||||
-;extension=php_mime_magic.dll
|
||||
-;extension=php_ming.dll
|
||||
-;extension=php_mssql.dll
|
||||
-;extension=php_msql.dll
|
||||
-;extension=php_oci8.dll
|
||||
-;extension=php_openssl.dll
|
||||
-;extension=php_oracle.dll
|
||||
@ -97,17 +99,17 @@ $OpenBSD: patch-php_ini-recommended,v 1.6 2002/09/11 23:16:48 avsm Exp $
|
||||
-;extension=php_snmp.dll
|
||||
-;extension=php_sockets.dll
|
||||
-;extension=php_sybase_ct.dll
|
||||
-;extension=php_tokenizer.dll
|
||||
-;extension=php_w32api.dll
|
||||
-;extension=php_xmlrpc.dll
|
||||
-;extension=php_xslt.dll
|
||||
-;extension=php_yaz.dll
|
||||
-;extension=php_zlib.dll
|
||||
-;extension=php_zip.dll
|
||||
-
|
||||
-
|
||||
;;;;;;;;;;;;;;;;;;;
|
||||
; Module Settings ;
|
||||
;;;;;;;;;;;;;;;;;;;
|
||||
@@ -507,11 +430,6 @@ allow_url_fopen = On
|
||||
@@ -592,11 +516,6 @@ default_socket_timeout = 60
|
||||
define_syslog_variables = Off
|
||||
|
||||
[mail function]
|
||||
@ -119,9 +121,9 @@ $OpenBSD: patch-php_ini-recommended,v 1.6 2002/09/11 23:16:48 avsm Exp $
|
||||
|
||||
; For Unix only. You may supply arguments as well (default: "sendmail -t -i").
|
||||
;sendmail_path =
|
||||
@@ -892,6 +810,41 @@ sockets.use_system_read = On
|
||||
;fbsql.max_results = 128
|
||||
;fbsql.batchSize = 1000
|
||||
@@ -1083,6 +1002,56 @@ sockets.use_system_read = On
|
||||
;exif.decode_jis_motorola = JIS
|
||||
;exif.decode_jis_intel = JIS
|
||||
|
||||
-; Local Variables:
|
||||
-; tab-width: 4
|
||||
@ -133,34 +135,49 @@ $OpenBSD: patch-php_ini-recommended,v 1.6 2002/09/11 23:16:48 avsm Exp $
|
||||
+; If you wish to have an extension loaded automatically, use the following
|
||||
+; syntax:
|
||||
+;
|
||||
+; extension=modulename.extension
|
||||
+;
|
||||
+; For example under UNIX:
|
||||
+;
|
||||
+; extension=msql.so
|
||||
+; extension=modulename.so
|
||||
+;
|
||||
+; Note that it should be the name of the module only; no directory information
|
||||
+; needs to go here. Specify the location of the extension with the
|
||||
+; extension_dir directive above.
|
||||
+
|
||||
+;extension=bz2.so
|
||||
+;extension=cpdf.so
|
||||
+;extension=crack.so
|
||||
+;extension=curl.so
|
||||
+;extension=db.so
|
||||
+;extension=dba.so
|
||||
+;extension=dbase.so
|
||||
+;extension=dbx.so
|
||||
+;extension=domxml.so
|
||||
+;extension=exif.so
|
||||
+;extension=fbsql.so
|
||||
+;extension=fdf.so
|
||||
+;extension=filepro.so
|
||||
+;extension=gd.so
|
||||
+;extension=gmp.so
|
||||
+;extension=hyperwave.so
|
||||
+;extension=ifx.so
|
||||
+;extension=imap.so
|
||||
+;extension=interbase.so
|
||||
+;extension=java.so
|
||||
+;extension=ldap.so
|
||||
+;extension=mbstring.so
|
||||
+;extension=mcrypt.so
|
||||
+;extension=mhash.so
|
||||
+;extension=mysql.so
|
||||
+;extension=ncurses.so
|
||||
+;extension=odbc.so
|
||||
+;extension=ming.so
|
||||
+;extension=mssql.so
|
||||
+;extension=msql.so
|
||||
+;extension=oci8.so
|
||||
+;extension=openssl.so
|
||||
+;extension=oracle.so
|
||||
+;extension=pdf.so
|
||||
+;extension=pgsql.so
|
||||
+;extension=printer.so
|
||||
+;extension=shmop.so
|
||||
+;extension=snmp.so
|
||||
+;extension=sockets.so
|
||||
+;extension=sybase_ct.so
|
||||
+;extension=xml.so
|
||||
+;extension=xmlrpc.so
|
||||
+;extension=xslt.so
|
||||
+;extension=yaz.so
|
||||
+;extension=zip.so
|
||||
|
12
www/php4/core/patches/patch-run-tests_php
Normal file
12
www/php4/core/patches/patch-run-tests_php
Normal file
@ -0,0 +1,12 @@
|
||||
$OpenBSD: patch-run-tests_php,v 1.1 2003/04/03 10:26:25 avsm Exp $
|
||||
--- run-tests.php.orig Thu Jan 23 13:26:55 2003
|
||||
+++ run-tests.php Thu Jan 23 13:27:05 2003
|
||||
@@ -44,6 +44,8 @@ if (getenv('TEST_PHP_SRCDIR')) {
|
||||
|
||||
$cwd = getcwd();
|
||||
set_time_limit(0);
|
||||
+
|
||||
+ob_flush();
|
||||
while(ob_get_level()) {
|
||||
ob_end_clean();
|
||||
}
|
Loading…
x
Reference in New Issue
Block a user