[PHP-CVS] cvs: php-src(PHP_5) /ext/standard filestat.c /ext/standard/tests/file bug24313.phpt /main fopen_wrappers.c fopen_wrappers.h
iliaa Tue Jun 24 09:42:45 2003 EDT
Added files: (Branch: PHP_5)
/php-src/ext/standard/tests/filebug24313.phpt
Modified files:
/php-src/main fopen_wrappers.h fopen_wrappers.c
/php-src/ext/standard filestat.c
Log:
Fixed bug #24313 (file_exist() warning on non-existent files when
open_basedir is used).
Index: php-src/main/fopen_wrappers.h
diff -u php-src/main/fopen_wrappers.h:1.41 php-src/main/fopen_wrappers.h:1.41.2.1
--- php-src/main/fopen_wrappers.h:1.41 Tue Jun 10 16:03:41 2003
+++ php-src/main/fopen_wrappers.h Tue Jun 24 09:42:45 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: fopen_wrappers.h,v 1.41 2003/06/10 20:03:41 imajes Exp $ */
+/* $Id: fopen_wrappers.h,v 1.41.2.1 2003/06/24 13:42:45 iliaa Exp $ */
#ifndef FOPEN_WRAPPERS_H
#define FOPEN_WRAPPERS_H
@@ -28,6 +28,7 @@
PHPAPI char *expand_filepath(const char *filepath, char *real_path TSRMLS_DC);
PHPAPI int php_check_open_basedir(const char *path TSRMLS_DC);
+PHPAPI int php_check_open_basedir_ex(const char *path, int warn TSRMLS_DC);
PHPAPI int php_check_specific_open_basedir(const char *basedir, const char *path
TSRMLS_DC);
PHPAPI int php_check_safe_mode_include_dir(char *path TSRMLS_DC);
Index: php-src/main/fopen_wrappers.c
diff -u php-src/main/fopen_wrappers.c:1.162 php-src/main/fopen_wrappers.c:1.162.2.1
--- php-src/main/fopen_wrappers.c:1.162 Tue Jun 10 16:03:41 2003
+++ php-src/main/fopen_wrappers.c Tue Jun 24 09:42:45 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: fopen_wrappers.c,v 1.162 2003/06/10 20:03:41 imajes Exp $ */
+/* $Id: fopen_wrappers.c,v 1.162.2.1 2003/06/24 13:42:45 iliaa Exp $ */
/* {{{ includes
*/
@@ -162,9 +162,14 @@
}
/* }}} */
+PHPAPI int php_check_open_basedir(const char *path TSRMLS_DC)
+{
+ return php_check_open_basedir_ex(path, 1 TSRMLS_DC);
+}
+
/* {{{ php_check_open_basedir
*/
-PHPAPI int php_check_open_basedir(const char *path TSRMLS_DC)
+PHPAPI int php_check_open_basedir_ex(const char *path, int warn TSRMLS_DC)
{
/* Only check when open_basedir is available */
if (PG(open_basedir) *PG(open_basedir)) {
@@ -190,8 +195,10 @@
ptr = end;
}
- php_error_docref(NULL TSRMLS_CC, E_WARNING,
- open_basedir restriction in effect. File(%s) is not within
the allowed path(s): (%s), path, PG(open_basedir));
+ if (warn) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,
+ open_basedir restriction in effect. File(%s) is not
within the allowed path(s): (%s), path, PG(open_basedir));
+ }
efree(pathbuf);
errno = EPERM; /* we deny permission to open it */
return -1;
Index: php-src/ext/standard/filestat.c
diff -u php-src/ext/standard/filestat.c:1.122 php-src/ext/standard/filestat.c:1.122.2.1
--- php-src/ext/standard/filestat.c:1.122 Tue Jun 10 16:03:37 2003
+++ php-src/ext/standard/filestat.c Tue Jun 24 09:42:45 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: filestat.c,v 1.122 2003/06/10 20:03:37 imajes Exp $ */
+/* $Id: filestat.c,v 1.122.2.1 2003/06/24 13:42:45 iliaa Exp $ */
#include php.h
#include safe_mode.h
@@ -572,7 +572,7 @@
RETURN_FALSE;
}
- if (php_check_open_basedir(filename TSRMLS_CC)) {
+ if (php_check_open_basedir_ex(filename, IS_EXISTS_CHECK(type) ? 0 : 1
TSRMLS_CC)) {
RETURN_FALSE;
}
Index: php-src/ext/standard/tests/file/bug24313.phpt
+++ php-src/ext/standard/tests/file/bug24313.phpt
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) / NEWS /ext/standard filestat.c /ext/standard/tests/file bug24313.phpt /main fopen_wrappers.c fopen_wrappers.h
iliaa Tue Jun 24 09:44:57 2003 EDT
Added files: (Branch: PHP_4_3)
/php-src/ext/standard/tests/filebug24313.phpt
Modified files:
/php-src/main fopen_wrappers.h fopen_wrappers.c
/php-src/ext/standard filestat.c
/php-srcNEWS
Log:
MFH: Fixed bug #24313 (file_exist() warning on non-existent files when
open_basedir is used).
Index: php-src/main/fopen_wrappers.h
diff -u php-src/main/fopen_wrappers.h:1.38.4.1 php-src/main/fopen_wrappers.h:1.38.4.2
--- php-src/main/fopen_wrappers.h:1.38.4.1 Tue Dec 31 11:25:14 2002
+++ php-src/main/fopen_wrappers.h Tue Jun 24 09:44:56 2003
@@ -15,7 +15,7 @@
| Author: Jim Winstead [EMAIL PROTECTED] |
+--+
*/
-/* $Id: fopen_wrappers.h,v 1.38.4.1 2002/12/31 16:25:14 sebastian Exp $ */
+/* $Id: fopen_wrappers.h,v 1.38.4.2 2003/06/24 13:44:56 iliaa Exp $ */
#ifndef FOPEN_WRAPPERS_H
#define FOPEN_WRAPPERS_H
@@ -27,6 +27,7 @@
PHPAPI char *expand_filepath(const char *filepath, char *real_path TSRMLS_DC);
PHPAPI int php_check_open_basedir(const char *path TSRMLS_DC);
+PHPAPI int php_check_open_basedir_ex(const char *path, int warn TSRMLS_DC);
PHPAPI int php_check_specific_open_basedir(const char *basedir, const char *path
TSRMLS_DC);
PHPAPI int php_check_safe_mode_include_dir(char *path TSRMLS_DC);
Index: php-src/main/fopen_wrappers.c
diff -u php-src/main/fopen_wrappers.c:1.153.2.3 php-src/main/fopen_wrappers.c:1.153.2.4
--- php-src/main/fopen_wrappers.c:1.153.2.3 Sun Feb 23 17:03:54 2003
+++ php-src/main/fopen_wrappers.c Tue Jun 24 09:44:56 2003
@@ -16,7 +16,7 @@
| Jim Winstead [EMAIL PROTECTED] |
+--+
*/
-/* $Id: fopen_wrappers.c,v 1.153.2.3 2003/02/23 22:03:54 rasmus Exp $ */
+/* $Id: fopen_wrappers.c,v 1.153.2.4 2003/06/24 13:44:56 iliaa Exp $ */
/* {{{ includes
*/
@@ -163,9 +163,14 @@
}
/* }}} */
+PHPAPI int php_check_open_basedir(const char *path TSRMLS_DC)
+{
+ return php_check_open_basedir_ex(path, 1 TSRMLS_DC);
+}
+
/* {{{ php_check_open_basedir
*/
-PHPAPI int php_check_open_basedir(const char *path TSRMLS_DC)
+PHPAPI int php_check_open_basedir_ex(const char *path, int warn TSRMLS_DC)
{
/* Only check when open_basedir is available */
if (PG(open_basedir) *PG(open_basedir)) {
@@ -191,8 +196,10 @@
ptr = end;
}
- php_error_docref(NULL TSRMLS_CC, E_WARNING,
- open_basedir restriction in effect. File(%s) is not within
the allowed path(s): (%s), path, PG(open_basedir));
+ if (warn) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,
+ open_basedir restriction in effect. File(%s) is not
within the allowed path(s): (%s), path, PG(open_basedir));
+ }
efree(pathbuf);
errno = EPERM; /* we deny permission to open it */
return -1;
Index: php-src/ext/standard/filestat.c
diff -u php-src/ext/standard/filestat.c:1.112.2.6
php-src/ext/standard/filestat.c:1.112.2.7
--- php-src/ext/standard/filestat.c:1.112.2.6 Tue Apr 22 22:37:29 2003
+++ php-src/ext/standard/filestat.c Tue Jun 24 09:44:57 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: filestat.c,v 1.112.2.6 2003/04/23 02:37:29 iliaa Exp $ */
+/* $Id: filestat.c,v 1.112.2.7 2003/06/24 13:44:57 iliaa Exp $ */
#include php.h
#include safe_mode.h
@@ -572,7 +572,7 @@
RETURN_FALSE;
}
- if (php_check_open_basedir(filename TSRMLS_CC)) {
+ if (php_check_open_basedir_ex(filename, IS_EXISTS_CHECK(type) ? 0 : 1
TSRMLS_CC)) {
RETURN_FALSE;
}
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.264 php-src/NEWS:1.1247.2.265
--- php-src/NEWS:1.1247.2.264 Mon Jun 23 21:03:07 2003
+++ php-src/NEWSTue Jun 24 09:44:57 2003
@@ -2,6 +2,8 @@
|||
26 Jun 2003, Version 4.3.3RC2
+- Fixed bug #24313 (file_exist() warning on non-existent files
+ when open_basedir is used). (Ilia)
- Fixed bug #24284 (Fixed memory leak inside pg_ping()). (Ilia)
19 Jun 2003, Version 4.3.3RC1
Index: php-src/ext/standard/tests/file/bug24313.phpt
+++ php-src/ext/standard/tests/file/bug24313.phpt
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard filestat.c /ext/standard/tests/file bug24313.phpt /main fopen_wrappers.c fopen_wrappers.h
iliaa Tue Jun 24 09:56:25 2003 EDT
Modified files:
/php-src/main fopen_wrappers.h fopen_wrappers.c
/php-src/ext/standard filestat.c
/php-src/ext/standard/tests/filebug24313.phpt
Log:
Fix for bug #24313 (port from dead PHP_5 branch)
Index: php-src/main/fopen_wrappers.h
diff -u php-src/main/fopen_wrappers.h:1.41 php-src/main/fopen_wrappers.h:1.42
--- php-src/main/fopen_wrappers.h:1.41 Tue Jun 10 16:03:41 2003
+++ php-src/main/fopen_wrappers.h Tue Jun 24 09:56:25 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: fopen_wrappers.h,v 1.41 2003/06/10 20:03:41 imajes Exp $ */
+/* $Id: fopen_wrappers.h,v 1.42 2003/06/24 13:56:25 iliaa Exp $ */
#ifndef FOPEN_WRAPPERS_H
#define FOPEN_WRAPPERS_H
@@ -28,6 +28,7 @@
PHPAPI char *expand_filepath(const char *filepath, char *real_path TSRMLS_DC);
PHPAPI int php_check_open_basedir(const char *path TSRMLS_DC);
+PHPAPI int php_check_open_basedir_ex(const char *path, int warn TSRMLS_DC);
PHPAPI int php_check_specific_open_basedir(const char *basedir, const char *path
TSRMLS_DC);
PHPAPI int php_check_safe_mode_include_dir(char *path TSRMLS_DC);
Index: php-src/main/fopen_wrappers.c
diff -u php-src/main/fopen_wrappers.c:1.162 php-src/main/fopen_wrappers.c:1.163
--- php-src/main/fopen_wrappers.c:1.162 Tue Jun 10 16:03:41 2003
+++ php-src/main/fopen_wrappers.c Tue Jun 24 09:56:25 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: fopen_wrappers.c,v 1.162 2003/06/10 20:03:41 imajes Exp $ */
+/* $Id: fopen_wrappers.c,v 1.163 2003/06/24 13:56:25 iliaa Exp $ */
/* {{{ includes
*/
@@ -162,9 +162,14 @@
}
/* }}} */
+PHPAPI int php_check_open_basedir(const char *path TSRMLS_DC)
+{
+ return php_check_open_basedir_ex(path, 1 TSRMLS_DC);
+}
+
/* {{{ php_check_open_basedir
*/
-PHPAPI int php_check_open_basedir(const char *path TSRMLS_DC)
+PHPAPI int php_check_open_basedir_ex(const char *path, int warn TSRMLS_DC)
{
/* Only check when open_basedir is available */
if (PG(open_basedir) *PG(open_basedir)) {
@@ -190,8 +195,10 @@
ptr = end;
}
- php_error_docref(NULL TSRMLS_CC, E_WARNING,
- open_basedir restriction in effect. File(%s) is not within
the allowed path(s): (%s), path, PG(open_basedir));
+ if (warn) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,
+ open_basedir restriction in effect. File(%s) is not
within the allowed path(s): (%s), path, PG(open_basedir));
+ }
efree(pathbuf);
errno = EPERM; /* we deny permission to open it */
return -1;
Index: php-src/ext/standard/filestat.c
diff -u php-src/ext/standard/filestat.c:1.122 php-src/ext/standard/filestat.c:1.123
--- php-src/ext/standard/filestat.c:1.122 Tue Jun 10 16:03:37 2003
+++ php-src/ext/standard/filestat.c Tue Jun 24 09:56:25 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: filestat.c,v 1.122 2003/06/10 20:03:37 imajes Exp $ */
+/* $Id: filestat.c,v 1.123 2003/06/24 13:56:25 iliaa Exp $ */
#include php.h
#include safe_mode.h
@@ -572,7 +572,7 @@
RETURN_FALSE;
}
- if (php_check_open_basedir(filename TSRMLS_CC)) {
+ if (php_check_open_basedir_ex(filename, IS_EXISTS_CHECK(type) ? 0 : 1
TSRMLS_CC)) {
RETURN_FALSE;
}
Index: php-src/ext/standard/tests/file/bug24313.phpt
diff -u /dev/null php-src/ext/standard/tests/file/bug24313.phpt:1.2
--- /dev/null Tue Jun 24 09:56:25 2003
+++ php-src/ext/standard/tests/file/bug24313.phpt Tue Jun 24 09:56:25 2003
@@ -0,0 +1,10 @@
+--TEST--
+Bug #24313: file_exists() warning on non-existant files when is open_basedir enabled
+--INI--
+open_basedir=/tmp
+--FILE--
+?php
+ var_dump(file_exists(./foobar));
+?
+--EXPECT--
+bool(false)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/domxml .cvsignore CREDITS EXPERIMENTAL TODO config.m4 domxml.dsp php_domxml.c php_domxml.h /ext/domxml/tests .cvsignore domxml001.phpt domxml002.phpt domxml_test.inc skipif.inc xmldoc.phpt /ext/hyperwave .cvsignore CREDITS config.m4 debug.h hg_comm.c hg_comm.h hw.c hw_error.h hyperwave.dsp php_hyperwave.h /ext/xslt .cvsignore README.XSLT-BACKENDS TODO config.m4 php_sablot.h php_xslt.h sablot.c xslt.c xslt.dsp /ext/xslt/tests .cvsignore args.xsl bug17791.phpt bug17931.phpt bug20177.phpt bug20518.phpt param.xsl public.xml qa.dtd skipif.inc test.xml xslt-001.phpt xslt.phpt xslt_backend_info.phpt xslt_getopt.phpt xslt_process-001.phpt xslt_process-002.phpt xslt_set_object.phpt xslt_set_object.xsl xslt_set_scheme_handlers-001.phpt xslt_set_scheme_handlers-002.phpt xslt_set_scheme_handlers-003.phpt xslt_setopt.phpt
sas Tue Jun 24 09:56:57 2003 EDT Removed files: /php-src/ext/domxml .cvsignore CREDITS EXPERIMENTAL TODO config.m4 domxml.dsp php_domxml.c php_domxml.h /php-src/ext/domxml/tests .cvsignore domxml001.phpt domxml002.phpt domxml_test.inc skipif.inc xmldoc.phpt /php-src/ext/hyperwave .cvsignore CREDITS config.m4 debug.h hg_comm.c hg_comm.h hw.c hw_error.h hyperwave.dsp php_hyperwave.h /php-src/ext/xslt .cvsignore README.XSLT-BACKENDS TODO config.m4 php_sablot.h php_xslt.h sablot.c xslt.c xslt.dsp /php-src/ext/xslt/tests .cvsignore args.xsl bug17791.phpt bug17931.phpt bug20177.phpt bug20518.phpt param.xsl public.xml qa.dtd skipif.inc test.xml xslt-001.phpt xslt.phpt xslt_backend_info.phpt xslt_getopt.phpt xslt_process-001.phpt xslt_process-002.phpt xslt_set_object.phpt xslt_set_object.xsl xslt_set_scheme_handlers-001.phpt xslt_set_scheme_handlers-002.phpt xslt_set_scheme_handlers-003.phpt xslt_setopt.phpt Log: Empty HEAD of domxml, hyperwave, xslt -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / acinclude.m4 configure.in /ext/openssl config.m4 config0.m4 /ext/snmp config.m4 /scripts phpize.m4
sniper Tue Jun 24 10:05:25 2003 EDT Removed files: /php-src/ext/opensslconfig.m4 Modified files: /php-srcacinclude.m4 configure.in /php-src/ext/opensslconfig0.m4 /php-src/ext/snmp config.m4 /php-src/scriptsphpize.m4 Log: - Unified PHP_SETUP_OPENSSL with other PHP_SETUP_* macros. Index: php-src/acinclude.m4 diff -u php-src/acinclude.m4:1.246 php-src/acinclude.m4:1.247 --- php-src/acinclude.m4:1.246 Sun Jun 8 20:17:03 2003 +++ php-src/acinclude.m4Tue Jun 24 10:05:24 2003 @@ -1,4 +1,4 @@ -dnl $Id: acinclude.m4,v 1.246 2003/06/09 00:17:03 sniper Exp $ +dnl $Id: acinclude.m4,v 1.247 2003/06/24 14:05:24 sniper Exp $ dnl dnl This file contains local autoconf functions. @@ -177,66 +177,6 @@ $1=[$]ac_new_flags ]) -AC_DEFUN([PHP_SETUP_OPENSSL],[ - if test $PHP_OPENSSL = yes; then -PHP_OPENSSL=/usr/local/ssl /usr/local /usr /usr/local/openssl - fi - - for i in $PHP_OPENSSL; do -if test -r $i/include/openssl/evp.h; then - OPENSSL_INCDIR=$i/include -fi -if test -r $i/lib/libssl.a -o -r $i/lib/libssl.$SHLIB_SUFFIX_NAME; then - OPENSSL_LIBDIR=$i/lib -fi - done - - if test -z $OPENSSL_INCDIR; then -AC_MSG_ERROR([Cannot find OpenSSL's evp.h]) - fi - - if test -z $OPENSSL_LIBDIR; then -AC_MSG_ERROR([Cannot find OpenSSL's libraries]) - fi - - old_CPPFLAGS=$CPPFLAGS - CPPFLAGS=-I$OPENSSL_INCDIR - AC_MSG_CHECKING([for OpenSSL version]) - AC_EGREP_CPP(yes,[ -#include openssl/opensslv.h -#if OPENSSL_VERSION_NUMBER = 0x0090600fL - yes -#endif - ],[ -AC_MSG_RESULT([= 0.9.6]) - ],[ -AC_MSG_ERROR([OpenSSL version 0.9.6 or greater required.]) - ]) - CPPFLAGS=$old_CPPFLAGS - - PHP_ADD_INCLUDE($OPENSSL_INCDIR) - PHP_ADD_LIBPATH($OPENSSL_LIBDIR) - - PHP_CHECK_LIBRARY(crypto, CRYPTO_free, [ -PHP_ADD_LIBRARY(crypto) - ],[ -AC_MSG_ERROR([libcrypto not found!]) - ],[ --L$OPENSSL_LIBDIR - ]) - - PHP_CHECK_LIBRARY(ssl, SSL_CTX_set_ssl_version, [ -PHP_ADD_LIBRARY(ssl) - ],[ -AC_MSG_ERROR([libssl not found!]) - ],[ --L$OPENSSL_LIBDIR - ]) - - OPENSSL_INCDIR_OPT=-I$OPENSSL_INCDIR - AC_SUBST(OPENSSL_INCDIR_OPT) -]) - dnl PHP_EVAL_LIBLINE(LINE, SHARED-LIBADD) dnl dnl Use this macro, if you need to add libraries and or library search @@ -1622,6 +1562,81 @@ LDFLAGS=$save_old_LDFLAGS $4 ]) +]) + +dnl +dnl PHP_SETUP_OPENSSL(shared-add [, action-found [, action-not-found]]) +dnl +dnl Common setup macro for openssl +dnl +AC_DEFUN([PHP_SETUP_OPENSSL],[ + found_openssl=no + unset OPENSSL_INCDIR + unset OPENSSL_LIBDIR + + if test $PHP_OPENSSL = yes; then +PHP_OPENSSL=/usr/local/ssl /usr/local /usr /usr/local/openssl + fi + + for i in $PHP_OPENSSL; do +if test -r $i/include/openssl/evp.h; then + OPENSSL_INCDIR=$i/include +fi +if test -r $i/lib/libssl.a -o -r $i/lib/libssl.$SHLIB_SUFFIX_NAME; then + OPENSSL_LIBDIR=$i/lib +fi + done + + if test -z $OPENSSL_INCDIR; then +AC_MSG_ERROR([Cannot find OpenSSL's evp.h]) + fi + + if test -z $OPENSSL_LIBDIR; then +AC_MSG_ERROR([Cannot find OpenSSL's libraries]) + fi + + old_CPPFLAGS=$CPPFLAGS + CPPFLAGS=-I$OPENSSL_INCDIR + AC_MSG_CHECKING([for OpenSSL version]) + AC_EGREP_CPP(yes,[ +#include openssl/opensslv.h +#if OPENSSL_VERSION_NUMBER = 0x0090600fL + yes +#endif + ],[ +AC_MSG_RESULT([= 0.9.6]) + ],[ +AC_MSG_ERROR([OpenSSL version 0.9.6 or greater required.]) + ]) + CPPFLAGS=$old_CPPFLAGS + + PHP_CHECK_LIBRARY(crypto, CRYPTO_free, [ +PHP_CHECK_LIBRARY(ssl, SSL_CTX_set_ssl_version, [ + found_openssl=yes +], [ + AC_MSG_ERROR([libssl not found!]) +],[ + -L$OPENSSL_LIBDIR +]) + ], [ +AC_MSG_ERROR([libcrypto not found!]) + ],[ +-L$OPENSSL_LIBDIR + ]) + + OPENSSL_INCDIR_OPT=-I$OPENSSL_INCDIR + AC_SUBST(OPENSSL_INCDIR_OPT) + + if test $found_openssl = yes; then +if test -n $OPENSSL_INCDIR test -n $OPENSSL_LIBDIR; then + PHP_ADD_INCLUDE($OPENSSL_INCDIR) + PHP_ADD_LIBPATH($OPENSSL_LIBDIR, $1) + PHP_ADD_LIBRARY(crypto,,$1) + PHP_ADD_LIBRARY(ssl,, $1) +fi +$2 +ifelse([$3],[],,[else $3]) + fi ]) dnl Index: php-src/configure.in diff -u php-src/configure.in:1.448 php-src/configure.in:1.449 --- php-src/configure.in:1.448 Mon Jun 23 12:06:37 2003 +++ php-src/configure.inTue Jun 24 10:05:24 2003 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.448 2003/06/23 16:06:37 wez Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.449 2003/06/24 14:05:24 sniper Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -731,18 +731,6 @@ if test $PHP_IPV6 != no test $ac_cv_ipv6_support = yes; then AC_DEFINE(HAVE_IPV6,1,[Whether to enable IPv6 support]) -fi - - -dnl -dnl OpenSSL configure -dnl -PHP_ARG_WITH(openssl,for OpenSSL support, -[ --with-openssl[=DIR]Include OpenSSL support (requires OpenSSL =
[PHP-CVS] cvs: php-src /ext/bz2 .cvsignore
sniper Tue Jun 24 10:09:24 2003 EDT Added files: /php-src/ext/bz2.cvsignore Log: added missing .cvsignore file Index: php-src/ext/bz2/.cvsignore +++ php-src/ext/bz2/.cvsignore *.lo *.la deps *.plg *.opt *.ncb *.dsw Release Release_inline Debug Release_TS Release_TSDbg Release_TS_inline Debug_TS Release_TS_SSL Debug_TS_SSL -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main fopen_wrappers.c
iliaa Tue Jun 24 10:36:01 2003 EDT
Modified files:
/php-src/main fopen_wrappers.c
Log:
Fixed typo.
Index: php-src/main/fopen_wrappers.c
diff -u php-src/main/fopen_wrappers.c:1.163 php-src/main/fopen_wrappers.c:1.164
--- php-src/main/fopen_wrappers.c:1.163 Tue Jun 24 09:56:25 2003
+++ php-src/main/fopen_wrappers.c Tue Jun 24 10:36:01 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: fopen_wrappers.c,v 1.163 2003/06/24 13:56:25 iliaa Exp $ */
+/* $Id: fopen_wrappers.c,v 1.164 2003/06/24 14:36:01 iliaa Exp $ */
/* {{{ includes
*/
@@ -164,7 +164,7 @@
PHPAPI int php_check_open_basedir(const char *path TSRMLS_DC)
{
- return php_check_open_basedir_ex(path, 1 TSRMLS_DC);
+ return php_check_open_basedir_ex(path, 1 TSRMLS_CC);
}
/* {{{ php_check_open_basedir
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /main fopen_wrappers.c
iliaa Tue Jun 24 10:36:18 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/main fopen_wrappers.c
Log:
MFH: typo fix.
Index: php-src/main/fopen_wrappers.c
diff -u php-src/main/fopen_wrappers.c:1.153.2.4 php-src/main/fopen_wrappers.c:1.153.2.5
--- php-src/main/fopen_wrappers.c:1.153.2.4 Tue Jun 24 09:44:56 2003
+++ php-src/main/fopen_wrappers.c Tue Jun 24 10:36:18 2003
@@ -16,7 +16,7 @@
| Jim Winstead [EMAIL PROTECTED] |
+--+
*/
-/* $Id: fopen_wrappers.c,v 1.153.2.4 2003/06/24 13:44:56 iliaa Exp $ */
+/* $Id: fopen_wrappers.c,v 1.153.2.5 2003/06/24 14:36:18 iliaa Exp $ */
/* {{{ includes
*/
@@ -165,7 +165,7 @@
PHPAPI int php_check_open_basedir(const char *path TSRMLS_DC)
{
- return php_check_open_basedir_ex(path, 1 TSRMLS_DC);
+ return php_check_open_basedir_ex(path, 1 TSRMLS_CC);
}
/* {{{ php_check_open_basedir
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / bundle-release
sniper Tue Jun 24 11:22:13 2003 EDT Removed files: /php-srcbundle-release Log: remove totally useless, incomplete, badly named, etc. script. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard base64.c /ext/standard/tests/strings bug24312.phpt
iliaa Tue Jun 24 11:23:17 2003 EDT
Added files:
/php-src/ext/standard/tests/strings bug24312.phpt
Modified files:
/php-src/ext/standard base64.c
Log:
Fixed bug #24312 (base64_decode() does not skip 0xF0-0xFF characters)
Patch by: gereon.steffens[at]onvista.de
Index: php-src/ext/standard/base64.c
diff -u php-src/ext/standard/base64.c:1.39 php-src/ext/standard/base64.c:1.40
--- php-src/ext/standard/base64.c:1.39 Tue Jun 10 16:03:37 2003
+++ php-src/ext/standard/base64.c Tue Jun 24 11:23:17 2003
@@ -15,7 +15,7 @@
| Author: Jim Winstead [EMAIL PROTECTED] |
+--+
*/
-/* $Id: base64.c,v 1.39 2003/06/10 20:03:37 imajes Exp $ */
+/* $Id: base64.c,v 1.40 2003/06/24 15:23:17 iliaa Exp $ */
#include string.h
@@ -42,6 +42,7 @@
15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, -1, -1, -1,
-1, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
Index: php-src/ext/standard/tests/strings/bug24312.phpt
+++ php-src/ext/standard/tests/strings/bug24312.phpt
--TEST--
Bug #24208 (base64_decode() not skipping 0xF0 - 0xFF)
--FILE--
?php
$data = str_repeat(a, 100);
for ($i = 0xF0; $i 0xFF + 1; $i++) {
$enc = chunk_split(base64_encode($data), 10, chr($i));
var_dump(base64_decode($enc));
}
?
--EXPECT--
string(100)
string(100)
string(100)
string(100)
string(100)
string(100)
string(100)
string(100)
string(100)
string(100)
string(100)
string(100)
string(100)
string(100)
string(100)
string(100)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) / NEWS /ext/standard base64.c /ext/standard/tests/strings bug24312.phpt
iliaa Tue Jun 24 11:26:10 2003 EDT
Added files: (Branch: PHP_4_3)
/php-src/ext/standard/tests/strings bug24312.phpt
Modified files:
/php-src/ext/standard base64.c
/php-srcNEWS
Log:
MFH: Fixed bug #24312 (base64_decode() does not skip 0xF0-0xFF characters)
Index: php-src/ext/standard/base64.c
diff -u php-src/ext/standard/base64.c:1.33.4.3 php-src/ext/standard/base64.c:1.33.4.4
--- php-src/ext/standard/base64.c:1.33.4.3 Wed Jun 4 10:42:04 2003
+++ php-src/ext/standard/base64.c Tue Jun 24 11:26:10 2003
@@ -15,7 +15,7 @@
| Author: Jim Winstead [EMAIL PROTECTED] |
+--+
*/
-/* $Id: base64.c,v 1.33.4.3 2003/06/04 14:42:04 moriyoshi Exp $ */
+/* $Id: base64.c,v 1.33.4.4 2003/06/24 15:26:10 iliaa Exp $ */
#include string.h
@@ -42,6 +42,7 @@
15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, -1, -1, -1,
-1, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.265 php-src/NEWS:1.1247.2.266
--- php-src/NEWS:1.1247.2.265 Tue Jun 24 09:44:57 2003
+++ php-src/NEWSTue Jun 24 11:26:10 2003
@@ -2,6 +2,8 @@
|||
26 Jun 2003, Version 4.3.3RC2
+- Fixed bug #24312 (base64_decode() does not skip 0xF0-0xFF characters).
+ (gereon.steffens[at]onvista.de, Ilia)
- Fixed bug #24313 (file_exist() warning on non-existent files
when open_basedir is used). (Ilia)
- Fixed bug #24284 (Fixed memory leak inside pg_ping()). (Ilia)
Index: php-src/ext/standard/tests/strings/bug24312.phpt
+++ php-src/ext/standard/tests/strings/bug24312.phpt
--TEST--
Bug #24208 (base64_decode() not skipping 0xF0 - 0xFF)
--FILE--
?php
$data = str_repeat(a, 100);
for ($i = 0xF0; $i 0xFF + 1; $i++) {
$enc = chunk_split(base64_encode($data), 10, chr($i));
var_dump(base64_decode($enc));
}
?
--EXPECT--
string(100)
string(100)
string(100)
string(100)
string(100)
string(100)
string(100)
string(100)
string(100)
string(100)
string(100)
string(100)
string(100)
string(100)
string(100)
string(100)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / acinclude.m4
sniper Tue Jun 24 12:39:52 2003 EDT Modified files: /php-srcacinclude.m4 Log: Fix configure failure with static openssl libs Index: php-src/acinclude.m4 diff -u php-src/acinclude.m4:1.247 php-src/acinclude.m4:1.248 --- php-src/acinclude.m4:1.247 Tue Jun 24 10:05:24 2003 +++ php-src/acinclude.m4Tue Jun 24 12:39:52 2003 @@ -1,4 +1,4 @@ -dnl $Id: acinclude.m4,v 1.247 2003/06/24 14:05:24 sniper Exp $ +dnl $Id: acinclude.m4,v 1.248 2003/06/24 16:39:52 sniper Exp $ dnl dnl This file contains local autoconf functions. @@ -1616,7 +1616,7 @@ ], [ AC_MSG_ERROR([libssl not found!]) ],[ - -L$OPENSSL_LIBDIR + -L$OPENSSL_LIBDIR -lcrypto ]) ], [ AC_MSG_ERROR([libcrypto not found!]) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) / NEWS
sniper Tue Jun 24 14:00:13 2003 EDT Modified files: (Branch: PHP_4_3) /php-srcNEWS Log: BFN Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.266 php-src/NEWS:1.1247.2.267 --- php-src/NEWS:1.1247.2.266 Tue Jun 24 11:26:10 2003 +++ php-src/NEWSTue Jun 24 14:00:13 2003 @@ -1,12 +1,12 @@ PHP 4 NEWS ||| - 26 Jun 2003, Version 4.3.3RC2 - Fixed bug #24312 (base64_decode() does not skip 0xF0-0xFF characters). (gereon.steffens[at]onvista.de, Ilia) - Fixed bug #24313 (file_exist() warning on non-existent files when open_basedir is used). (Ilia) - Fixed bug #24284 (Fixed memory leak inside pg_ping()). (Ilia) +- Fixed bug #24028 (Reading raw post message by php://input failed). (Jani) 19 Jun 2003, Version 4.3.3RC1 - Synchronized bundled GD library with GD 2.0.15. (Ilia) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5) /ext/sqlite config.m4
sterlingTue Jun 24 19:30:19 2003 EDT Modified files: (Branch: PHP_5) /php-src/ext/sqlite config.m4 Log: Enable sqlite by default Index: php-src/ext/sqlite/config.m4 diff -u php-src/ext/sqlite/config.m4:1.15 php-src/ext/sqlite/config.m4:1.15.4.1 --- php-src/ext/sqlite/config.m4:1.15 Fri Jun 6 18:44:56 2003 +++ php-src/ext/sqlite/config.m4Tue Jun 24 19:30:19 2003 @@ -1,9 +1,9 @@ -dnl $Id: config.m4,v 1.15 2003/06/06 22:44:56 wez Exp $ +dnl $Id: config.m4,v 1.15.4.1 2003/06/24 23:30:19 sterling Exp $ dnl config.m4 for extension sqlite dnl vim:et:ts=2:sw=2 PHP_ARG_WITH(sqlite, for sqlite support, -[ --with-sqlite Include sqlite support]) +[ --with-sqlite Include sqlite support], yes) if test $PHP_SQLITE != no; then -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5) /ext/dom config.m4
sterlingTue Jun 24 20:05:47 2003 EDT Modified files: (Branch: PHP_5) /php-src/ext/domconfig.m4 Log: --with-dom now that the old dom extension is in pecl Index: php-src/ext/dom/config.m4 diff -u php-src/ext/dom/config.m4:1.3 php-src/ext/dom/config.m4:1.3.2.1 --- php-src/ext/dom/config.m4:1.3 Sat Jun 14 09:35:09 2003 +++ php-src/ext/dom/config.m4 Tue Jun 24 20:05:47 2003 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.3 2003/06/14 13:35:09 helly Exp $ +dnl $Id: config.m4,v 1.3.2.1 2003/06/25 00:05:47 sterling Exp $ dnl AC_DEFUN(PHP_DOM_CHECK_VERSION,[ @@ -19,8 +19,8 @@ CPPFLAGS=$old_CPPFLAGS ]) -PHP_ARG_WITH(dom5, for new DOM support, -[ --with-dom5[=DIR] Include new DOM support (requires libxml = 2.4.14). +PHP_ARG_WITH(dom, for new DOM support, +[ --with-dom[=DIR] Include new DOM support (requires libxml = 2.4.14). DIR is the libxml install directory.]) if test -z $PHP_ZLIB_DIR; then -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/dom config.m4
sterlingTue Jun 24 20:17:41 2003 EDT Modified files: /php-src/ext/domconfig.m4 Log: can now be --with-dom, as the old domxml is now in pecl Index: php-src/ext/dom/config.m4 diff -u php-src/ext/dom/config.m4:1.3 php-src/ext/dom/config.m4:1.4 --- php-src/ext/dom/config.m4:1.3 Sat Jun 14 09:35:09 2003 +++ php-src/ext/dom/config.m4 Tue Jun 24 20:17:41 2003 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.3 2003/06/14 13:35:09 helly Exp $ +dnl $Id: config.m4,v 1.4 2003/06/25 00:17:41 sterling Exp $ dnl AC_DEFUN(PHP_DOM_CHECK_VERSION,[ @@ -19,8 +19,8 @@ CPPFLAGS=$old_CPPFLAGS ]) -PHP_ARG_WITH(dom5, for new DOM support, -[ --with-dom5[=DIR] Include new DOM support (requires libxml = 2.4.14). +PHP_ARG_WITH(dom, for new DOM support, +[ --with-dom[=DIR] Include new DOM support (requires libxml = 2.4.14). DIR is the libxml install directory.]) if test -z $PHP_ZLIB_DIR; then -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/sqlite config.m4
sterlingTue Jun 24 20:18:01 2003 EDT Modified files: /php-src/ext/sqlite config.m4 Log: enable sqlite by default Index: php-src/ext/sqlite/config.m4 diff -u php-src/ext/sqlite/config.m4:1.15 php-src/ext/sqlite/config.m4:1.16 --- php-src/ext/sqlite/config.m4:1.15 Fri Jun 6 18:44:56 2003 +++ php-src/ext/sqlite/config.m4Tue Jun 24 20:18:01 2003 @@ -1,9 +1,9 @@ -dnl $Id: config.m4,v 1.15 2003/06/06 22:44:56 wez Exp $ +dnl $Id: config.m4,v 1.16 2003/06/25 00:18:01 sterling Exp $ dnl config.m4 for extension sqlite dnl vim:et:ts=2:sw=2 PHP_ARG_WITH(sqlite, for sqlite support, -[ --with-sqlite Include sqlite support]) +[ --with-sqlite Include sqlite support], yes) if test $PHP_SQLITE != no; then -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/rpc .cvsignore CREDITS EXPERIMENTAL RPC_HOWTO handler.h hash.h php_rpc.h rpc.c rpc.h rpc_proxy.c rpc_proxy.h /ext/rpc/com .cvsignore CREDITS TODO com.c com.dsp com.h com_wrapper.c com_wrapper.h conversion.c conversion.h dispatch.c php_com.h variant.c variant.h /ext/rpc/dotnet .cvsignore CREDITS EXPERIMENTAL README dotnet.cpp dotnet.dsp dotnet.php php_dotnet.h /ext/rpc/java .cvsignore CREDITS EXPERIMENTAL Makefile.frag README config.m4 except.php java.c java.dsp jawt.php jver.php reflect.java /ext/rpc/skeleton php_skeleton.h skeleton.c skeleton.h /ext/rpc/tests test1.php test2.php test3.php test4.php tests.php /ext/rpc/xmlrpc .cvsignore CREDITS EXPERIMENTAL config.m4 php_xmlrpc.h xmlrpc-epi-php.c xmlrpc.dsp /ext/rpc/xmlrpc/libxmlrpc .cvsignore README acinclude.m4 base64.c base64.h encodings.c encodings.h queue.c queue.h simplestring.c simplestring.h system_methods.c system_methods_private.h xml_element.c xml_element.h xml_to_dandarpc.c xml_to_dandarpc.h xml_to_soap.c xml_to_soap.h xml_to_xmlrpc.c xml_to_xmlrpc.h xmlrpc.c xmlrpc.h xmlrpc.m4 xmlrpc_introspection.c xmlrpc_introspection.h xmlrpc_introspection_private.h xmlrpc_private.h xmlrpc_win32.h
sterlingTue Jun 24 20:28:10 2003 EDT Removed files: /php-src/ext/rpc.cvsignore CREDITS EXPERIMENTAL RPC_HOWTO handler.h hash.h php_rpc.h rpc.c rpc.h rpc_proxy.c rpc_proxy.h /php-src/ext/rpc/com.cvsignore CREDITS TODO com.c com.dsp com.h com_wrapper.c com_wrapper.h conversion.c conversion.h dispatch.c php_com.h variant.c variant.h /php-src/ext/rpc/dotnet .cvsignore CREDITS EXPERIMENTAL README dotnet.cpp dotnet.dsp dotnet.php php_dotnet.h /php-src/ext/rpc/java .cvsignore CREDITS EXPERIMENTAL Makefile.frag README config.m4 except.php java.c java.dsp jawt.php jver.php reflect.java /php-src/ext/rpc/skeleton php_skeleton.h skeleton.c skeleton.h /php-src/ext/rpc/tests test1.php test2.php test3.php test4.php tests.php /php-src/ext/rpc/xmlrpc .cvsignore CREDITS EXPERIMENTAL config.m4 php_xmlrpc.h xmlrpc-epi-php.c xmlrpc.dsp /php-src/ext/rpc/xmlrpc/libxmlrpc .cvsignore README acinclude.m4 base64.c base64.h encodings.c encodings.h queue.c queue.h simplestring.c simplestring.h system_methods.c system_methods_private.h xml_element.c xml_element.h xml_to_dandarpc.c xml_to_dandarpc.h xml_to_soap.c xml_to_soap.h xml_to_xmlrpc.c xml_to_xmlrpc.h xmlrpc.c xmlrpc.h xmlrpc.m4 xmlrpc_introspection.c xmlrpc_introspection.h xmlrpc_introspection_private.h xmlrpc_private.h xmlrpc_win32.h Log: moved to pecl by sascha. remove them from head. discussed with harald, will remain in pecl till he has some more time to work on it. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
sterlingTue Jun 24 20:32:11 2003 EDT Modified files: /php-srcNEWS Log: add some NEWS stuff. Add your stuff now! Index: php-src/NEWS diff -u php-src/NEWS:1.1426 php-src/NEWS:1.1427 --- php-src/NEWS:1.1426 Mon Jun 16 15:58:24 2003 +++ php-src/NEWSTue Jun 24 20:32:11 2003 @@ -2,12 +2,25 @@ ||| ? ? ??? 200?, Version 5.0.0 -## Note the changed grouping. Try add your entries to appropriate places -## to enhance the readability of this file. Using @ is discouraged. -## (This file will be cleaned up before release.) +? ? ??? 2003, PHP 5 Beta 1 -- Moved extensions to PECL (http://pear.php.net/): (James, Tal) - . ext/fribidi +- The SQLite (http://www.hwaci.com/sw/sqlite/) extension is now bundled and + enabled by default. (Wez, Marcus, Tal) + +- Improved the speed of internal functions that use callbacks by 40% due to a + new internal fast_call_user_function() function. (Sterling) + +- Completely Overhauled XML support + . Brand new simplexml extension (Sterling) + . New DOM extension (Rob, Chregu, Marcus) + . New XSL extension (Chregu, Rob) + . Moved the old DOM-XML and XSLT extensions to PECL (James, Sterling) + . ext/xml can now use both libxml2 and expat to parse XML (Sterling) + . Removed bundled expat (Jani) + +- Due to a license change, we are longer bundling the MySQL client library. + If you previously relied on this library in your own product, make sure to + check with MySQL AB for the new licensing terms. (Sterling) - New php.ini options: . session.hash_function and session.hash_bits_per_character. (Sascha) @@ -86,7 +99,6 @@ (Ilia) - Added optional parameter to file() which makes the result array not contain the line endings and to skip empty lines. (Ilia) - - Added new range() functionality: (Ilia) . Support for float modifier. . Detection of numeric values inside strings passed as high low. @@ -100,7 +112,6 @@ - Added context options 'method', 'header' and 'content' for http://; fopen wrapper. (Sara) - Added input filter support. See README.input_filter for more info. (Rasmus) - - Fixed is_executable() to be available also on Windows. (Shane) - Fixed dirname() and strip_tags() to be binary-safe. (Moriyoshi) - Fixed bug #24098 (crash in pathinfo()). (Ilia) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / NEWS
+- Due to a license change, we are longer bundling the MySQL client library. This is BS. The bundled mysql 3 client library was NOT removed for licensing reasons. The bundled code was in the public domain. And for the record, the MySQL 3 client library (as available from mysql.com) is still under the LGPL. + If you previously relied on this library in your own product, make sure to + check with MySQL AB for the new licensing terms. (Sterling) I did not know we were in the advertising business. - Sascha -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mysql config.m4
sniper Tue Jun 24 23:53:17 2003 EDT Modified files: /php-src/ext/mysql config.m4 Log: clean up a bit. Index: php-src/ext/mysql/config.m4 diff -u php-src/ext/mysql/config.m4:1.56 php-src/ext/mysql/config.m4:1.57 --- php-src/ext/mysql/config.m4:1.56Sun Jun 22 21:10:58 2003 +++ php-src/ext/mysql/config.m4 Tue Jun 24 23:53:17 2003 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.56 2003/06/23 01:10:58 sterling Exp $ +dnl $Id: config.m4,v 1.57 2003/06/25 03:53:17 sniper Exp $ dnl AC_DEFUN(MYSQL_LIB_CHK, [ @@ -39,8 +39,7 @@ PHP_ARG_WITH(mysql, for MySQL support, -[ --with-mysql[=DIR] Include MySQL support. DIR is the MySQL base directory. - If unspecified, the bundled MySQL library will be used.]) +[ --with-mysql[=DIR] Include MySQL support. DIR is the MySQL base directory.]) PHP_ARG_WITH(mysql-sock, for specified location of the MySQL UNIX socket, [ --with-mysql-sock[=DIR] MySQL: Location of the MySQL unix socket pointer. @@ -55,7 +54,7 @@ if test $PHP_MYSQL != no; then AC_DEFINE(HAVE_MYSQL, 1, [Whether you have MySQL]) - AC_MSG_CHECKING(for MySQL UNIX socket location) + AC_MSG_CHECKING([for MySQL UNIX socket location]) if test $PHP_MYSQL_SOCK != no test $PHP_MYSQL_SOCK != yes; then MYSQL_SOCK=$PHP_MYSQL_SOCK AC_DEFINE_UNQUOTED(MYSQL_UNIX_ADDR, $MYSQL_SOCK, [ ]) @@ -65,21 +64,21 @@ else AC_MSG_RESULT([no]) fi -fi -if test $PHP_MYSQL != no; then - for i in /usr /usr/local $PHP_MYSQL; do + for i in $PHP_MYSQL /usr/local /usr; do if test -r $i/include/mysql/mysql.h; then MYSQL_DIR=$i MYSQL_INC_DIR=$i/include/mysql + break elif test -r $i/include/mysql.h; then MYSQL_DIR=$i MYSQL_INC_DIR=$i/include + break fi done if test -z $MYSQL_DIR; then -AC_MSG_ERROR(Cannot find MySQL header files under $PHP_MYSQL) +AC_MSG_ERROR([Cannot find MySQL header files under $PHP_MYSQL]) fi for i in lib lib/mysql; do @@ -87,7 +86,7 @@ done if test -z $MYSQL_LIB_DIR; then -AC_MSG_ERROR(Cannot find mysqlclient library under $MYSQL_DIR) +AC_MSG_ERROR([Cannot find libmysqlclient under $MYSQL_DIR]) fi PHP_CHECK_LIBRARY(mysqlclient, mysql_close, [ ], @@ -117,4 +116,13 @@ PHP_ADD_INCLUDE($MYSQL_INC_DIR) PHP_NEW_EXTENSION(mysql, php_mysql.c, $ext_shared) + + MYSQL_MODULE_TYPE=external + MYSQL_LIBS=-L$MYSQL_LIB_DIR -lmysqlclient $MYSQL_LIBS + MYSQL_INCLUDE=-I$MYSQL_INC_DIR + + PHP_SUBST(MYSQL_SHARED_LIBADD) + PHP_SUBST_OLD(MYSQL_MODULE_TYPE) + PHP_SUBST_OLD(MYSQL_LIBS) + PHP_SUBST_OLD(MYSQL_INCLUDE) fi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
sterlingWed Jun 25 00:39:01 2003 EDT Modified files: /php-srcNEWS Log: add zend engine 2 changes. Index: php-src/NEWS diff -u php-src/NEWS:1.1428 php-src/NEWS:1.1429 --- php-src/NEWS:1.1428 Tue Jun 24 20:56:29 2003 +++ php-src/NEWSWed Jun 25 00:39:00 2003 @@ -4,6 +4,10 @@ ? ? ??? 2003, PHP 5 Beta 1 +- Switch to using Zend Engine 2, which includes numerous engine level + improvements. A full list is available at + http://www.php.net/zend-engine-2.php. + - The SQLite (http://www.hwaci.com/sw/sqlite/) extension is now bundled and enabled by default. (Wez, Marcus, Tal) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main config.w32.h
sebastian Wed Jun 25 01:01:50 2003 EDT Modified files: /php-src/main config.w32.h Log: Disable MySQL extension by default. Index: php-src/main/config.w32.h diff -u php-src/main/config.w32.h:1.70 php-src/main/config.w32.h:1.71 --- php-src/main/config.w32.h:1.70 Wed Jun 25 00:54:23 2003 +++ php-src/main/config.w32.h Wed Jun 25 01:01:50 2003 @@ -2,7 +2,7 @@ Build Configuration for Win32. This has only been tested with MS VisualC++ 6 (and later). - $Id: config.w32.h,v 1.70 2003/06/25 04:54:23 sebastian Exp $ + $Id: config.w32.h,v 1.71 2003/06/25 05:01:50 sebastian Exp $ */ /* Default PHP / PEAR directories */ @@ -47,8 +47,8 @@ /* #define HAVE_MBSTR_RU 0 */ /* #define HAVE_MBSTR_TW 0 */ -/* Enable / Disable MySQL extension (default: enabled) */ -#define HAVE_MYSQL 1 +/* Enable / Disable MySQL extension (default: disabled) */ +#define HAVE_MYSQL 0 /* Enable / Disable ODBC extension (default: enabled) */ #define HAVE_UODBC 1 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
sterlingWed Jun 25 01:28:22 2003 EDT Modified files: /CVSROOTavail Log: give alan k access to php5, pecl Index: CVSROOT/avail diff -u CVSROOT/avail:1.696 CVSROOT/avail:1.697 --- CVSROOT/avail:1.696 Mon Jun 23 23:40:16 2003 +++ CVSROOT/avail Wed Jun 25 01:28:21 2003 @@ -17,7 +17,7 @@ # The PHP Developers have full access to the full source trees for # PHP and PEAR, as well as the documentation. -avail|rrichards,tal,mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabob,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,sniper,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,raphael,danda,rbb,mboeren,dougm,mlwmohawk,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,ianh,k.schroeder,dcowgill,jerenkrantz,jay,ddhill,jorton|phpfi,php3,php-src,phpdoc,pecl,pear,peardoc,spl,ZendAPI,phpdoc-ar,phpdoc-cs,phpdoc-de,phpdoc-es,phpdoc-fi,phpdoc-fr,phpdoc-he,phpdoc-hk,phpdoc-hu,phpdoc-it,phpdoc-ja,phpdoc-kr,phpdoc-lt,phpdoc-nl,phpdoc-pl,phpdoc-pt_BR,phpdoc-ro,phpdoc-ru,phpdoc-sk,phpdoc-sl,phpdoc-sv,phpdoc-tr,phpdoc-tw,phpdoc-zh,phpdoc-el +avail|alan_k,rrichards,tal,mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabob,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,sniper,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,raphael,danda,rbb,mboeren,dougm,mlwmohawk,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,ianh,k.schroeder,dcowgill,jerenkrantz,jay,ddhill,jorton|phpfi,php3,php-src,phpdoc,pecl,pear,peardoc,spl,ZendAPI,phpdoc-ar,phpdoc-cs,phpdoc-de,phpdoc-es,phpdoc-fi,phpdoc-fr,phpdoc-he,phpdoc-hk,phpdoc-hu,phpdoc-it,phpdoc-ja,phpdoc-kr,phpdoc-lt,phpdoc-nl,phpdoc-pl,phpdoc-pt_BR,phpdoc-ro,phpdoc-ru,phpdoc-sk,phpdoc-sl,phpdoc-sv,phpdoc-tr,phpdoc-tw,phpdoc-zh,phpdoc-el # People who work on the Engine -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
