[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Thu Dec 15 06:31:45 2005 EDT Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewcvs.cgi/php-src/ChangeLog?r1=1.2193r2=1.2194diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.2193 php-src/ChangeLog:1.2194 --- php-src/ChangeLog:1.2193Wed Dec 14 06:31:41 2005 +++ php-src/ChangeLog Thu Dec 15 06:31:44 2005 @@ -1,3 +1,72 @@ +2005-12-14 Pierre-Alain Joye [EMAIL PROTECTED] + +* ext/gd/config.m4 + ext/gd/config.w32 + ext/gd/gd.c + ext/gd/gd.dsp + ext/gd/tests/createfromwbmp.phpt + ext/gd/tests/imagewbmp.phpt + ext/gd/tests/src.wbmp: + - add wbmp read/write tests + - remove HAVE_GD_WBMP, always available + +* ext/gd/tests/createfromgd2.phpt: + - correct title + +* ext/gd/config.w32 + ext/gd/gd.dsp: + - remove HAVE_GD_GD2 on windows as well + +* ext/gd/config.m4 + ext/gd/gd.c: + - remove HAVE_GD_GD2, always valid now (2.0.33 or bundled) + +* ext/gd/tests/createfromgd2.phpt + ext/gd/tests/src.gd2: + - tests for imagecreatefromgd2 and gd2part + +2005-12-14 Mark L. Woodward [EMAIL PROTECTED] + +* (PHP_5_0) + ext/msession/README: + Updated README + +2005-12-14 Ilia Alshanetsky [EMAIL PROTECTED] + +* (PHP_4_4) + NEWS + sapi/apache2handler/sapi_apache2.c: + MFH: Fixed bug #35571 (Fixed crash in Apache 2 SAPI when more then one php + script is loaded via SSI include). + +* sapi/apache2handler/sapi_apache2.c: + MFB51: Fixed bug #35571 (Fixed crash in Apache 2 SAPI when more then one + php + script is loaded via SSI include). (Ilia) + +* (PHP_5_1) + NEWS + sapi/apache2handler/sapi_apache2.c: + Fixed bug #35571 (Fixed crash in Apache 2 SAPI when more then one php + script is loaded via SSI include). + +2005-12-14 Wez Furlong [EMAIL PROTECTED] + +* (PHP_5_1) + main/win95nt.h: + Fixes for building with vs.net 2005. + +2005-12-14 Antony Dovgal [EMAIL PROTECTED] + +* ext/standard/string.c: + fix spelling and #35665 + +2005-12-14 Marcus Boerger [EMAIL PROTECTED] + +* (PHP_5_1) + main/streams/memory.c: + - Fix temp/memory stream modes + 2005-12-13 Antony Dovgal [EMAIL PROTECTED] * (PHP_5_1) @@ -19084,7 +19153,7 @@ * (PHP_4_3) ext/standard/url_scanner_ex.re: - Missing $Id: ChangeLog,v 1.2193 2005/12/14 06:31:41 changelog Exp $ tag + Missing $Id: ChangeLog,v 1.2194 2005/12/15 06:31:44 changelog Exp $ tag * (PHP_5_0) ext/standard/url_scanner_ex.c: @@ -22485,7 +22554,7 @@ ext/session/mod_mm.h ext/session/mod_user.h ext/session/php_session.h: - - Missing $Id: ChangeLog,v 1.2193 2005/12/14 06:31:41 changelog Exp $ tags + - Missing $Id: ChangeLog,v 1.2194 2005/12/15 06:31:44 changelog Exp $ tags * (PHP_4_3) ext/session/session.c: @@ -22966,7 +23035,7 @@ * (PHP_4_3) Zend/zend_ini_scanner.l: - Missing $Id: ChangeLog,v 1.2193 2005/12/14 06:31:41 changelog Exp $ tag + ws fix + Missing $Id: ChangeLog,v 1.2194 2005/12/15 06:31:44 changelog Exp $ tag + ws fix * ZendEngine2/zend_ini_scanner.l ZendEngine2/zend_ini_scanner.l: @@ -24440,7 +24509,7 @@ ext/standard/url_scanner_ex.c ext/standard/url_scanner_ex.h ext/standard/url_scanner_ex.re: - Missing $Id: ChangeLog,v 1.2193 2005/12/14 06:31:41 changelog Exp $ tag + Missing $Id: ChangeLog,v 1.2194 2005/12/15 06:31:44 changelog Exp $ tag * ext/standard/credits_ext.h ext/standard/credits_sapi.h:
[PHP-CVS] cvs: php-src /ext/spl spl_directory.c
helly Wed Dec 14 09:55:04 2005 EDT Modified files: /php-src/ext/splspl_directory.c Log: - Fix issue spotted by Wez using ms vc 2005 http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/spl_directory.c?r1=1.60r2=1.61diff_format=u Index: php-src/ext/spl/spl_directory.c diff -u php-src/ext/spl/spl_directory.c:1.60 php-src/ext/spl/spl_directory.c:1.61 --- php-src/ext/spl/spl_directory.c:1.60Sun Dec 11 16:43:00 2005 +++ php-src/ext/spl/spl_directory.c Wed Dec 14 09:55:04 2005 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: spl_directory.c,v 1.60 2005/12/11 16:43:00 helly Exp $ */ +/* $Id: spl_directory.c,v 1.61 2005/12/14 09:55:04 helly Exp $ */ #ifdef HAVE_CONFIG_H # include config.h @@ -303,7 +303,7 @@ php_set_error_handling(EH_THROW, U_CLASS_ENTRY(spl_ce_RuntimeException) TSRMLS_CC); - return_value-value.obj = spl_filesystem_object_new_ex(ce ? ce : intern-info_class, intern TSRMLS_CC); + return_value-value.obj = spl_filesystem_object_new_ex(ce ? ce : source-info_class, intern TSRMLS_CC); Z_TYPE_P(return_value) = IS_OBJECT; spl_filesystem_info_set_filename(intern, file_path, file_path_len, use_copy TSRMLS_CC); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) /ext/spl spl_directory.c
helly Wed Dec 14 09:55:11 2005 EDT Modified files: (Branch: PHP_5_1) /php-src/ext/splspl_directory.c Log: - MFH Fix issue spotted by Wez using ms vc 2005 http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/spl_directory.c?r1=1.45.2.7r2=1.45.2.8diff_format=u Index: php-src/ext/spl/spl_directory.c diff -u php-src/ext/spl/spl_directory.c:1.45.2.7 php-src/ext/spl/spl_directory.c:1.45.2.8 --- php-src/ext/spl/spl_directory.c:1.45.2.7Sun Dec 11 16:43:29 2005 +++ php-src/ext/spl/spl_directory.c Wed Dec 14 09:55:11 2005 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: spl_directory.c,v 1.45.2.7 2005/12/11 16:43:29 helly Exp $ */ +/* $Id: spl_directory.c,v 1.45.2.8 2005/12/14 09:55:11 helly Exp $ */ #ifdef HAVE_CONFIG_H # include config.h @@ -303,7 +303,7 @@ php_set_error_handling(EH_THROW, spl_ce_RuntimeException TSRMLS_CC); - return_value-value.obj = spl_filesystem_object_new_ex(ce ? ce : intern-info_class, intern TSRMLS_CC); + return_value-value.obj = spl_filesystem_object_new_ex(ce ? ce : source-info_class, intern TSRMLS_CC); Z_TYPE_P(return_value) = IS_OBJECT; spl_filesystem_info_set_filename(intern, file_path, file_path_len, use_copy TSRMLS_CC); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / commitinfo
derick Wed Dec 14 14:50:22 2005 EDT Modified files: /CVSROOTcommitinfo Log: - true is in /usr/bin/true on the new machine http://cvs.php.net/viewcvs.cgi/CVSROOT/commitinfo?r1=1.12r2=1.13diff_format=u Index: CVSROOT/commitinfo diff -u CVSROOT/commitinfo:1.12 CVSROOT/commitinfo:1.13 --- CVSROOT/commitinfo:1.12 Tue Oct 12 14:25:35 2004 +++ CVSROOT/commitinfo Wed Dec 14 14:50:22 2005 @@ -1,6 +1,6 @@ # -#ident @(#)cvs/examples:$Name: $:$Id: commitinfo,v 1.12 2004/10/12 14:25:35 sas Exp $ +#ident @(#)cvs/examples:$Name: $:$Id: commitinfo,v 1.13 2005/12/14 14:50:22 derick Exp $ # # The commitinfo file is used to control pre-commit checks. # The filter on the right is invoked with the repository and a list @@ -30,7 +30,7 @@ # The next two lines prevent massive cvs commit messages from being # mailed out. It would be nice if we could instead just send the # commit log for these ones. -.*distributions.* /bin/true +.*distributions.* /usr/bin/true DEFAULT$CVSROOT/CVSROOT/commitinfo.pl ALL $CVSROOT/CVSROOT/cvs_acls $USER -- 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/msession README
mlwmohawk Wed Dec 14 17:42:30 2005 EDT Modified files: (Branch: PHP_5_0) /php-src/ext/msession README Log: Updated README http://cvs.php.net/viewcvs.cgi/php-src/ext/msession/README?r1=1.6r2=1.6.2.1diff_format=u Index: php-src/ext/msession/README diff -u php-src/ext/msession/README:1.6 php-src/ext/msession/README:1.6.2.1 --- php-src/ext/msession/README:1.6 Mon Jan 20 03:16:22 2003 +++ php-src/ext/msession/README Wed Dec 14 17:42:30 2005 @@ -2,7 +2,7 @@ management system. The msession daemon can be found at Mohawk Software's web site. -http://www.mohawksoft.com +http://www.mohawksoft.org Requirements: Mohawk Software's Phoenix library. @@ -30,4 +30,7 @@ 12/22/2001 Changed msession_getdata(...) to msession_get_data(...) Changed msession_setdata(...) to msession_set_data(...) -(docs to follow) + +12/14/2005 +MSession will be renamed and reworked to MCache + -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/gd/tests createfromgd2.phpt src.gd2
pajoye Wed Dec 14 19:00:28 2005 EDT
Added files:
/php-src/ext/gd/tests createfromgd2.phpt src.gd2
Log:
- tests for imagecreatefromgd2 and gd2part
http://cvs.php.net/viewcvs.cgi/php-src/ext/gd/tests/createfromgd2.phpt?view=markuprev=1.1
Index: php-src/ext/gd/tests/createfromgd2.phpt
+++ php-src/ext/gd/tests/createfromgd2.phpt
--TEST--
Bug #27582 (ImageFillToBorder() on alphablending image looses alpha on fill
color)
--SKIPIF--
?php
if (!function_exists('imagecreatefromgd2')) die(skip gd extension not
available\n);
if (!GD_BUNDLED) die('skip external GD libraries always fail');
?
--FILE--
?php
$file = dirname(__FILE__) . '/src.gd2';
$im2 = imagecreatefromgd2($file);
echo 'test create from gd2: ';
echo imagecolorat($im2, 4,4) == 0xff ? 'ok' : 'failed';
echo \n;
$im3 = imagecreatefromgd2part($file, 4,4, 2,2);
echo 'test create from gd2 part: ';
echo imagecolorat($im2, 4,4) == 0xff ? 'ok' : 'failed';
echo \n;
?
--EXPECT--
test create from gd2: ok
test create from gd2 part: ok
http://cvs.php.net/viewcvs.cgi/php-src/ext/gd/tests/src.gd2?view=markuprev=1.1
Index: php-src/ext/gd/tests/src.gd2
+++ php-src/ext/gd/tests/src.gd2
gd2
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/gd config.m4 gd.c
pajoye Wed Dec 14 19:10:52 2005 EDT
Modified files:
/php-src/ext/gd config.m4 gd.c
Log:
- remove HAVE_GD_GD2, always valid now (2.0.33 or bundled)
http://cvs.php.net/viewcvs.cgi/php-src/ext/gd/config.m4?r1=1.158r2=1.159diff_format=u
Index: php-src/ext/gd/config.m4
diff -u php-src/ext/gd/config.m4:1.158 php-src/ext/gd/config.m4:1.159
--- php-src/ext/gd/config.m4:1.158 Thu Dec 1 00:36:26 2005
+++ php-src/ext/gd/config.m4Wed Dec 14 19:10:52 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.158 2005/12/01 00:36:26 sniper Exp $
+dnl $Id: config.m4,v 1.159 2005/12/14 19:10:52 pajoye Exp $
dnl
dnl
@@ -327,7 +327,6 @@
dnl These defines are always available
dnl FIXME: Cleanup the sources so that these are not needed!
- AC_DEFINE(HAVE_GD_GD2, 1, [ ])
AC_DEFINE(HAVE_GD_WBMP, 1, [ ])
AC_DEFINE(HAVE_LIBGD13, 1, [ ])
AC_DEFINE(HAVE_LIBGD15, 1, [ ])
http://cvs.php.net/viewcvs.cgi/php-src/ext/gd/gd.c?r1=1.323r2=1.324diff_format=u
Index: php-src/ext/gd/gd.c
diff -u php-src/ext/gd/gd.c:1.323 php-src/ext/gd/gd.c:1.324
--- php-src/ext/gd/gd.c:1.323 Tue Dec 6 02:24:30 2005
+++ php-src/ext/gd/gd.c Wed Dec 14 19:10:52 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: gd.c,v 1.323 2005/12/06 02:24:30 sniper Exp $ */
+/* $Id: gd.c,v 1.324 2005/12/14 19:10:52 pajoye Exp $ */
/* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -239,10 +239,8 @@
PHP_FE(imagecreatefromxpm,
NULL)
#endif
PHP_FE(imagecreatefromgd,
NULL)
-#ifdef HAVE_GD_GD2
PHP_FE(imagecreatefromgd2,
NULL)
PHP_FE(imagecreatefromgd2part, NULL)
-#endif
#ifdef HAVE_GD_PNG
PHP_FE(imagepng,
NULL)
#endif
@@ -256,9 +254,7 @@
PHP_FE(imagewbmp, NULL)
#endif
PHP_FE(imagegd,
NULL)
-#ifdef HAVE_GD_GD2
PHP_FE(imagegd2,
NULL)
-#endif
PHP_FE(imagedestroy,
NULL)
PHP_FE(imagegammacorrect,
NULL)
@@ -1449,12 +1445,7 @@
break;
case PHP_GDIMG_TYPE_GD2:
-#ifdef HAVE_GD_GD2
im = _php_image_create_from_string(data, GD2,
gdImageCreateFromGd2Ctx TSRMLS_CC);
-#else
- php_error_docref(NULL TSRMLS_CC, E_WARNING, No GD2
support in this PHP build);
- RETURN_FALSE;
-#endif
break;
default:
@@ -1652,7 +1643,6 @@
}
/* }}} */
-#ifdef HAVE_GD_GD2
/* {{{ proto resource imagecreatefromgd2(string filename)
Create a new image from GD2 file or URL */
PHP_FUNCTION(imagecreatefromgd2)
@@ -1668,7 +1658,6 @@
_php_image_create_from(INTERNAL_FUNCTION_PARAM_PASSTHRU,
PHP_GDIMG_TYPE_GD2PART, GD2, gdImageCreateFromGd2Part,
gdImageCreateFromGd2PartCtx);
}
/* }}} */
-#endif /* HAVE_GD_GD2 */
/* {{{ _php_image_output
*/
@@ -1887,7 +1876,6 @@
}
/* }}} */
-#ifdef HAVE_GD_GD2
/* {{{ proto bool imagegd2(resource im [, string filename, [, int chunk_size,
[, int type]]])
Output GD2 image to browser or file */
PHP_FUNCTION(imagegd2)
@@ -1895,7 +1883,6 @@
_php_image_output(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_GD2,
GD2, gdImageGd2);
}
/* }}} */
-#endif /* HAVE_GD_GD2 */
/* {{{ proto bool imagedestroy(resource im)
Destroy an image */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/gd config.w32 gd.dsp
pajoye Wed Dec 14 19:12:58 2005 EDT Modified files: /php-src/ext/gd config.w32 gd.dsp Log: - remove HAVE_GD_GD2 on windows as well http://cvs.php.net/viewcvs.cgi/php-src/ext/gd/config.w32?r1=1.11r2=1.12diff_format=u Index: php-src/ext/gd/config.w32 diff -u php-src/ext/gd/config.w32:1.11 php-src/ext/gd/config.w32:1.12 --- php-src/ext/gd/config.w32:1.11 Sun Oct 2 18:31:37 2005 +++ php-src/ext/gd/config.w32 Wed Dec 14 19:12:57 2005 @@ -1,4 +1,4 @@ -// $Id: config.w32,v 1.11 2005/10/02 18:31:37 pajoye Exp $ +// $Id: config.w32,v 1.12 2005/12/14 19:12:57 pajoye Exp $ // vim:ft=javascript ARG_WITH(gd, Bundled GD support, yes,shared); @@ -34,7 +34,6 @@ ADD_FLAG(CFLAGS_GD, \ /D HAVE_GD_DYNAMIC_CTX_EX=1 \ /D HAVE_GD_BUNDLED=1 \ -/D HAVE_GD_GD2 \ /D HAVE_GD_GIF_READ=1 \ /D HAVE_GD_GIF_CREATE=1 \ /D HAVE_GDIMAGECOLORRESOLVE=1 \ http://cvs.php.net/viewcvs.cgi/php-src/ext/gd/gd.dsp?r1=1.19r2=1.20diff_format=u Index: php-src/ext/gd/gd.dsp diff -u php-src/ext/gd/gd.dsp:1.19 php-src/ext/gd/gd.dsp:1.20 --- php-src/ext/gd/gd.dsp:1.19 Sun Apr 10 19:07:15 2005 +++ php-src/ext/gd/gd.dsp Wed Dec 14 19:12:57 2005 @@ -44,7 +44,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir # ADD BASE CPP /nologo /MD /W3 /GX /O2 /I ..\.. /I ..\..\main /I ..\..\Zend /I ..\..\..\bindlib_w32 /I ..\..\..\zlib /I ..\..\TSRM /D ZEND_DEBUG=0 /D WIN32 /D NDEBUG /D _WINDOWS /D COMPILE_DL_GD /D ZTS=1 /D ZEND_WIN32 /D PHP_WIN32 /D HAVE_GD_GIF_READ=1 /D HAVE_GD_GIF_CREATE=1 /D HAVE_GDIMAGECOLORRESOLVE=1 /D HAVE_GD_PNG /D HAVE_GD_JPG /D HAVE_GD_WBMP /D HAVE_GD_XBM /D HAVE_LIBGD13=1 /D HAVE_LIBGD=1 /D HAVE_LIBGD15=1 /D HAVE_LIBGD204=1 /FR /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I ..\.. /I ..\..\main /I ..\..\Zend /I ..\..\..\bindlib_w32 /I ..\..\..\zlib /I ..\..\TSRM /I libgd /D ZEND_DEBUG=0 /D HAVE_LIBGD15=1 /D HAVE_LIBGD204=1 /D WIN32 /D NDEBUG /D _WINDOWS /D COMPILE_DL_GD /D ZTS=1 /D ZEND_WIN32 /D PHP_WIN32 /D HAVE_GD_GIF_READ=1 /D HAVE_GD_GIF_CREATE=1 /D HAVE_GDIMAGECOLORRESOLVE=1 /D HAVE_GD_PNG /D HAVE_GD_JPG /D HAVE_GD_WBMP /D HAVE_GD_XBM /D HAVE_LIBGD=1 /D HAVE_LIBGD13=1 /D HAVE_LIBGD20=1 /D USE_GD_IOCTX /D HAVE_LIBFREETYPE=1 /D USE_GD_IMGSTRTTF /D HAVE_GD_STRINGTTF=1 /D HAVE_GD_BUNDLED=1 /D MSWIN32 /D HAVE_LIBPNG /D HAVE_LIBJPEG /D HAVE_GD_GD2 /D HAVE_GD_STRINGFTEX=1 /D HAVE_GD_IMAGESETBRUSH=1 /D HAVE_GD_IMAGESETTILE=1 /FR /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I ..\.. /I ..\..\main /I ..\..\Zend /I ..\..\..\bindlib_w32 /I ..\..\..\zlib /I ..\..\TSRM /I libgd /D ZEND_DEBUG=0 /D HAVE_LIBGD15=1 /D HAVE_LIBGD204=1 /D WIN32 /D NDEBUG /D _WINDOWS /D COMPILE_DL_GD /D ZTS=1 /D ZEND_WIN32 /D PHP_WIN32 /D HAVE_GD_GIF_READ=1 /D HAVE_GD_GIF_CREATE=1 /D HAVE_GDIMAGECOLORRESOLVE=1 /D HAVE_GD_PNG /D HAVE_GD_JPG /D HAVE_GD_WBMP /D HAVE_GD_XBM /D HAVE_LIBGD=1 /D HAVE_LIBGD13=1 /D HAVE_LIBGD20=1 /D USE_GD_IOCTX /D HAVE_LIBFREETYPE=1 /D USE_GD_IMGSTRTTF /D HAVE_GD_STRINGTTF=1 /D HAVE_GD_BUNDLED=1 /D MSWIN32 /D HAVE_LIBPNG /D HAVE_LIBJPEG /D HAVE_GD_STRINGFTEX=1 /D HAVE_GD_IMAGESETBRUSH=1 /D HAVE_GD_IMAGESETTILE=1 /FR /FD /c # SUBTRACT CPP /YX # ADD BASE MTL /nologo /D NDEBUG /mktyplib203 /win32 # ADD MTL /nologo /D NDEBUG /mktyplib203 /win32 @@ -74,7 +74,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir # ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /I ..\.. /I ..\..\main /I ..\..\Zend /I ..\..\..\bindlib_w32 /I ..\..\..\zlib /I ..\..\TSRM /D ZEND_DEBUG=1 /D WIN32 /D NDEBUG /D _WINDOWS /D COMPILE_DL_GD /D ZTS=1 /D ZEND_WIN32 /D PHP_WIN32 /D HAVE_GD_GIF_READ=1 /D HAVE_GD_GIF_CREATE=1 /D HAVE_GDIMAGECOLORRESOLVE=1 /D HAVE_GD_PNG /D HAVE_GD_JPG /D HAVE_GD_WBMP /D HAVE_LIBGD13=1 /D HAVE_LIBGD=1 /D HAVE_LIBGD15=1 /D HAVE_LIBGD204=1 /FR /YX /FD /c -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I ..\.. /I ..\..\main /I ..\..\Zend /I ..\..\..\bindlib_w32 /I ..\..\..\zlib /I ..\..\TSRM /I libgd /D ZEND_DEBUG=1 /D HAVE_LIBGD15 /D HAVE_LIBGD204=1 /D WIN32 /D NDEBUG /D _WINDOWS /D COMPILE_DL_GD /D ZTS=1 /D ZEND_WIN32 /D PHP_WIN32 /D HAVE_GD_GIF_READ=1 /D HAVE_GD_GIF_CREATE=1 /D HAVE_GDIMAGECOLORRESOLVE=1 /D HAVE_GD_PNG /D HAVE_GD_JPG /D HAVE_GD_WBMP /D HAVE_LIBGD=1 /D HAVE_LIBGD13=1 /D HAVE_LIBGD20=1 /D USE_GD_IOCTX /D HAVE_LIBFREETYPE=1 /D USE_GD_IMGSTRTTF /D HAVE_GD_STRINGTTF=1 /D HAVE_GD_BUNDLED=1 /D MSWIN32 /D HAVE_LIBPNG /D HAVE_LIBJPEG /D HAVE_GD_GD2 /D HAVE_GD_STRINGFTEX=1 /D HAVE_GD_IMAGESETBRUSH=1 /D HAVE_GD_IMAGESETTILE=1 /FR /FD /c +# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I ..\.. /I ..\..\main /I ..\..\Zend /I ..\..\..\bindlib_w32 /I ..\..\..\zlib /I ..\..\TSRM /I libgd /D ZEND_DEBUG=1 /D HAVE_LIBGD15 /D HAVE_LIBGD204=1 /D WIN32 /D NDEBUG /D _WINDOWS /D COMPILE_DL_GD /D ZTS=1 /D ZEND_WIN32 /D PHP_WIN32 /D HAVE_GD_GIF_READ=1 /D HAVE_GD_GIF_CREATE=1 /D HAVE_GDIMAGECOLORRESOLVE=1 /D HAVE_GD_PNG /D HAVE_GD_JPG /D HAVE_GD_WBMP /D HAVE_LIBGD=1 /D HAVE_LIBGD13=1 /D HAVE_LIBGD20=1 /D USE_GD_IOCTX /D HAVE_LIBFREETYPE=1 /D
[PHP-CVS] cvs: php-src /ext/gd/tests createfromgd2.phpt
pajoye Wed Dec 14 19:50:43 2005 EDT
Modified files:
/php-src/ext/gd/tests createfromgd2.phpt
Log:
- correct title
http://cvs.php.net/viewcvs.cgi/php-src/ext/gd/tests/createfromgd2.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/gd/tests/createfromgd2.phpt
diff -u php-src/ext/gd/tests/createfromgd2.phpt:1.1
php-src/ext/gd/tests/createfromgd2.phpt:1.2
--- php-src/ext/gd/tests/createfromgd2.phpt:1.1 Wed Dec 14 19:00:28 2005
+++ php-src/ext/gd/tests/createfromgd2.phpt Wed Dec 14 19:50:42 2005
@@ -1,5 +1,5 @@
--TEST--
-Bug #27582 (ImageFillToBorder() on alphablending image looses alpha on fill
color)
+imagecreatefromgd2
--SKIPIF--
?php
if (!function_exists('imagecreatefromgd2')) die(skip gd extension not
available\n);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
wez Wed Dec 14 20:30:54 2005 EDT Modified files: /CVSROOTavail Log: karma for Krishna Raman http://cvs.php.net/viewcvs.cgi/CVSROOT/avail?r1=1.1067r2=1.1068diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1067 CVSROOT/avail:1.1068 --- CVSROOT/avail:1.1067Mon Dec 12 18:06:30 2005 +++ CVSROOT/avail Wed Dec 14 20:30:53 2005 @@ -317,9 +317,9 @@ # please contact the lead developers. This is a temporary measure until # we can put in place a more general process. unavail||pecl/ibm_db2,pecl/pdo_odbc,php-src/ext/pdo_odbc,pecl/sdo,pecl/pdo_ids,pecl/pdo_informix -avail|dbs,skoduru|pecl/ibm_db2 +avail|dbs,skoduru,kraman|pecl/ibm_db2 avail|wez,dbs|pecl/pdo_odbc,php-src/ext/pdo_odbc avail|gcc,cem,mfp,ansriniv|pecl/sdo -avail|dbs|pecl/pdo_ids,pecl/pdo_informix +avail|dbs,kraman|pecl/pdo_ids,pecl/pdo_informix # vim:set ft=conf sw=2 ts=2 et: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
pajoye Wed Dec 14 21:36:34 2005 EDT Modified files: /CVSROOTavail Log: - cconstantine karma for pear/System_Command http://cvs.php.net/viewcvs.cgi/CVSROOT/avail?r1=1.1068r2=1.1069diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1068 CVSROOT/avail:1.1069 --- CVSROOT/avail:1.1068Wed Dec 14 20:30:53 2005 +++ CVSROOT/avail Wed Dec 14 21:36:33 2005 @@ -308,6 +308,7 @@ avail|freq|peardoc,Services_Pingback avail|cellog|pecl/phar avail|ritzmo|pear/Text_Wiki +avail|cconstantine|peardoc,pear/System_Command # Curl modules avail|bagder,sterling,crisb,linus_nielsen|curl,curl-cpp,curl-java,curl-perl,curl-php,curl-www -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/gd config.m4 config.w32 gd.c gd.dsp /ext/gd/tests createfromwbmp.phpt imagewbmp.phpt src.wbmp
pajoye Wed Dec 14 22:33:34 2005 EDT Added files: /php-src/ext/gd/tests createfromwbmp.phpt imagewbmp.phpt src.wbmp Modified files: /php-src/ext/gd config.m4 config.w32 gd.c gd.dsp Log: - add wbmp read/write tests - remove HAVE_GD_WBMP, always available http://cvs.php.net/viewcvs.cgi/php-src/ext/gd/config.m4?r1=1.159r2=1.160diff_format=u Index: php-src/ext/gd/config.m4 diff -u php-src/ext/gd/config.m4:1.159 php-src/ext/gd/config.m4:1.160 --- php-src/ext/gd/config.m4:1.159 Wed Dec 14 19:10:52 2005 +++ php-src/ext/gd/config.m4Wed Dec 14 22:33:33 2005 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.159 2005/12/14 19:10:52 pajoye Exp $ +dnl $Id: config.m4,v 1.160 2005/12/14 22:33:33 pajoye Exp $ dnl dnl @@ -327,7 +327,6 @@ dnl These defines are always available dnl FIXME: Cleanup the sources so that these are not needed! - AC_DEFINE(HAVE_GD_WBMP, 1, [ ]) AC_DEFINE(HAVE_LIBGD13, 1, [ ]) AC_DEFINE(HAVE_LIBGD15, 1, [ ]) AC_DEFINE(HAVE_LIBGD20, 1, [ ]) http://cvs.php.net/viewcvs.cgi/php-src/ext/gd/config.w32?r1=1.12r2=1.13diff_format=u Index: php-src/ext/gd/config.w32 diff -u php-src/ext/gd/config.w32:1.12 php-src/ext/gd/config.w32:1.13 --- php-src/ext/gd/config.w32:1.12 Wed Dec 14 19:12:57 2005 +++ php-src/ext/gd/config.w32 Wed Dec 14 22:33:33 2005 @@ -1,4 +1,4 @@ -// $Id: config.w32,v 1.12 2005/12/14 19:12:57 pajoye Exp $ +// $Id: config.w32,v 1.13 2005/12/14 22:33:33 pajoye Exp $ // vim:ft=javascript ARG_WITH(gd, Bundled GD support, yes,shared); @@ -43,7 +43,6 @@ /D HAVE_GD_PNG \ /D HAVE_GD_STRINGFTEX=1 \ /D HAVE_GD_STRINGTTF=1 \ -/D HAVE_GD_WBMP \ /D HAVE_GD_XBM \ /D HAVE_LIBFREETYPE=1 \ /D HAVE_LIBGD13=1 \ http://cvs.php.net/viewcvs.cgi/php-src/ext/gd/gd.c?r1=1.324r2=1.325diff_format=u Index: php-src/ext/gd/gd.c diff -u php-src/ext/gd/gd.c:1.324 php-src/ext/gd/gd.c:1.325 --- php-src/ext/gd/gd.c:1.324 Wed Dec 14 19:10:52 2005 +++ php-src/ext/gd/gd.c Wed Dec 14 22:33:33 2005 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: gd.c,v 1.324 2005/12/14 19:10:52 pajoye Exp $ */ +/* $Id: gd.c,v 1.325 2005/12/14 22:33:33 pajoye Exp $ */ /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, Cold Spring Harbor Labs. */ @@ -64,9 +64,8 @@ #include gdfontmb.h /* 3 Medium bold font */ #include gdfontl.h /* 4 Large font */ #include gdfontg.h /* 5 Giant font */ -#ifdef HAVE_GD_WBMP #include libgd/wbmp.h -#endif + #ifdef ENABLE_GD_TTF # ifdef HAVE_LIBFREETYPE # include ft2build.h @@ -229,9 +228,7 @@ #ifdef HAVE_GD_JPG PHP_FE(imagecreatefromjpeg, NULL) #endif -#ifdef HAVE_GD_WBMP PHP_FE(imagecreatefromwbmp, NULL) -#endif #ifdef HAVE_GD_XBM PHP_FE(imagecreatefromxbm, NULL) #endif @@ -250,9 +247,7 @@ #ifdef HAVE_GD_JPG PHP_FE(imagejpeg, NULL) #endif -#ifdef HAVE_GD_WBMP PHP_FE(imagewbmp, NULL) -#endif PHP_FE(imagegd, NULL) PHP_FE(imagegd2, NULL) @@ -299,15 +294,13 @@ #endif PHP_FE(imagetypes, NULL) -#if defined(HAVE_GD_JPG) defined(HAVE_GD_WBMP) +#if defined(HAVE_GD_JPG) PHP_FE(jpeg2wbmp, NULL) #endif -#if defined(HAVE_GD_PNG) defined(HAVE_GD_WBMP) +#if defined(HAVE_GD_PNG) PHP_FE(png2wbmp, NULL) #endif -#ifdef HAVE_GD_WBMP PHP_FE(image2wbmp, NULL) -#endif #if HAVE_GD_BUNDLED PHP_FE(imagelayereffect, NULL) PHP_FE(imagecolormatch, NULL) @@ -512,9 +505,7 @@ #ifdef HAVE_GD_PNG php_info_print_table_row(2, PNG Support, enabled); #endif -#ifdef HAVE_GD_WBMP php_info_print_table_row(2, WBMP Support, enabled); -#endif #if defined(HAVE_GD_XPM) defined(HAVE_GD_BUNDLED) php_info_print_table_row(2, XPM Support, enabled); #endif @@ -577,11 +568,7 @@ #else add_assoc_bool(return_value, PNG Support, 0); #endif -#ifdef HAVE_GD_WBMP add_assoc_bool(return_value, WBMP Support, 1); -#else - add_assoc_bool(return_value, WBMP Support, 0); -#endif #if defined(HAVE_GD_XPM) defined(HAVE_GD_BUNDLED) add_assoc_bool(return_value, XPM Support, 1); #else @@ -1293,9 +1280,7 @@ #ifdef HAVE_GD_PNG ret |= 4; #endif -#ifdef
[PHP-CVS] cvs: php-src /sapi/apache mod_php5.c
andrei Thu Dec 15 00:27:25 2005 EDT
Modified files:
/php-src/sapi/apachemod_php5.c
Log:
I see no reason no reason to not support chunked encoding requests.
Let's ask Apache to decode these requests for us.
http://cvs.php.net/viewcvs.cgi/php-src/sapi/apache/mod_php5.c?r1=1.23r2=1.24diff_format=u
Index: php-src/sapi/apache/mod_php5.c
diff -u php-src/sapi/apache/mod_php5.c:1.23 php-src/sapi/apache/mod_php5.c:1.24
--- php-src/sapi/apache/mod_php5.c:1.23 Tue Oct 18 23:51:36 2005
+++ php-src/sapi/apache/mod_php5.c Thu Dec 15 00:27:25 2005
@@ -17,7 +17,7 @@
| PHP 4.0 patches by Zeev Suraski [EMAIL PROTECTED] |
+--+
*/
-/* $Id: mod_php5.c,v 1.23 2005/10/18 23:51:36 tony2001 Exp $ */
+/* $Id: mod_php5.c,v 1.24 2005/12/15 00:27:25 andrei Exp $ */
#include php_apache_http.h
#include http_conf_globals.h
@@ -593,7 +593,7 @@
/* Apache 1.2 has a more complex mechanism for reading POST
data */
#if MODULE_MAGIC_NUMBER 19961007
- if ((retval = setup_client_block(r, REQUEST_CHUNKED_ERROR))) {
+ if ((retval = setup_client_block(r, REQUEST_CHUNKED_DECHUNK))) {
zend_try {
zend_ini_deactivate(TSRMLS_C);
} zend_end_try();
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) /ext/zlib php_zlib.def
fmk Thu Dec 15 02:25:58 2005 EDT Modified files: (Branch: PHP_5_1) /php-src/ext/zlib php_zlib.def Log: Export symbols needed by pecl/http http://cvs.php.net/viewcvs.cgi/php-src/ext/zlib/php_zlib.def?r1=1.5r2=1.5.2.1diff_format=u Index: php-src/ext/zlib/php_zlib.def diff -u php-src/ext/zlib/php_zlib.def:1.5 php-src/ext/zlib/php_zlib.def:1.5.2.1 --- php-src/ext/zlib/php_zlib.def:1.5 Sat Aug 6 22:18:41 2005 +++ php-src/ext/zlib/php_zlib.def Thu Dec 15 02:25:58 2005 @@ -13,3 +13,6 @@ crc32 inflateReset deflateReset + zlibVersion + zError + \ No newline at end of file -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/zlib php_zlib.def
fmk Thu Dec 15 02:26:14 2005 EDT Modified files: /php-src/ext/zlib php_zlib.def Log: Export symbols needed by pecl/http http://cvs.php.net/viewcvs.cgi/php-src/ext/zlib/php_zlib.def?r1=1.5r2=1.6diff_format=u Index: php-src/ext/zlib/php_zlib.def diff -u php-src/ext/zlib/php_zlib.def:1.5 php-src/ext/zlib/php_zlib.def:1.6 --- php-src/ext/zlib/php_zlib.def:1.5 Sat Aug 6 22:18:41 2005 +++ php-src/ext/zlib/php_zlib.def Thu Dec 15 02:26:14 2005 @@ -13,3 +13,5 @@ crc32 inflateReset deflateReset + zlibVersion + zError -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) /ext/mbstring mbstring.c
iliaa Thu Dec 15 03:36:54 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/mbstring mbstring.c
Log:
Fixed possible memory corruption inside mb_strcut().
http://cvs.php.net/viewcvs.cgi/php-src/ext/mbstring/mbstring.c?r1=1.224.2.7r2=1.224.2.8diff_format=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.224.2.7
php-src/ext/mbstring/mbstring.c:1.224.2.8
--- php-src/ext/mbstring/mbstring.c:1.224.2.7 Tue Dec 6 02:21:01 2005
+++ php-src/ext/mbstring/mbstring.c Thu Dec 15 03:36:53 2005
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: mbstring.c,v 1.224.2.7 2005/12/06 02:21:01 sniper Exp $ */
+/* $Id: mbstring.c,v 1.224.2.8 2005/12/15 03:36:53 iliaa Exp $ */
/*
* PHP 4 Multibyte String module mbstring
@@ -1844,6 +1844,13 @@
}
}
+ if (from Z_STRLEN_PP(arg1)) {
+ RETURN_FALSE;
+ }
+ if (((unsigned) from + (unsigned) len) Z_STRLEN_PP(arg1)) {
+ len = Z_STRLEN_PP(arg1) - from;
+ }
+
ret = mbfl_strcut(string, result, from, len);
if (ret != NULL) {
RETVAL_STRINGL(ret-val, ret-len, 0); /* the string
is already strdup()'ed */
--
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) /ext/mbstring mbstring.c
iliaa Thu Dec 15 03:37:22 2005 EDT
Modified files: (Branch: PHP_4_4)
/php-src/ext/mbstring mbstring.c
Log:
MFH: Fixed possible memory corruption inside mb_strcut().
http://cvs.php.net/viewcvs.cgi/php-src/ext/mbstring/mbstring.c?r1=1.142.2.47.2.5r2=1.142.2.47.2.6diff_format=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.142.2.47.2.5
php-src/ext/mbstring/mbstring.c:1.142.2.47.2.6
--- php-src/ext/mbstring/mbstring.c:1.142.2.47.2.5 Mon Nov 21 23:21:19 2005
+++ php-src/ext/mbstring/mbstring.c Thu Dec 15 03:37:22 2005
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: mbstring.c,v 1.142.2.47.2.5 2005/11/21 23:21:19 hirokawa Exp $ */
+/* $Id: mbstring.c,v 1.142.2.47.2.6 2005/12/15 03:37:22 iliaa Exp $ */
/*
* PHP4 Multibyte String module mbstring
@@ -2485,6 +2485,13 @@
}
}
+ if (from Z_STRLEN_PP(arg1)) {
+ RETURN_FALSE;
+ }
+ if (((unsigned) from + (unsigned) len) Z_STRLEN_PP(arg1)) {
+ len = Z_STRLEN_PP(arg1) - from;
+ }
+
ret = mbfl_strcut(string, result, from, len);
if (ret != NULL) {
RETVAL_STRINGL(ret-val, ret-len, 0); /* the string
is already strdup()'ed */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
