[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Tue Jun 21 01:31:28 2005 EDT Modified files: /ZendEngine2ChangeLog Log: ChangeLog update http://cvs.php.net/diff.php/ZendEngine2/ChangeLog?r1=1.716r2=1.717ty=u Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.716 ZendEngine2/ChangeLog:1.717 --- ZendEngine2/ChangeLog:1.716 Mon Jun 20 01:36:33 2005 +++ ZendEngine2/ChangeLog Tue Jun 21 01:31:27 2005 @@ -1,3 +1,28 @@ +2005-06-20 Andi Gutmans [EMAIL PROTECTED] + +* zend.h: + - Back to -dev + +* (php_5_1_0b2) + zend.h: + - Beta 2 + +2005-06-20 Dmitry Stogov [EMAIL PROTECTED] + +* (php_5_1_0b2) + zend_object_handlers.c + zend_object_handlers.c: + Fixed possible crash on $x = $obj-$non_string + +2005-06-20 Marcus Boerger [EMAIL PROTECTED] + +* (php_5_1_0b2) + zend_reflection_api.c: + - Fix bug #33389 by fixing copying + +* zend_reflection_api.c: + - Show true/flase + 2005-06-19 Derick Rethans [EMAIL PROTECTED] * tests/bug32226.phpt: @@ -8750,7 +8775,7 @@ 2003-06-10 Jani Taskinen [EMAIL PROTECTED] * zend_multiply.h: - - Missing $Id: ChangeLog,v 1.716 2005/06/20 05:36:33 changelog Exp $ tag + - Missing $Id: ChangeLog,v 1.717 2005/06/21 05:31:27 changelog Exp $ tag 2003-06-10 James Cox [EMAIL PROTECTED] @@ -10474,7 +10499,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.716 2005/06/20 05:36:33 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.717 2005/06/21 05:31:27 changelog Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky [EMAIL PROTECTED]
[PHP-CVS] cvs: php-src /main main.c
sniper Mon Jun 20 03:04:08 2005 EDT Modified files: /php-src/main main.c Log: - No extra spaces before #ifndef http://cvs.php.net/diff.php/php-src/main/main.c?r1=1.632r2=1.633ty=u Index: php-src/main/main.c diff -u php-src/main/main.c:1.632 php-src/main/main.c:1.633 --- php-src/main/main.c:1.632 Fri Jun 17 05:39:21 2005 +++ php-src/main/main.c Mon Jun 20 03:04:07 2005 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: main.c,v 1.632 2005/06/17 09:39:21 dmitry Exp $ */ +/* $Id: main.c,v 1.633 2005/06/20 07:04:07 sniper Exp $ */ /* {{{ includes */ @@ -1010,7 +1010,7 @@ /* {{{ php_request_startup */ - #ifndef APACHE_HOOKS +#ifndef APACHE_HOOKS int php_request_startup(TSRMLS_D) { int retval = SUCCESS; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/date/lib/resource README
derick Mon Jun 20 04:39:47 2005 EDT Modified files: /php-src/ext/date/lib/resource README Log: - Update README, we require 0.9.8 now. http://cvs.php.net/diff.php/php-src/ext/date/lib/resource/README?r1=1.1r2=1.2ty=u Index: php-src/ext/date/lib/resource/README diff -u php-src/ext/date/lib/resource/README:1.1 php-src/ext/date/lib/resource/README:1.2 --- php-src/ext/date/lib/resource/README:1.1Tue Jun 14 17:32:27 2005 +++ php-src/ext/date/lib/resource/READMEMon Jun 20 04:39:45 2005 @@ -1,5 +1,5 @@ Regenerating Parser === -Make sure you use re2c 0.97 or higher: +Make sure you use re2c 0.9.8dev or higher: /dat/dev/sf/re2c/re2c -d -b parse_date.re ../parse_date.c -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS /ext/date/tests bug21399.phpt bug26694.phpt bug28088.phpt bug29150.phpt bug29595.phpt
derick Mon Jun 20 04:47:56 2005 EDT Added files: /php-src/ext/date/tests bug21399.phpt bug26694.phpt bug28088.phpt bug29150.phpt bug29595.phpt Modified files: /php-srcNEWS Log: - Update news with implemented FRs and added test for those FRs. http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1938r2=1.1939ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1938 php-src/NEWS:1.1939 --- php-src/NEWS:1.1938 Mon Jun 20 03:59:24 2005 +++ php-src/NEWSMon Jun 20 04:47:51 2005 @@ -4,7 +4,9 @@ - Improved PHP extension loading mechanism with support for module dependencies and conflicts. (Jani, Dmitry) - Allowed return by reference from internal functions. (Marcus, Andi, Dmitry) -- Rewrote strtotime() with support for timezones and many new formats. (Derick) +- Rewrote strtotime() with support for timezones and many new formats. + Implements feature requests #21399, #26694, #28088, #29150, #29585 and + #29595. (Derick) - Added bindto socket context option. (Ilia) - Added offset parameter to the stream_copy_to_stream() function. (Ilia) - Added offset length parameters to substr_count() function. (Ilia) http://cvs.php.net/co.php/php-src/ext/date/tests/bug21399.phpt?r=1.1p=1 Index: php-src/ext/date/tests/bug21399.phpt +++ php-src/ext/date/tests/bug21399.phpt --TEST-- Bug #21399 (strtotime() request for MMDDhhmmss [ZZZ]) --FILE-- ?php putenv(TZ=GMT); echo gmdate(Y-m-d H:i:s, strtotime(20050620091407 GMT)); ? --EXPECT-- 2005-06-20 09:14:07 http://cvs.php.net/co.php/php-src/ext/date/tests/bug26694.phpt?r=1.1p=1 Index: php-src/ext/date/tests/bug26694.phpt +++ php-src/ext/date/tests/bug26694.phpt --TEST-- Bug #26694 (strtotime() request for Sun, 21 Dec 2003 20:38:33 + GMT) --FILE-- ?php putenv(TZ=GMT); echo gmdate(Y-m-d H:i:s, strtotime(Sun, 21 Dec 2003 20:38:33 + GMT)); ? --EXPECT-- 2003-12-21 20:38:33 http://cvs.php.net/co.php/php-src/ext/date/tests/bug28088.phpt?r=1.1p=1 Index: php-src/ext/date/tests/bug28088.phpt +++ php-src/ext/date/tests/bug28088.phpt --TEST-- Bug #28088 (strtotime() cannot convert 00 hours) --FILE-- ?php putenv(TZ=GMT); echo The following line rightly shows the correct date time:\n; echo gmdate(m/d/y Hi, strtotime(04/04/04 2345)), \n; echo But the following line fails to show the correct date time:\n; echo gmdate(m/d/y Hi, strtotime(04/04/04 0045)).\r\n; ? --EXPECT-- The following line rightly shows the correct date time: 04/04/04 2345 But the following line fails to show the correct date time: 04/04/04 0045 http://cvs.php.net/co.php/php-src/ext/date/tests/bug29150.phpt?r=1.1p=1 Index: php-src/ext/date/tests/bug29150.phpt +++ php-src/ext/date/tests/bug29150.phpt --TEST-- Bug #29150 (Roman number format for months) --FILE-- ?php putenv(TZ=GMT); echo gmdate(Y-m-d H:i:s, strtotime(20 VI. 2005)); ? --EXPECT-- 2005-06-20 00:00:00 http://cvs.php.net/co.php/php-src/ext/date/tests/bug29595.phpt?r=1.1p=1 Index: php-src/ext/date/tests/bug29595.phpt +++ php-src/ext/date/tests/bug29595.phpt --TEST-- Bug #29595 (Roman number format for months) --FILE-- ?php $from_postgres = '2004-08-09 14:48:27.304809+10'; echo strtotime($from_postgres); ? --EXPECT-- 1092026907 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/date/lib timelib.m4
sniper Mon Jun 20 07:01:11 2005 EDT Modified files: /php-src/ext/date/lib timelib.m4 Log: - Added AC_TIMELIB_C_BIGENDIAN # No need to add it to config.m4, it's run in PHP configure.in already. # Only added here so that the standalone configure.in (to be added later) # can use it. http://cvs.php.net/diff.php/php-src/ext/date/lib/timelib.m4?r1=1.1r2=1.2ty=u Index: php-src/ext/date/lib/timelib.m4 diff -u php-src/ext/date/lib/timelib.m4:1.1 php-src/ext/date/lib/timelib.m4:1.2 --- php-src/ext/date/lib/timelib.m4:1.1 Thu Jun 16 19:12:10 2005 +++ php-src/ext/date/lib/timelib.m4 Mon Jun 20 07:01:07 2005 @@ -1,5 +1,5 @@ dnl -dnl $Id: timelib.m4,v 1.1 2005/06/16 23:12:10 sniper Exp $ +dnl $Id: timelib.m4,v 1.2 2005/06/20 11:01:07 sniper Exp $ dnl dnl dnl TL_DEF_HAVE(what [, why]) @@ -33,6 +33,34 @@ fi ])dnl +dnl +dnl AC_TIMELIB_C_BIGENDIAN +dnl Replacement macro for AC_C_BIGENDIAN +dnl +AC_DEFUN([AC_TIMELIB_C_BIGENDIAN], +[AC_CACHE_CHECK([whether byte ordering is bigendian], ac_cv_c_bigendian_php, + [ + ac_cv_c_bigendian_php=unknown + AC_TRY_RUN( + [ +int main(void) +{ +short one = 1; +char *cp = (char *)one; + +if (*cp == 0) { +return(0); +} else { +return(1); +} +} + ], [ac_cv_c_bigendian_php=yes], [ac_cv_c_bigendian_php=no], [ac_cv_c_bigendian_php=unknown]) + ]) + if test $ac_cv_c_bigendian_php = yes; then + AC_DEFINE(WORDS_BIGENDIAN, [], [Define if processor uses big-endian word]) + fi +])dnl + dnl Check for types, sizes, etc. needed by timelib AC_CHECK_SIZEOF(long, 8) AC_CHECK_SIZEOF(int, 4) -- 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 /sapi/cli config.m4
sniper Mon Jun 20 07:06:55 2005 EDT Modified files: /php-srcconfigure.in acinclude.m4 /php-src/sapi/cli config.m4 Log: Some netware related build issues fixed (patch by: Kamesh Jayachandran kameshj at fastmail dot fm http://cvs.php.net/diff.php/php-src/configure.in?r1=1.563r2=1.564ty=u Index: php-src/configure.in diff -u php-src/configure.in:1.563 php-src/configure.in:1.564 --- php-src/configure.in:1.563 Sat Jun 11 13:03:41 2005 +++ php-src/configure.inMon Jun 20 07:06:53 2005 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.563 2005/06/11 17:03:41 andi Exp $ -*- autoconf -*- +dnl ## $Id: configure.in,v 1.564 2005/06/20 11:06:53 sniper Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -183,7 +183,11 @@ AC_DEFINE_UNQUOTED(PHP_OS,$PHP_OS,[hardcode for each of the cross compiler host]) AC_DEFINE_UNQUOTED(PHP_UNAME,$PHP_UNAME,[hardcode for each of the cross compiler host]) PHP_BUILD_PROGRAM -PHP_ADD_SOURCES(win32, sendmail.c, -I$CFLAGS,php) +PHP_ADD_SOURCES(/main, internal_functions.c,,PHP_GLOBAL_OBJS) +PHP_ADD_SOURCES(win32, sendmail.c, -I$CFLAGS, PHP_GLOBAL_OBJS) +PHP5LIB_SHARED_LIBADD=\$\(EXTRA_LIBS\) +PHP_SUBST(PHP5LIB_SHARED_LIBADD) +PHP_SHARED_MODULE(php5lib, PHP_GLOBAL_OBJS, netware) ;; esac @@ -1217,7 +1221,16 @@ plain_wrapper.c userspace.c transports.c xp_socket.c mmap.c) PHP_ADD_SOURCES(/main, internal_functions.c,, sapi) -PHP_ADD_SOURCES(/main, internal_functions_cli.c,, cli) + +case $host_alias in +*netware*) + PHP_ADD_BUILD_DIR(win32) + PHP_ADD_BUILD_DIR(netware) + ;; +*) + PHP_ADD_SOURCES(/main, internal_functions_cli.c,, cli) + ;; +esac PHP_ADD_SOURCES(/Zend, zend_language_parser.c zend_language_scanner.c \ zend_ini_parser.c zend_ini_scanner.c) http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.320r2=1.321ty=u Index: php-src/acinclude.m4 diff -u php-src/acinclude.m4:1.320 php-src/acinclude.m4:1.321 --- php-src/acinclude.m4:1.320 Sun Jun 19 20:20:45 2005 +++ php-src/acinclude.m4Mon Jun 20 07:06:53 2005 @@ -1,5 +1,5 @@ dnl -dnl $Id: acinclude.m4,v 1.320 2005/06/20 00:20:45 sniper Exp $ +dnl $Id: acinclude.m4,v 1.321 2005/06/20 11:06:53 sniper Exp $ dnl dnl This file contains local autoconf functions. dnl @@ -950,6 +950,11 @@ if test $3 = shared || test $3 = yes; then dnl -- Shared module PHP_ADD_SOURCES_X(PHP_EXT_DIR($1),$2,$ac_extra,shared_objects_$1,yes) + case $host_alias in + *netware*) +PHP_ADD_LIBRARY_WITH_PATH(php5lib, netware, translit($1,a-z_-,A-Z__)_SHARED_LIBADD) + ;; + esac PHP_SHARED_MODULE($1,shared_objects_$1, $ext_builddir, $6) AC_DEFINE_UNQUOTED([COMPILE_DL_]translit($1,a-z_-,A-Z__), 1, Whether to build $1 as dynamic module) fi http://cvs.php.net/diff.php/php-src/sapi/cli/config.m4?r1=1.20r2=1.21ty=u Index: php-src/sapi/cli/config.m4 diff -u php-src/sapi/cli/config.m4:1.20 php-src/sapi/cli/config.m4:1.21 --- php-src/sapi/cli/config.m4:1.20 Sun May 29 19:16:46 2005 +++ php-src/sapi/cli/config.m4 Mon Jun 20 07:06:54 2005 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.20 2005/05/29 23:16:46 sniper Exp $ +dnl $Id: config.m4,v 1.21 2005/06/20 11:06:54 sniper Exp $ dnl AC_MSG_CHECKING(for CLI build) @@ -22,6 +22,9 @@ *darwin*) BUILD_CLI=\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_CLI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH) ;; + *netware*) +BUILD_CLI=\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -Lnetware -lphp5lib -o \$(SAPI_CLI_PATH) +;; *) BUILD_CLI=\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH) ;; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/date/lib parse_tz.c
derick Mon Jun 20 07:07:54 2005 EDT Modified files: /php-src/ext/date/lib parse_tz.c Log: - Make this work on big endian systems too. - Added an additional malloc() check. http://cvs.php.net/diff.php/php-src/ext/date/lib/parse_tz.c?r1=1.12r2=1.13ty=u Index: php-src/ext/date/lib/parse_tz.c diff -u php-src/ext/date/lib/parse_tz.c:1.12 php-src/ext/date/lib/parse_tz.c:1.13 --- php-src/ext/date/lib/parse_tz.c:1.12Sat Jun 18 15:23:58 2005 +++ php-src/ext/date/lib/parse_tz.c Mon Jun 20 07:07:53 2005 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: parse_tz.c,v 1.12 2005/06/18 19:23:58 derick Exp $ */ +/* $Id: parse_tz.c,v 1.13 2005/06/20 11:07:53 derick Exp $ */ #include timelib_config.h @@ -31,7 +31,11 @@ #include timelib.h #include timezonedb.h +#ifdef WORDS_BIGENDIAN +#define timelib_conv_int(l) (l) +#else #define timelib_conv_int(l) ((l 0x00ff) 24) + ((l 0xff00) 8) + ((l 0x00ff) 8) + ((l 0xff00) 24) +#endif static void read_header(char **tzf, timelib_tzinfo *tz) { @@ -90,6 +94,9 @@ *tzf += sizeof(unsigned char) * 6 * tz-typecnt; tz-type = (ttinfo*) malloc(tz-typecnt * sizeof(struct ttinfo)); + if (!tz-type) { + return; + } for (i = 0; i tz-typecnt; i++) { j = i * 6; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/date TODO
derick Mon Jun 20 07:08:29 2005 EDT Modified files: /php-src/ext/date TODO Log: - Update TODO. http://cvs.php.net/diff.php/php-src/ext/date/TODO?r1=1.6r2=1.7ty=u Index: php-src/ext/date/TODO diff -u php-src/ext/date/TODO:1.6 php-src/ext/date/TODO:1.7 --- php-src/ext/date/TODO:1.6 Sun Jun 19 18:15:25 2005 +++ php-src/ext/date/TODO Mon Jun 20 07:08:28 2005 @@ -1,4 +1,6 @@ - Port over my 200 test cases to .phpt format. - Write an error handler for unexpected characters while parsing dates. -- Move all date/time related functions from ext/standard to ext/date -- Move all date/time related tests from ext/standard/tests to ext/data/tests +- Cache lookups for timezone information. +- Change tz structure lookup to use binary search. +- Move all date/time related functions from ext/standard to ext/date. +- Move all date/time related tests from ext/standard/tests to ext/data/tests. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard proc_open.c
sniper Mon Jun 20 07:10:13 2005 EDT Modified files: /php-src/ext/standard proc_open.c Log: typo http://cvs.php.net/diff.php/php-src/ext/standard/proc_open.c?r1=1.33r2=1.34ty=u Index: php-src/ext/standard/proc_open.c diff -u php-src/ext/standard/proc_open.c:1.33 php-src/ext/standard/proc_open.c:1.34 --- php-src/ext/standard/proc_open.c:1.33 Thu Apr 7 19:07:45 2005 +++ php-src/ext/standard/proc_open.cMon Jun 20 07:10:11 2005 @@ -15,7 +15,7 @@ | Author: Wez Furlong [EMAIL PROTECTED] | +--+ */ -/* $Id: proc_open.c,v 1.33 2005/04/07 23:07:45 iliaa Exp $ */ +/* $Id: proc_open.c,v 1.34 2005/06/20 11:10:11 sniper Exp $ */ #if 0 (defined(__linux__) || defined(sun) || defined(__IRIX__)) # define _BSD_SOURCE /* linux wants this when XOPEN mode is on */ @@ -697,7 +697,7 @@ descriptors[ndesc].parentend = dup(dev_ptmx); descriptors[ndesc].mode_flags = O_RDWR; #else - php_error_docref(NULL TSRMLS_CC, E_WARNING, pty pseudo terminal is not support on this system); + php_error_docref(NULL TSRMLS_CC, E_WARNING, pty pseudo terminal not supported on this system); goto exit_fail; #endif } else { -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) / acinclude.m4 configure.in /sapi/cli config.m4
sniper Mon Jun 20 07:48:26 2005 EDT Modified files: (Branch: PHP_5_0) /php-srcacinclude.m4 configure.in /php-src/sapi/cli config.m4 Log: MFH http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.271.2.17r2=1.271.2.18ty=u Index: php-src/acinclude.m4 diff -u php-src/acinclude.m4:1.271.2.17 php-src/acinclude.m4:1.271.2.18 --- php-src/acinclude.m4:1.271.2.17 Sat Apr 30 05:29:44 2005 +++ php-src/acinclude.m4Mon Jun 20 07:48:22 2005 @@ -1,4 +1,4 @@ -dnl $Id: acinclude.m4,v 1.271.2.17 2005/04/30 09:29:44 sniper Exp $ -*- autoconf -*- +dnl $Id: acinclude.m4,v 1.271.2.18 2005/06/20 11:48:22 sniper Exp $ -*- autoconf -*- dnl dnl This file contains local autoconf functions. @@ -1274,6 +1274,11 @@ if test $3 = shared || test $3 = yes; then dnl -- Shared module PHP_ADD_SOURCES_X(PHP_EXT_DIR($1),$2,$ac_extra,shared_objects_$1,yes) + case $host_alias in + *netware*) +PHP_ADD_LIBRARY_WITH_PATH(php5lib, netware, translit($1,a-z_-,A-Z__)_SHARED_LIBADD) + ;; + esac PHP_SHARED_MODULE($1,shared_objects_$1, $ext_builddir, $6) AC_DEFINE_UNQUOTED([COMPILE_DL_]translit($1,a-z_-,A-Z__), 1, Whether to build $1 as dynamic module) fi http://cvs.php.net/diff.php/php-src/configure.in?r1=1.514.2.53r2=1.514.2.54ty=u Index: php-src/configure.in diff -u php-src/configure.in:1.514.2.53 php-src/configure.in:1.514.2.54 --- php-src/configure.in:1.514.2.53 Tue Jun 7 13:22:55 2005 +++ php-src/configure.inMon Jun 20 07:48:23 2005 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.514.2.53 2005/06/07 17:22:55 sniper Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.514.2.54 2005/06/20 11:48:23 sniper Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -220,7 +220,11 @@ AC_DEFINE_UNQUOTED(PHP_OS,$PHP_OS,[hardcode for each of the cross compiler host]) AC_DEFINE_UNQUOTED(PHP_UNAME,$PHP_UNAME,[hardcode for each of the cross compiler host]) PHP_BUILD_PROGRAM -PHP_ADD_SOURCES(win32, sendmail.c, -I$CFLAGS,php) +PHP_ADD_SOURCES(/main, internal_functions.c,,PHP_GLOBAL_OBJS) +PHP_ADD_SOURCES(win32, sendmail.c, -I$CFLAGS, PHP_GLOBAL_OBJS) +PHP5LIB_SHARED_LIBADD=\$\(EXTRA_LIBS\) +PHP_SUBST(PHP5LIB_SHARED_LIBADD) +PHP_SHARED_MODULE(php5lib, PHP_GLOBAL_OBJS, netware) ;; esac @@ -1279,7 +1283,16 @@ plain_wrapper.c userspace.c transports.c xp_socket.c mmap.c) PHP_ADD_SOURCES(/main, internal_functions.c,, sapi) -PHP_ADD_SOURCES(/main, internal_functions_cli.c,, cli) + +case $host_alias in +*netware*) + PHP_ADD_BUILD_DIR(win32) + PHP_ADD_BUILD_DIR(netware) + ;; +*) + PHP_ADD_SOURCES(/main, internal_functions_cli.c,, cli) + ;; +esac PHP_ADD_SOURCES(/Zend, zend_language_parser.c zend_language_scanner.c \ zend_ini_parser.c zend_ini_scanner.c) http://cvs.php.net/diff.php/php-src/sapi/cli/config.m4?r1=1.18.2.1r2=1.18.2.2ty=u Index: php-src/sapi/cli/config.m4 diff -u php-src/sapi/cli/config.m4:1.18.2.1 php-src/sapi/cli/config.m4:1.18.2.2 --- php-src/sapi/cli/config.m4:1.18.2.1 Thu Apr 21 11:13:16 2005 +++ php-src/sapi/cli/config.m4 Mon Jun 20 07:48:25 2005 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.18.2.1 2005/04/21 15:13:16 sniper Exp $ +dnl $Id: config.m4,v 1.18.2.2 2005/06/20 11:48:25 sniper Exp $ dnl AC_MSG_CHECKING(for CLI build) @@ -22,6 +22,9 @@ *darwin*) BUILD_CLI=\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_CLI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH) ;; + *netware*) +BUILD_CLI=\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -Lnetware -lphp5lib -o \$(SAPI_CLI_PATH) +;; *) BUILD_CLI=\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH) ;; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS /sapi/apache mod_php5.c /sapi/apache2filter sapi_apache2.c /sapi/apache2handler sapi_apache2.c /sapi/apache_hooks mod_php5.c
tony2001Mon Jun 20 08:46:35 2005 EDT Modified files: /php-srcNEWS /php-src/sapi/apachemod_php5.c /php-src/sapi/apache2filter sapi_apache2.c /php-src/sapi/apache2handlersapi_apache2.c /php-src/sapi/apache_hooks mod_php5.c Log: fix #29683 (headers_list() returns empty array) http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1939r2=1.1940ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1939 php-src/NEWS:1.1940 --- php-src/NEWS:1.1939 Mon Jun 20 04:47:51 2005 +++ php-src/NEWSMon Jun 20 08:46:32 2005 @@ -34,6 +34,7 @@ PHP). (Marcus) - Fixed bug #31256 (PHP_EVAL_LIBLINE configure macro does not handle -pthread). (Jani) +- Fixed bug #29683 (headers_list() returns empty array). (Tony) - Fixed bug #28355 (glob wont error if dir is not readable). (Hartmut) - Fixed bugs #20382, #28024, #30532, #32086, #32270, #32555, #32588, #33056 (strtotime() related bugs). (Derick) http://cvs.php.net/diff.php/php-src/sapi/apache/mod_php5.c?r1=1.15r2=1.16ty=u Index: php-src/sapi/apache/mod_php5.c diff -u php-src/sapi/apache/mod_php5.c:1.15 php-src/sapi/apache/mod_php5.c:1.16 --- php-src/sapi/apache/mod_php5.c:1.15 Thu May 19 11:57:45 2005 +++ php-src/sapi/apache/mod_php5.c Mon Jun 20 08:46:34 2005 @@ -17,7 +17,7 @@ | PHP 4.0 patches by Zeev Suraski [EMAIL PROTECTED] | +--+ */ -/* $Id: mod_php5.c,v 1.15 2005/05/19 15:57:45 rasmus Exp $ */ +/* $Id: mod_php5.c,v 1.16 2005/06/20 12:46:34 tony2001 Exp $ */ #include php_apache_http.h #include http_conf_globals.h @@ -199,9 +199,7 @@ *p = ':'; /* a well behaved header handler shouldn't change its original arguments */ - efree(sapi_header-header); - - return 0; /* don't use the default SAPI mechanism, Apache duplicates this functionality */ + return SAPI_HEADER_ADD; } /* }}} */ http://cvs.php.net/diff.php/php-src/sapi/apache2filter/sapi_apache2.c?r1=1.134r2=1.135ty=u Index: php-src/sapi/apache2filter/sapi_apache2.c diff -u php-src/sapi/apache2filter/sapi_apache2.c:1.134 php-src/sapi/apache2filter/sapi_apache2.c:1.135 --- php-src/sapi/apache2filter/sapi_apache2.c:1.134 Fri Apr 8 16:32:13 2005 +++ php-src/sapi/apache2filter/sapi_apache2.c Mon Jun 20 08:46:34 2005 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: sapi_apache2.c,v 1.134 2005/04/08 20:32:13 sniper Exp $ */ +/* $Id: sapi_apache2.c,v 1.135 2005/06/20 12:46:34 tony2001 Exp $ */ #include fcntl.h @@ -128,9 +128,7 @@ else apr_table_add(ctx-r-headers_out, sapi_header-header, val); - sapi_free_header(sapi_header); - - return 0; + return SAPI_HEADER_ADD; } static int http://cvs.php.net/diff.php/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.54r2=1.55ty=u Index: php-src/sapi/apache2handler/sapi_apache2.c diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.54 php-src/sapi/apache2handler/sapi_apache2.c:1.55 --- php-src/sapi/apache2handler/sapi_apache2.c:1.54 Fri Apr 8 16:32:14 2005 +++ php-src/sapi/apache2handler/sapi_apache2.c Mon Jun 20 08:46:34 2005 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: sapi_apache2.c,v 1.54 2005/04/08 20:32:14 sniper Exp $ */ +/* $Id: sapi_apache2.c,v 1.55 2005/06/20 12:46:34 tony2001 Exp $ */ #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS @@ -112,9 +112,7 @@ apr_table_add(ctx-r-headers_out, sapi_header-header, val); } - sapi_free_header(sapi_header); - - return 0; + return SAPI_HEADER_ADD; } static int http://cvs.php.net/diff.php/php-src/sapi/apache_hooks/mod_php5.c?r1=1.9r2=1.10ty=u Index: php-src/sapi/apache_hooks/mod_php5.c diff -u php-src/sapi/apache_hooks/mod_php5.c:1.9 php-src/sapi/apache_hooks/mod_php5.c:1.10 --- php-src/sapi/apache_hooks/mod_php5.c:1.9Tue Apr 19 07:41:04 2005 +++ php-src/sapi/apache_hooks/mod_php5.cMon Jun 20 08:46:34 2005 @@ -17,7 +17,7 @@ | PHP 4.0 patches by Zeev Suraski [EMAIL PROTECTED] | +--+ */ -/* $Id: mod_php5.c,v 1.9 2005/04/19 11:41:04 sniper Exp $ */ +/* $Id: mod_php5.c,v 1.10 2005/06/20 12:46:34 tony2001 Exp $ */ #include php_apache_http.h @@ -340,9 +340,7 @@ *p = ':'; /* a well behaved header handler shouldn't change its original arguments */ - efree(sapi_header-header); - - return 0; /* don't use the default SAPI mechanism, Apache duplicates this functionality */ + return SAPI_HEADER_ADD; } /* }}} */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) / NEWS /sapi/apache mod_php5.c /sapi/apache2filter sapi_apache2.c /sapi/apache2handler sapi_apache2.c /sapi/apache_hooks mod_php5.c
tony2001Mon Jun 20 08:46:52 2005 EDT Modified files: (Branch: PHP_5_0) /php-srcNEWS /php-src/sapi/apachemod_php5.c /php-src/sapi/apache2filter sapi_apache2.c /php-src/sapi/apache2handlersapi_apache2.c /php-src/sapi/apache_hooks mod_php5.c Log: MFH: fix #29683 (headers_list() returns empty array) http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.435r2=1.1760.2.436ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1760.2.435 php-src/NEWS:1.1760.2.436 --- php-src/NEWS:1.1760.2.435 Fri Jun 17 12:37:07 2005 +++ php-src/NEWSMon Jun 20 08:46:51 2005 @@ -156,6 +156,7 @@ handler). (Tony) - Fixed bug #29971 (variables_order behaviour). (Dmitry) - Fixed bug #29944 (Function defined in switch, crashes). (Dmitry) +- Fixed bug #29683 (headers_list() returns empty array). (Tony) - Fixed bug #29583 (crash when echoing a COM object). (M.Sisolak, Wez) - Fixed bug #29338 (unencoded spaces get ignored after certain tags). (Ilia) - Fixed bug #29210 (Function: is_callable - no support for private and http://cvs.php.net/diff.php/php-src/sapi/apache/mod_php5.c?r1=1.10.2.1r2=1.10.2.2ty=u Index: php-src/sapi/apache/mod_php5.c diff -u php-src/sapi/apache/mod_php5.c:1.10.2.1 php-src/sapi/apache/mod_php5.c:1.10.2.2 --- php-src/sapi/apache/mod_php5.c:1.10.2.1 Thu May 19 12:06:38 2005 +++ php-src/sapi/apache/mod_php5.c Mon Jun 20 08:46:52 2005 @@ -17,7 +17,7 @@ | PHP 4.0 patches by Zeev Suraski [EMAIL PROTECTED] | +--+ */ -/* $Id: mod_php5.c,v 1.10.2.1 2005/05/19 16:06:38 rasmus Exp $ */ +/* $Id: mod_php5.c,v 1.10.2.2 2005/06/20 12:46:52 tony2001 Exp $ */ #include php_apache_http.h #include http_conf_globals.h @@ -199,9 +199,7 @@ *p = ':'; /* a well behaved header handler shouldn't change its original arguments */ - efree(sapi_header-header); - - return 0; /* don't use the default SAPI mechanism, Apache duplicates this functionality */ + return SAPI_HEADER_ADD; } /* }}} */ http://cvs.php.net/diff.php/php-src/sapi/apache2filter/sapi_apache2.c?r1=1.125.2.3r2=1.125.2.4ty=u Index: php-src/sapi/apache2filter/sapi_apache2.c diff -u php-src/sapi/apache2filter/sapi_apache2.c:1.125.2.3 php-src/sapi/apache2filter/sapi_apache2.c:1.125.2.4 --- php-src/sapi/apache2filter/sapi_apache2.c:1.125.2.3 Mon Apr 11 11:39:21 2005 +++ php-src/sapi/apache2filter/sapi_apache2.c Mon Jun 20 08:46:52 2005 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: sapi_apache2.c,v 1.125.2.3 2005/04/11 15:39:21 sniper Exp $ */ +/* $Id: sapi_apache2.c,v 1.125.2.4 2005/06/20 12:46:52 tony2001 Exp $ */ #include fcntl.h @@ -128,9 +128,7 @@ else apr_table_add(ctx-r-headers_out, sapi_header-header, val); - sapi_free_header(sapi_header); - - return 0; + return SAPI_HEADER_ADD; } static int http://cvs.php.net/diff.php/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.40.2.8r2=1.40.2.9ty=u Index: php-src/sapi/apache2handler/sapi_apache2.c diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.40.2.8 php-src/sapi/apache2handler/sapi_apache2.c:1.40.2.9 --- php-src/sapi/apache2handler/sapi_apache2.c:1.40.2.8 Fri Apr 8 16:34:03 2005 +++ php-src/sapi/apache2handler/sapi_apache2.c Mon Jun 20 08:46:52 2005 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: sapi_apache2.c,v 1.40.2.8 2005/04/08 20:34:03 sniper Exp $ */ +/* $Id: sapi_apache2.c,v 1.40.2.9 2005/06/20 12:46:52 tony2001 Exp $ */ #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS @@ -112,9 +112,7 @@ apr_table_add(ctx-r-headers_out, sapi_header-header, val); } - sapi_free_header(sapi_header); - - return 0; + return SAPI_HEADER_ADD; } static int http://cvs.php.net/diff.php/php-src/sapi/apache_hooks/mod_php5.c?r1=1.4.2.1r2=1.4.2.2ty=u Index: php-src/sapi/apache_hooks/mod_php5.c diff -u php-src/sapi/apache_hooks/mod_php5.c:1.4.2.1 php-src/sapi/apache_hooks/mod_php5.c:1.4.2.2 --- php-src/sapi/apache_hooks/mod_php5.c:1.4.2.1Fri Apr 22 05:14:29 2005 +++ php-src/sapi/apache_hooks/mod_php5.cMon Jun 20 08:46:52 2005 @@ -17,7 +17,7 @@ | PHP 4.0 patches by Zeev Suraski [EMAIL PROTECTED] | +--+ */ -/* $Id: mod_php5.c,v 1.4.2.1 2005/04/22 09:14:29 tony2001 Exp $ */ +/* $Id: mod_php5.c,v 1.4.2.2 2005/06/20 12:46:52 tony2001 Exp $ */ #include php_apache_http.h @@ -340,9 +340,7 @@ *p = ':'; /* a well behaved header handler shouldn't change its original arguments */ - efree(sapi_header-header); - - return 0; /* don't use the default SAPI mechanism, Apache duplicates this functionality */
[PHP-CVS] cvs: php-src /ext/session mod_files.sh
sniper Mon Jun 20 09:37:33 2005 EDT Modified files: /php-src/ext/sessionmod_files.sh Log: - Added session.hash_bits_per_character support. (3rd param) (Changes by: waltzer at autumnweave dot com) http://cvs.php.net/diff.php/php-src/ext/session/mod_files.sh?r1=1.1r2=1.2ty=u Index: php-src/ext/session/mod_files.sh diff -u php-src/ext/session/mod_files.sh:1.1 php-src/ext/session/mod_files.sh:1.2 --- php-src/ext/session/mod_files.sh:1.1Sun Aug 22 10:14:46 1999 +++ php-src/ext/session/mod_files.shMon Jun 20 09:37:32 2005 @@ -9,8 +9,16 @@ exit 0 fi -for i in a b c d e f 0 1 2 3 4 5 6 7 8 9; do +hash_chars=0 1 2 3 4 5 6 7 8 9 a b c d e f +if test $3 -a $3 -ge 5; then + hash_chars=$hash_chars g h i j k l m n o p q r s t u v + if test $3 -eq 6; then +hash_chars=$hash_chars w x y z A B C D E F G H I J K L M N O P Q R S T U V W X Y Z - , + fi +fi + +for i in $hash_chars; do newpath=$1/$i mkdir $newpath || exit 1 - sh $0 $newpath `expr $2 - 1` + sh $0 $newpath `expr $2 - 1 $3` done -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) /ext/mysql config.m4
sniper Mon Jun 20 09:46:03 2005 EDT Modified files: (Branch: PHP_5_0) /php-src/ext/mysql config.m4 Log: MFH: netware fixes http://cvs.php.net/diff.php/php-src/ext/mysql/config.m4?r1=1.61.2.2r2=1.61.2.3ty=u Index: php-src/ext/mysql/config.m4 diff -u php-src/ext/mysql/config.m4:1.61.2.2 php-src/ext/mysql/config.m4:1.61.2.3 --- php-src/ext/mysql/config.m4:1.61.2.2Thu May 19 10:23:07 2005 +++ php-src/ext/mysql/config.m4 Mon Jun 20 09:46:02 2005 @@ -1,9 +1,9 @@ dnl -dnl $Id: config.m4,v 1.61.2.2 2005/05/19 14:23:07 gschlossnagle Exp $ +dnl $Id: config.m4,v 1.61.2.3 2005/06/20 13:46:02 sniper Exp $ dnl AC_DEFUN([MYSQL_LIB_CHK], [ - str=$MYSQL_DIR/$1/libmysqlclient.* + str=$MYSQL_DIR/$1/lib$MY_LIBNAME.* for j in `echo $str`; do if test -r $j; then MYSQL_LIB_DIR=$MYSQL_DIR/$1 @@ -83,6 +83,13 @@ Note that the MySQL client library is not bundled anymore.]) fi + MY_LIBNAME=mysqlclient + case $host_alias in +*netware*[)] + MY_LIBNAME=mysql + ;; + esac + for i in lib lib/mysql lib64 lib64/mysql; do MYSQL_LIB_CHK($i) done @@ -92,11 +99,11 @@ Note that the MySQL client library is not bundled anymore.]) fi - PHP_CHECK_LIBRARY(mysqlclient, mysql_close, [ ], + PHP_CHECK_LIBRARY($MY_LIBNAME, mysql_close, [ ], [ if test $PHP_ZLIB_DIR != no; then PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR, MYSQL_SHARED_LIBADD) - PHP_CHECK_LIBRARY(mysqlclient, mysql_error, [], [ + PHP_CHECK_LIBRARY($MY_LIBNAME, mysql_error, [], [ AC_MSG_ERROR([mysql configure failed. Please check config.log for more information.]) ], [ -L$PHP_ZLIB_DIR/lib -L$MYSQL_LIB_DIR @@ -104,7 +111,7 @@ MYSQL_LIBS=-L$PHP_ZLIB_DIR/lib -lz else PHP_ADD_LIBRARY(z,, MYSQL_SHARED_LIBADD) - PHP_CHECK_LIBRARY(mysqlclient, mysql_errno, [], [ + PHP_CHECK_LIBRARY($MY_LIBNAME, mysql_errno, [], [ AC_MSG_ERROR([Try adding --with-zlib-dir=DIR. Please check config.log for more information.]) ], [ -L$MYSQL_LIB_DIR @@ -115,13 +122,13 @@ -L$MYSQL_LIB_DIR ]) - PHP_ADD_LIBRARY_WITH_PATH(mysqlclient, $MYSQL_LIB_DIR, MYSQL_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH($MY_LIBNAME, $MYSQL_LIB_DIR, MYSQL_SHARED_LIBADD) 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_LIBS=-L$MYSQL_LIB_DIR -l$MY_LIBNAME $MYSQL_LIBS MYSQL_INCLUDE=-I$MYSQL_INC_DIR PHP_SUBST(MYSQL_SHARED_LIBADD) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS /main/streams plain_wrapper.c
iliaa Mon Jun 20 11:59:19 2005 EDT Modified files: /php-src/main/streams plain_wrapper.c /php-srcNEWS Log: Fixed bug #31054 (safe_mode open_basedir checks only check first include_path value). http://cvs.php.net/diff.php/php-src/main/streams/plain_wrapper.c?r1=1.46r2=1.47ty=u Index: php-src/main/streams/plain_wrapper.c diff -u php-src/main/streams/plain_wrapper.c:1.46 php-src/main/streams/plain_wrapper.c:1.47 --- php-src/main/streams/plain_wrapper.c:1.46 Tue May 24 06:13:52 2005 +++ php-src/main/streams/plain_wrapper.cMon Jun 20 11:59:12 2005 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: plain_wrapper.c,v 1.46 2005/05/24 10:13:52 tony2001 Exp $ */ +/* $Id: plain_wrapper.c,v 1.47 2005/06/20 15:59:12 iliaa Exp $ */ #include php.h #include php_globals.h @@ -1297,24 +1297,24 @@ end++; } snprintf(trypath, MAXPATHLEN, %s/%s, ptr, filename); - - if (((options STREAM_DISABLE_OPEN_BASEDIR) == 0) php_check_open_basedir(trypath TSRMLS_CC)) { - stream = NULL; - goto stream_done; + + if (((options STREAM_DISABLE_OPEN_BASEDIR) == 0) php_check_open_basedir_ex(trypath, 0 TSRMLS_CC)) { + ptr = end; + continue; } if (PG(safe_mode)) { if (VCWD_STAT(trypath, sb) == 0) { /* file exists ... check permission */ if ((php_check_safe_mode_include_dir(trypath TSRMLS_CC) == 0) || - php_checkuid(trypath, mode, CHECKUID_CHECK_MODE_PARAM)) { + php_checkuid_ex(trypath, mode, CHECKUID_CHECK_MODE_PARAM, CHECKUID_NO_ERRORS)) { /* UID ok, or trypath is in safe_mode_include_dir */ stream = php_stream_fopen_rel(trypath, mode, opened_path, options); - } else { - stream = NULL; + goto stream_done; } - goto stream_done; } + ptr = end; + continue; } stream = php_stream_fopen_rel(trypath, mode, opened_path, options); if (stream) { http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1940r2=1.1941ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1940 php-src/NEWS:1.1941 --- php-src/NEWS:1.1940 Mon Jun 20 08:46:32 2005 +++ php-src/NEWSMon Jun 20 11:59:13 2005 @@ -34,6 +34,8 @@ PHP). (Marcus) - Fixed bug #31256 (PHP_EVAL_LIBLINE configure macro does not handle -pthread). (Jani) +- Fixed bug #31054 (safe_mode open_basedir checks only check first + include_path value). (Ilia) - Fixed bug #29683 (headers_list() returns empty array). (Tony) - Fixed bug #28355 (glob wont error if dir is not readable). (Hartmut) - Fixed bugs #20382, #28024, #30532, #32086, #32270, #32555, #32588, #33056 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main main.c
tony2001Mon Jun 20 15:58:56 2005 EDT Modified files: /php-src/main main.c Log: reorder and prevent memleak: bailout after free() http://cvs.php.net/diff.php/php-src/main/main.c?r1=1.633r2=1.634ty=u Index: php-src/main/main.c diff -u php-src/main/main.c:1.633 php-src/main/main.c:1.634 --- php-src/main/main.c:1.633 Mon Jun 20 03:04:07 2005 +++ php-src/main/main.c Mon Jun 20 15:58:51 2005 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: main.c,v 1.633 2005/06/20 07:04:07 sniper Exp $ */ +/* $Id: main.c,v 1.634 2005/06/20 19:58:51 tony2001 Exp $ */ /* {{{ includes */ @@ -775,8 +775,8 @@ /* restore memory limit */ AG(memory_limit) = PG(memory_limit); #endif - zend_bailout(); efree(buffer); + zend_bailout(); return; } break; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) /main main.c
tony2001Mon Jun 20 15:59:21 2005 EDT Modified files: (Branch: PHP_5_0) /php-src/main main.c Log: MFH: reorder and prevent memleak: bailout after free() http://cvs.php.net/diff.php/php-src/main/main.c?r1=1.604.2.17r2=1.604.2.18ty=u Index: php-src/main/main.c diff -u php-src/main/main.c:1.604.2.17 php-src/main/main.c:1.604.2.18 --- php-src/main/main.c:1.604.2.17 Sat May 21 14:26:27 2005 +++ php-src/main/main.c Mon Jun 20 15:59:21 2005 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: main.c,v 1.604.2.17 2005/05/21 18:26:27 rasmus Exp $ */ +/* $Id: main.c,v 1.604.2.18 2005/06/20 19:59:21 tony2001 Exp $ */ /* {{{ includes */ @@ -778,8 +778,8 @@ /* restore memory limit */ AG(memory_limit) = PG(memory_limit); #endif - zend_bailout(); efree(buffer); + zend_bailout(); return; } break; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_4) /main main.c
tony2001Mon Jun 20 15:59:43 2005 EDT Modified files: (Branch: PHP_4_4) /php-src/main main.c Log: MFH: reorder and prevent memleak: bailout after free() http://cvs.php.net/diff.php/php-src/main/main.c?r1=1.512.2.63r2=1.512.2.63.2.1ty=u Index: php-src/main/main.c diff -u php-src/main/main.c:1.512.2.63 php-src/main/main.c:1.512.2.63.2.1 --- php-src/main/main.c:1.512.2.63 Mon May 16 04:55:31 2005 +++ php-src/main/main.c Mon Jun 20 15:59:43 2005 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: main.c,v 1.512.2.63 2005/05/16 08:55:31 tony2001 Exp $ */ +/* $Id: main.c,v 1.512.2.63.2.1 2005/06/20 19:59:43 tony2001 Exp $ */ /* {{{ includes */ @@ -702,8 +702,8 @@ /* restore memory limit */ AG(memory_limit) = PG(memory_limit); #endif - zend_bailout(); efree(buffer); + zend_bailout(); return; } break; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS configure.in /main php_version.h ZendEngine2 zend.h
andiMon Jun 20 16:49:56 2005 EDT Modified files: /php-srcNEWS configure.in /ZendEngine2zend.h /php-src/main php_version.h Log: - Beta 2 http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1941r2=1.1942ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1941 php-src/NEWS:1.1942 --- php-src/NEWS:1.1941 Mon Jun 20 11:59:13 2005 +++ php-src/NEWSMon Jun 20 16:49:52 2005 @@ -1,6 +1,6 @@ PHPNEWS ||| -?? Jun 2005, PHP 5.1 Beta 2 +20 Jun 2005, PHP 5.1 Beta 2 - Improved PHP extension loading mechanism with support for module dependencies and conflicts. (Jani, Dmitry) - Allowed return by reference from internal functions. (Marcus, Andi, Dmitry) http://cvs.php.net/diff.php/php-src/configure.in?r1=1.564r2=1.565ty=u Index: php-src/configure.in diff -u php-src/configure.in:1.564 php-src/configure.in:1.565 --- php-src/configure.in:1.564 Mon Jun 20 07:06:53 2005 +++ php-src/configure.inMon Jun 20 16:49:52 2005 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.564 2005/06/20 11:06:53 sniper Exp $ -*- autoconf -*- +dnl ## $Id: configure.in,v 1.565 2005/06/20 20:49:52 andi Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -42,7 +42,7 @@ MAJOR_VERSION=5 MINOR_VERSION=1 RELEASE_VERSION=0 -EXTRA_VERSION=-dev +EXTRA_VERSION=b2 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION dnl Define where extension directories are located in the configure context http://cvs.php.net/diff.php/ZendEngine2/zend.h?r1=1.281r2=1.282ty=u Index: ZendEngine2/zend.h diff -u ZendEngine2/zend.h:1.281 ZendEngine2/zend.h:1.282 --- ZendEngine2/zend.h:1.281Thu Jun 16 10:52:43 2005 +++ ZendEngine2/zend.h Mon Jun 20 16:49:55 2005 @@ -17,12 +17,12 @@ +--+ */ -/* $Id: zend.h,v 1.281 2005/06/16 14:52:43 dmitry Exp $ */ +/* $Id: zend.h,v 1.282 2005/06/20 20:49:55 andi Exp $ */ #ifndef ZEND_H #define ZEND_H -#define ZEND_VERSION 2.1.0-dev +#define ZEND_VERSION 2.1.0b2 #define ZEND_ENGINE_2 http://cvs.php.net/diff.php/php-src/main/php_version.h?r1=1.102r2=1.103ty=u Index: php-src/main/php_version.h diff -u php-src/main/php_version.h:1.102 php-src/main/php_version.h:1.103 --- php-src/main/php_version.h:1.102Sat Jun 11 13:03:42 2005 +++ php-src/main/php_version.h Mon Jun 20 16:49:56 2005 @@ -3,5 +3,5 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 1 #define PHP_RELEASE_VERSION 0 -#define PHP_EXTRA_VERSION -dev -#define PHP_VERSION 5.1.0-dev +#define PHP_EXTRA_VERSION b2 +#define PHP_VERSION 5.1.0b2 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / NEWS configure.in /main php_version.h ZendEngine2 zend.h
On Mon, 20 Jun 2005, Andi Gutmans wrote: andi Mon Jun 20 16:49:56 2005 EDT Modified files: /php-src NEWS configure.in /ZendEngine2 zend.h /php-src/main php_version.h Log: - Beta 2 Back to dev? As snapshots are now not being generated... regards, Derick -- Derick Rethans http://derickrethans.nl | http://ez.no | http://xdebug.org -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / NEWS configure.in /main php_version.h ZendEngine2 zend.h
Yeah, give me a few minutes! At 11:47 PM 6/20/2005 +0200, Derick Rethans wrote: On Mon, 20 Jun 2005, Andi Gutmans wrote: andi Mon Jun 20 16:49:56 2005 EDT Modified files: /php-src NEWS configure.in /ZendEngine2 zend.h /php-src/main php_version.h Log: - Beta 2 Back to dev? As snapshots are now not being generated... regards, Derick -- Derick Rethans http://derickrethans.nl | http://ez.no | http://xdebug.org -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS configure.in /main php_version.h ZendEngine2 zend.h
andiMon Jun 20 18:34:57 2005 EDT Modified files: /php-srcNEWS configure.in /ZendEngine2zend.h /php-src/main php_version.h Log: - Back to -dev http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1942r2=1.1943ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1942 php-src/NEWS:1.1943 --- php-src/NEWS:1.1942 Mon Jun 20 16:49:52 2005 +++ php-src/NEWSMon Jun 20 18:34:55 2005 @@ -1,5 +1,7 @@ PHPNEWS ||| +?? Jun 2005, PHP 5.1 Beta 3 + 20 Jun 2005, PHP 5.1 Beta 2 - Improved PHP extension loading mechanism with support for module dependencies and conflicts. (Jani, Dmitry) http://cvs.php.net/diff.php/php-src/configure.in?r1=1.565r2=1.566ty=u Index: php-src/configure.in diff -u php-src/configure.in:1.565 php-src/configure.in:1.566 --- php-src/configure.in:1.565 Mon Jun 20 16:49:52 2005 +++ php-src/configure.inMon Jun 20 18:34:55 2005 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.565 2005/06/20 20:49:52 andi Exp $ -*- autoconf -*- +dnl ## $Id: configure.in,v 1.566 2005/06/20 22:34:55 andi Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -42,7 +42,7 @@ MAJOR_VERSION=5 MINOR_VERSION=1 RELEASE_VERSION=0 -EXTRA_VERSION=b2 +EXTRA_VERSION=-dev VERSION=$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION dnl Define where extension directories are located in the configure context http://cvs.php.net/diff.php/ZendEngine2/zend.h?r1=1.282r2=1.283ty=u Index: ZendEngine2/zend.h diff -u ZendEngine2/zend.h:1.282 ZendEngine2/zend.h:1.283 --- ZendEngine2/zend.h:1.282Mon Jun 20 16:49:55 2005 +++ ZendEngine2/zend.h Mon Jun 20 18:34:57 2005 @@ -17,12 +17,12 @@ +--+ */ -/* $Id: zend.h,v 1.282 2005/06/20 20:49:55 andi Exp $ */ +/* $Id: zend.h,v 1.283 2005/06/20 22:34:57 andi Exp $ */ #ifndef ZEND_H #define ZEND_H -#define ZEND_VERSION 2.1.0b2 +#define ZEND_VERSION 2.1.0-dev #define ZEND_ENGINE_2 http://cvs.php.net/diff.php/php-src/main/php_version.h?r1=1.103r2=1.104ty=u Index: php-src/main/php_version.h diff -u php-src/main/php_version.h:1.103 php-src/main/php_version.h:1.104 --- php-src/main/php_version.h:1.103Mon Jun 20 16:49:56 2005 +++ php-src/main/php_version.h Mon Jun 20 18:34:57 2005 @@ -3,5 +3,5 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 1 #define PHP_RELEASE_VERSION 0 -#define PHP_EXTRA_VERSION b2 -#define PHP_VERSION 5.1.0b2 +#define PHP_EXTRA_VERSION -dev +#define PHP_VERSION 5.1.0-dev -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main network.c
tony2001Mon Jun 20 19:16:29 2005 EDT Modified files: /php-src/main network.c Log: fix memleak when connection fails (and we still keep trying) http://cvs.php.net/diff.php/php-src/main/network.c?r1=1.116r2=1.117ty=u Index: php-src/main/network.c diff -u php-src/main/network.c:1.116 php-src/main/network.c:1.117 --- php-src/main/network.c:1.116Tue Jun 14 09:09:04 2005 +++ php-src/main/network.c Mon Jun 20 19:16:27 2005 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: network.c,v 1.116 2005/06/14 13:09:04 iliaa Exp $ */ +/* $Id: network.c,v 1.117 2005/06/20 23:16:27 tony2001 Exp $ */ /*#define DEBUG_MAIN_NETWORK 1*/ @@ -817,7 +817,13 @@ bad_ip: php_error_docref(NULL TSRMLS_CC, E_WARNING, Invalid IP Address: %s, bindto); } -bind_done: +bind_done: + /* free error string recieved during previous iteration (if any) */ + if (error_string *error_string) { + efree(*error_string); + *error_string = NULL; + } + n = php_network_connect_socket(sock, sa, socklen, asynchronous, timeout ? working_timeout : NULL, error_string, error_code); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) /main network.c
tony2001Mon Jun 20 19:16:55 2005 EDT Modified files: (Branch: PHP_5_0) /php-src/main network.c Log: MFH: fix memleak http://cvs.php.net/diff.php/php-src/main/network.c?r1=1.109.2.3r2=1.109.2.4ty=u Index: php-src/main/network.c diff -u php-src/main/network.c:1.109.2.3 php-src/main/network.c:1.109.2.4 --- php-src/main/network.c:1.109.2.3Fri Mar 11 03:11:28 2005 +++ php-src/main/network.c Mon Jun 20 19:16:54 2005 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: network.c,v 1.109.2.3 2005/03/11 08:11:28 hyanantha Exp $ */ +/* $Id: network.c,v 1.109.2.4 2005/06/20 23:16:54 tony2001 Exp $ */ /*#define DEBUG_MAIN_NETWORK 1*/ @@ -783,8 +783,13 @@ } if (sa) { + /* free error string recieved during previous iteration (if any) */ + if (error_string *error_string) { + efree(*error_string); + *error_string = NULL; + } + /* make a connection attempt */ - n = php_network_connect_socket(sock, sa, socklen, asynchronous, timeout ? working_timeout : NULL, error_string, error_code); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/cli php_cli.c
iliaa Mon Jun 20 20:12:37 2005 EDT Modified files: /php-src/sapi/cli php_cli.c Log: Fixed possible memory corruption. http://cvs.php.net/diff.php/php-src/sapi/cli/php_cli.c?r1=1.126r2=1.127ty=u Index: php-src/sapi/cli/php_cli.c diff -u php-src/sapi/cli/php_cli.c:1.126 php-src/sapi/cli/php_cli.c:1.127 --- php-src/sapi/cli/php_cli.c:1.126Mon Jun 6 03:11:08 2005 +++ php-src/sapi/cli/php_cli.c Mon Jun 20 20:12:35 2005 @@ -20,7 +20,7 @@ +--+ */ -/* $Id: php_cli.c,v 1.126 2005/06/06 07:11:08 helly Exp $ */ +/* $Id: php_cli.c,v 1.127 2005/06/21 00:12:35 iliaa Exp $ */ #include php.h #include php_globals.h @@ -213,6 +213,9 @@ size_t ret; #if HAVE_LIBREADLINE || HAVE_LIBEDIT + if (!str_length) { + return 0; + } php_last_char = str[str_length-1]; #endif -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php