CVS update: php3

Date: Thursday August 13, 1998 @ 17:33 Author: zeev Update of /repository/php3 In directory asf:/tmp/cvs-serv5002 Modified Files: ChangeLog main.c Log Message: Fix for #503 Index: php3/ChangeLog diff -c php3/ChangeLog:1.439 php3/ChangeLog:1.440 *** php3/ChangeLog:1.439 Thu Aug 13 16:47:27 1998 --- php3/ChangeLog Thu Aug 13 17:33:09 1998 *************** *** 1,7 **** PHP 3.0 CHANGE LOG ChangeLog ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? 1998 Version 3.0.3 ! - win32 mail fixes provided by walton@nordicdms.com - Comparing between arrays and/or objects now generates a warning (it always returns false, as it used to; no comparison is made) - Fixed a bug in the syntax highlighting code, that made ending-double-quotes --- 1,8 ---- PHP 3.0 CHANGE LOG ChangeLog ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? 1998 Version 3.0.3 ! - Auto-prepended files were crashing under some circumstances - fixed. ! - Win32 mail fixes provided by walton@nordicdms.com - Comparing between arrays and/or objects now generates a warning (it always returns false, as it used to; no comparison is made) - Fixed a bug in the syntax highlighting code, that made ending-double-quotes *************** *** 432,440 **** February 02 1998 Version 3.0b4 - Fixed a segfault bug in one of the unified ODBC error messages. ! - Set default file modes to binary on win32 (solved a lot of bs) ! - Fixed file copy on win32 ! - MIME file uploads fixed on win32 - Added contributed icons by Colin Viebrock (undex extra/icons) - Fixed the debugger enough to call it "beta code". - Fixed some leaks in the Oracle module, tidied up the code a bit. --- 433,441 ---- February 02 1998 Version 3.0b4 - Fixed a segfault bug in one of the unified ODBC error messages. ! - Set default file modes to binary on Win32 (solved a lot of bs) ! - Fixed file copy on Win32 ! - MIME file uploads fixed on Win32 - Added contributed icons by Colin Viebrock (undex extra/icons) - Fixed the debugger enough to call it "beta code". - Fixed some leaks in the Oracle module, tidied up the code a bit. *************** *** 504,518 **** - Fixed http:// URL includes with no path specified send request for /. - Added GetAllHeaders() (Apache-only) - Added workaround that made the Image text functions 8-bit clean ! - Made snmp internally compilable for win32 (not the unix one though), only adds 2k to binary size, so no reason not to have it there. ! - Fixed ldap loading on win32 ! - Fixed MySQL Info function on win32 platform - Fixed compilation of syntax highlighting mode January 17 1998 Version 3.0b3 - Added mysql support under windows ;) happy happy joy joy ! - Fixed dbase.dll for win32 to actualy load now. - Enhanced the convertor to recognize ?> as a php-close-block as well. - Fixed potential SetCookie() core dumps - Changed print to be an expression instead of a statement. That means you can --- 505,519 ---- - Fixed http:// URL includes with no path specified send request for /. - Added GetAllHeaders() (Apache-only) - Added workaround that made the Image text functions 8-bit clean ! - Made snmp internally compilable for Win32 (not the unix one though), only adds 2k to binary size, so no reason not to have it there. ! - Fixed ldap loading on Win32 ! - Fixed MySQL Info function on Win32 platform - Fixed compilation of syntax highlighting mode January 17 1998 Version 3.0b3 - Added mysql support under windows ;) happy happy joy joy ! - Fixed dbase.dll for Win32 to actualy load now. - Enhanced the convertor to recognize ?> as a php-close-block as well. - Fixed potential SetCookie() core dumps - Changed print to be an expression instead of a statement. That means you can *************** *** 525,531 **** - Fixed bug in ImageGif() making it hang sometimes - Added ImageLoadFont(), ImageFontWidth() and ImageFontHeight() - error_reporting() now returns the old error reporting level ! - Fixed url includes/opens not working under win32 - Fixed errorneous handling of multipart/form-data input - Added rawurlencode(), rawurldecode() and changed urlencode() and urldecode() a bit too. --- 526,532 ---- - Fixed bug in ImageGif() making it hang sometimes - Added ImageLoadFont(), ImageFontWidth() and ImageFontHeight() - error_reporting() now returns the old error reporting level ! - Fixed url includes/opens not working under Win32 - Fixed errorneous handling of multipart/form-data input - Added rawurlencode(), rawurldecode() and changed urlencode() and urldecode() a bit too. Index: php3/main.c diff -c php3/main.c:1.460 php3/main.c:1.461 *** php3/main.c:1.460 Wed Aug 12 00:56:27 1998 --- php3/main.c Thu Aug 13 17:33:10 1998 *************** *** 29,35 **** +----------------------------------------------------------------------+ */ ! /* $Id: main.c,v 1.460 1998/08/12 04:56:27 steffann Exp $ */ /* #define CRASH_DETECTION */ --- 29,35 ---- +----------------------------------------------------------------------+ */ ! /* $Id: main.c,v 1.461 1998/08/13 21:33:10 zeev Exp $ */ /* #define CRASH_DETECTION */ *************** *** 1425,1446 **** int issock=0, socketd=0;; #endif if (php3_ini.auto_prepend_file && php3_ini.auto_prepend_file[0]) { - #if 0 - char *prepend = php3_ini.auto_prepend_file; - FILE *fp; - - fp = php3_fopen_wrapper(prepend, "r", USE_PATH | IGNORE_URL_WIN, &issock, &socketd); - if (fp) { - initialize_input_file_buffer(fp); - reset_scanner(); - (void) phpparse(); - fclose(fp); - } else { - if (php3_header()) - php3_printf("Unable to open prepend file.\n"); - } - #else pval tmp; tmp.value.str.val = php3_ini.auto_prepend_file; --- 1425,1432 ---- int issock=0, socketd=0;; #endif + initialize_input_file_buffer(yyin); if (php3_ini.auto_prepend_file && php3_ini.auto_prepend_file[0]) { pval tmp; tmp.value.str.val = php3_ini.auto_prepend_file; *************** *** 1449,1480 **** include_file(&tmp,0); (void) phpparse(); - #endif } /* Call Parser on the main input file */ - initialize_input_file_buffer(yyin); reset_scanner(); GLOBAL(phplineno) = original_lineno; (void) phpparse(); if (php3_ini.auto_append_file && php3_ini.auto_append_file[0]) { - #if 0 - char *append = php3_ini.auto_append_file; - FILE *fa; - - fa = php3_fopen_wrapper(append, "r", USE_PATH | IGNORE_URL_WIN, &issock, &socketd); - if (fa) { - fclose(phpin); /* the auto-appended file will be phpin */ - initialize_input_file_buffer(fa); - reset_scanner(); - (void) phpparse(); - /* fa is now phpin, and will be closed by clean_input_source_stack() */ - /*fclose(fa); */ - } else { - if (php3_header()) - php3_printf("Unable to open append file.\n"); - } - #else pval tmp; tmp.value.str.val = php3_ini.auto_append_file; --- 1435,1447 ---- *************** *** 1483,1489 **** include_file(&tmp,0); (void) phpparse(); - #endif } } --- 1450,1455 ---- -- PHP Development Mailing List http://www.php.net/ To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net For help: php-dev-help@lists.php.net