[PHP-CVS] cvs: CVSROOT / avail
sas Tue Mar 11 09:56:28 2003 EDT Modified files: /CVSROOTavail Log: grant smarty karma to messju Index: CVSROOT/avail diff -u CVSROOT/avail:1.605 CVSROOT/avail:1.606 --- CVSROOT/avail:1.605 Mon Mar 10 09:42:07 2003 +++ CVSROOT/avail Tue Mar 11 09:56:28 2003 @@ -71,11 +71,11 @@ # The Smarty Group has access to the Smarty code -avail|mohrt,cellog|smarty +avail|mohrt,cellog,messju|smarty # The Smarty Web Group has access to the Smarty website. -avail|cmv,mohrt,imajes,darkelder|smarty-web +avail|cmv,mohrt,imajes,darkelder,messju|smarty-web # Some CVS modules have a ChangeLog file that is automatically updated # by a program that commits as user 'changelog'. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4_3) /ext/xml/expat expat.h
moriyoshi Tue Mar 11 11:53:32 2003 EDT Modified files: (Branch: PHP_4_3) /php4/ext/xml/expat expat.h Log: Fixed bug #22634 (broken cygwin build) Index: php4/ext/xml/expat/expat.h diff -u php4/ext/xml/expat/expat.h:1.3 php4/ext/xml/expat/expat.h:1.3.8.1 --- php4/ext/xml/expat/expat.h:1.3 Wed Sep 26 20:29:34 2001 +++ php4/ext/xml/expat/expat.h Tue Mar 11 11:53:28 2003 @@ -10,7 +10,7 @@ #include php_compat.h #ifndef XMLPARSEAPI -# if defined(__declspec) !defined(__BEOS__) +# if defined(__declspec) !defined(__BEOS__) !defined(__CYGWIN__) #define XMLPARSEAPI(type) __declspec(dllimport) type __cdecl # else #define XMLPARSEAPI(type) type -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4_3) /sapi/apache2handler php_functions.c
sniper Tue Mar 11 12:22:34 2003 EDT Modified files: (Branch: PHP_4_3) /php4/sapi/apache2handler php_functions.c Log: OnUpdateLong is only in php5/HEAD. (oops! :) Index: php4/sapi/apache2handler/php_functions.c diff -u php4/sapi/apache2handler/php_functions.c:1.1.2.3 php4/sapi/apache2handler/php_functions.c:1.1.2.4 --- php4/sapi/apache2handler/php_functions.c:1.1.2.3Sun Mar 9 22:17:04 2003 +++ php4/sapi/apache2handler/php_functions.cTue Mar 11 12:22:31 2003 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_functions.c,v 1.1.2.3 2003/03/10 03:17:04 sniper Exp $ */ +/* $Id: php_functions.c,v 1.1.2.4 2003/03/11 17:22:31 sniper Exp $ */ #include php.h #include ext/standard/php_smart_str.h @@ -469,9 +469,9 @@ }; PHP_INI_BEGIN() - STD_PHP_INI_ENTRY(xbithack, 0,PHP_INI_ALL,OnUpdateLong, xbithack, php_apache2_info_struct, php_apache2_info) - STD_PHP_INI_ENTRY(engine, 1,PHP_INI_ALL,OnUpdateLong, engine, php_apache2_info_struct, php_apache2_info) - STD_PHP_INI_ENTRY(last_modified, 0,PHP_INI_ALL,OnUpdateLong, last_modified, php_apache2_info_struct, php_apache2_info) + STD_PHP_INI_ENTRY(xbithack, 0,PHP_INI_ALL,OnUpdateInt, xbithack, php_apache2_info_struct, php_apache2_info) + STD_PHP_INI_ENTRY(engine, 1,PHP_INI_ALL, OnUpdateInt,engine, php_apache2_info_struct, php_apache2_info) + STD_PHP_INI_ENTRY(last_modified, 0,PHP_INI_ALL,OnUpdateInt, last_modified, php_apache2_info_struct, php_apache2_info) PHP_INI_END() static PHP_MINIT_FUNCTION(apache) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php4 /ext/xmlrpc xmlrpc-epi-php.c
MFH?! (2nd notice)
--Jani
On Sat, 1 Mar 2003, Wez Furlong wrote:
wezSat Mar 1 10:40:06 2003 EDT
Modified files:
/php4/ext/xmlrpc xmlrpc-epi-php.c
Log:
Fix two crash bugs when optional parameters are not specified.
Fix folding markers.
Index: php4/ext/xmlrpc/xmlrpc-epi-php.c
diff -u php4/ext/xmlrpc/xmlrpc-epi-php.c:1.29 php4/ext/xmlrpc/xmlrpc-epi-php.c:1.30
--- php4/ext/xmlrpc/xmlrpc-epi-php.c:1.29 Tue Jan 14 16:02:14 2003
+++ php4/ext/xmlrpc/xmlrpc-epi-php.c Sat Mar 1 10:40:06 2003
@@ -746,7 +746,7 @@
}
if(return_value_used) {
- zval* retval = decode_request_worker(*xml, *encoding, *method);
+ zval* retval = decode_request_worker(*xml, encoding ? *encoding :
NULL, *method);
if(retval) {
*return_value = *retval;
FREE_ZVAL(retval);
@@ -773,7 +773,7 @@
}
if(return_value_used) {
- zval* retval = decode_request_worker(*arg1, *arg2, NULL);
+ zval* retval = decode_request_worker(*arg1, arg2 ? *arg2 : NULL, NULL);
if(retval) {
*return_value = *retval;
FREE_ZVAL(retval);
@@ -787,7 +787,7 @@
* server related methods *
*/
-/* {{{ proto handle xmlrpc_server_create(void)
+/* {{{ proto resource xmlrpc_server_create(void)
Creates an xmlrpc server */
PHP_FUNCTION(xmlrpc_server_create)
{
@@ -815,8 +815,9 @@
ZEND_REGISTER_RESOURCE(return_value,server, le_xmlrpc_server);
}
}
+/* }}} */
-/* {{{ proto void xmlrpc_server_destroy(handle server)
+/* {{{ proto void xmlrpc_server_destroy(resource server)
Destroys server resources */
PHP_FUNCTION(xmlrpc_server_destroy)
{
@@ -842,6 +843,7 @@
}
RETVAL_LONG(bSuccess == SUCCESS);
}
+/* }}} */
/* called by xmlrpc C engine as method handler for all registered methods.
@@ -942,7 +944,7 @@
zend_hash_clean(Z_ARRVAL_P(pData-server-introspection_map));
}
-/* {{{ proto bool xmlrpc_server_register_method(handle server, string method_name,
string function)
+/* {{{ proto bool xmlrpc_server_register_method(resource server, string method_name,
string function)
Register a PHP function to handle method matching method_name */
PHP_FUNCTION(xmlrpc_server_register_method)
{
@@ -974,9 +976,10 @@
}
RETURN_BOOL(0);
}
+/* }}} */
-/* {{{ proto bool xmlrpc_server_register_introspection_callback(handle server,
string function)
+/* {{{ proto bool xmlrpc_server_register_introspection_callback(resource server,
string function)
Register a PHP function to generate documentation */
PHP_FUNCTION(xmlrpc_server_register_introspection_callback)
{
@@ -1003,11 +1006,12 @@
}
RETURN_BOOL(0);
}
+/* }}} */
/* this function is itchin for a re-write */
-/* {{{ proto mixed xmlrpc_server_call_method(handle server, string xml, mixed
user_data [, array output_options])
+/* {{{ proto mixed xmlrpc_server_call_method(resource server, string xml, mixed
user_data [, array output_options])
Parses XML requests and call methods */
PHP_FUNCTION(xmlrpc_server_call_method)
{
@@ -1126,9 +1130,10 @@
}
}
}
+/* }}} */
-/* {{{ proto int xmlrpc_server_add_introspection_data(handle server, array desc)
+/* {{{ proto int xmlrpc_server_add_introspection_data(resource server, array desc)
Adds introspection documentation */
PHP_FUNCTION(xmlrpc_server_add_introspection_data)
{
@@ -1152,6 +1157,7 @@
}
RETURN_LONG(0);
}
+/* }}} */
/* {{{ proto array xmlrpc_parse_method_descriptions(string xml)
@@ -1191,6 +1197,7 @@
}
}
}
+/* }}} */
/
@@ -1335,15 +1342,15 @@
case IS_NULL:
type = xmlrpc_base64;
break;
- #ifndef BOOL_AS_LONG
+#ifndef BOOL_AS_LONG
/* Right thing to do, but it breaks some legacy code. */
case IS_BOOL:
type = xmlrpc_boolean;
break;
- #else
+#else
case IS_BOOL:
- #endif
+#endif
case IS_LONG:
case IS_RESOURCE:
type = xmlrpc_int;
@@ -1415,6 +1422,7 @@
}
RETURN_FALSE;
}
+/* }}} */
/* {{{ proto string xmlrpc_get_type(mixed value)
Gets xmlrpc type for a PHP value. Especially useful for base64 and datetime
strings */
@@ -1435,6 +1443,7 @@
RETURN_STRING((char*) xmlrpc_type_as_str(type, vtype), 1);
}
+/* }}} */
/* {{{ proto string xmlrpc_is_fault(array)
Determines if an array value represents an XMLRPC fault. */
@@ -1463,6 +1472,7 @@
RETURN_FALSE;
}
+/* }}} */
--
- For Sale! -
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/gd/libgd gd.c xbm.c
iliaa Tue Mar 11 19:51:03 2003 EDT
Modified files:
/php4/ext/gd/libgd gd.c xbm.c
Log:
Style fixes.
Index: php4/ext/gd/libgd/gd.c
diff -u php4/ext/gd/libgd/gd.c:1.47 php4/ext/gd/libgd/gd.c:1.48
--- php4/ext/gd/libgd/gd.c:1.47 Mon Feb 24 22:49:26 2003
+++ php4/ext/gd/libgd/gd.c Tue Mar 11 19:51:03 2003
@@ -2857,134 +2857,6 @@
}
/* End Rotate function */
-#if MBO_0
-gdImagePtr
-gdImageCreateFromXbm (FILE * fd)
-{
- gdImagePtr im;
- int bit;
- int w, h;
- int bytes;
- int ch;
- int i, x, y;
- char *sp;
- char s[161];
- if (!fgets (s, 160, fd))
-{
- return 0;
-}
- sp = s[0];
- /* Skip #define */
- sp = strchr (sp, ' ');
- if (!sp)
-{
- return 0;
-}
- /* Skip width label */
- sp++;
- sp = strchr (sp, ' ');
- if (!sp)
-{
- return 0;
-}
- /* Get width */
- w = atoi (sp + 1);
- if (!w)
-{
- return 0;
-}
- if (!fgets (s, 160, fd))
-{
- return 0;
-}
- sp = s;
- /* Skip #define */
- sp = strchr (sp, ' ');
- if (!sp)
-{
- return 0;
-}
- /* Skip height label */
- sp++;
- sp = strchr (sp, ' ');
- if (!sp)
-{
- return 0;
-}
- /* Get height */
- h = atoi (sp + 1);
- if (!h)
-{
- return 0;
-}
- /* Skip declaration line */
- if (!fgets (s, 160, fd))
-{
- return 0;
-}
- bytes = (w * h / 8) + 1;
- im = gdImageCreate (w, h);
- gdImageColorAllocate (im, 255, 255, 255);
- gdImageColorAllocate (im, 0, 0, 0);
- x = 0;
- y = 0;
- for (i = 0; (i bytes); i++)
-{
- char h[3];
- unsigned int b;
- /* Skip spaces, commas, CRs, 0x */
- while (1)
- {
- ch = getc (fd);
- if (ch == EOF)
- {
- goto fail;
- }
- if (ch == 'x')
- {
- break;
- }
- }
- /* Get hex value */
- ch = getc (fd);
- if (ch == EOF)
- {
- goto fail;
- }
- h[0] = ch;
- ch = getc (fd);
- if (ch == EOF)
- {
- goto fail;
- }
- h[1] = ch;
- h[2] = '\0';
- sscanf (h, %x, b);
- for (bit = 1; (bit = 128); (bit = bit 1))
- {
- gdImageSetPixel (im, x++, y, (b bit) ? 1 : 0);
- if (x == im-sx)
- {
- x = 0;
- y++;
- if (y == im-sy)
- {
- return im;
- }
- /* Fix 8/8/95 */
- break;
- }
- }
-}
- /* Shouldn't happen */
- php_gd_error(Error: bug in gdImageCreateFromXbm\n);
- return 0;
-fail:
- gdImageDestroy (im);
- return 0;
-}
-#endif /* MBO_0 */
-
void
gdImagePolygon (gdImagePtr im, gdPointPtr p, int n, int c)
{
Index: php4/ext/gd/libgd/xbm.c
diff -u php4/ext/gd/libgd/xbm.c:1.1 php4/ext/gd/libgd/xbm.c:1.2
--- php4/ext/gd/libgd/xbm.c:1.1 Sat Feb 1 20:34:54 2003
+++ php4/ext/gd/libgd/xbm.c Tue Mar 11 19:51:03 2003
@@ -1,150 +1,153 @@
-/*
- +--+
- | PHP Version 4|
- +--+
- | Copyright (c) 1997-2003 The PHP Group|
- +--+
- | This source file is subject to version 2.02 of the PHP license, |
- | that is bundled with this package in the file LICENSE, and is|
- | available at through the world-wide-web at |
- | http://www.php.net/license/2_02.txt. |
- | If you did not receive a copy of the PHP license and are unable to |
- | obtain it through the world-wide-web, please send a note to |
- | [EMAIL PROTECTED] so we can mail you a copy immediately. |
- +--+
- | Author: Marcus Boerger [EMAIL PROTECTED] |
- +--+
- */
-
-/* $Id: xbm.c,v 1.1 2003/02/02 01:34:54 helly Exp $ */
-
-#include stdio.h
-#include math.h
-#include string.h
-#include stdlib.h
-#include gd.h
-#include gdhelpers.h
-
-#include php.h
-
-#define MAX_XBM_LINE_SIZE 255
-
-gdImagePtr
-gdImageCreateFromXbm (FILE * fd)
-{
- char fline[MAX_XBM_LINE_SIZE];
- char iname[MAX_XBM_LINE_SIZE];
- char *type;
- int value;
- unsigned int width = 0, height = 0;
- int fail = 0;
- int max_bit = 0;
-
- gdImagePtr im;
- int bytes = 0, i;
- int bit, x = 0, y = 0;
- int ch;
- char h[8];
- unsigned int b;
-
- rewind(fd);
- while (fgets(fline, MAX_XBM_LINE_SIZE, fd)) {
- fline[MAX_XBM_LINE_SIZE-1] = '\0';
- if (strlen(fline) == MAX_XBM_LINE_SIZE-1) {
-
[PHP-CVS] cvs: php4(PHP_4_3) /ext/gd config.m4 gd_bundled.dsp /ext/gd/libgd gd.c xbm.c
iliaa Tue Mar 11 20:02:41 2003 EDT
Added files: (Branch: PHP_4_3)
/php4/ext/gd/libgd xbm.c
Modified files:
/php4/ext/gdconfig.m4 gd_bundled.dsp
/php4/ext/gd/libgd gd.c
Log:
MFH (XBM patch by Marcus Börger)
Index: php4/ext/gd/config.m4
diff -u php4/ext/gd/config.m4:1.120.2.8 php4/ext/gd/config.m4:1.120.2.9
--- php4/ext/gd/config.m4:1.120.2.8 Thu Jan 23 01:22:42 2003
+++ php4/ext/gd/config.m4 Tue Mar 11 20:02:39 2003
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.120.2.8 2003/01/23 06:22:42 sniper Exp $
+dnl $Id: config.m4,v 1.120.2.9 2003/03/12 01:02:39 iliaa Exp $
dnl
dnl
@@ -257,7 +257,8 @@
libgd/gd_io_file.c libgd/gd_ss.c libgd/gd_io_ss.c libgd/gd_png.c
libgd/gd_jpeg.c \
libgd/gdxpm.c libgd/gdfontt.c libgd/gdfonts.c libgd/gdfontmb.c
libgd/gdfontl.c \
libgd/gdfontg.c libgd/gdtables.c libgd/gdft.c libgd/gdcache.c
libgd/gdkanji.c \
- libgd/wbmp.c libgd/gd_wbmp.c libgd/gdhelpers.c libgd/gd_topal.c
libgd/gd_gif_in.c
+ libgd/wbmp.c libgd/gd_wbmp.c libgd/gdhelpers.c libgd/gd_topal.c
libgd/gd_gif_in.c \
+ libgd/xbm.c
dnl check for fabsf and floorf which are available since C99
AC_CHECK_FUNCS(fabsf floorf)
@@ -287,6 +288,7 @@
AC_DEFINE(HAVE_GD_WBMP, 1, [ ])
AC_DEFINE(HAVE_GD_GD2, 1, [ ])
AC_DEFINE(HAVE_GD_PNG, 1, [ ])
+ AC_DEFINE(HAVE_GD_XBM, 1, [ ])
AC_DEFINE(HAVE_GD_BUNDLED, 1, [ ])
AC_DEFINE(HAVE_GD_GIF_READ, 1, [ ])
Index: php4/ext/gd/gd_bundled.dsp
diff -u php4/ext/gd/gd_bundled.dsp:1.7.2.4 php4/ext/gd/gd_bundled.dsp:1.7.2.5
--- php4/ext/gd/gd_bundled.dsp:1.7.2.4 Sun Feb 9 01:26:45 2003
+++ php4/ext/gd/gd_bundled.dsp Tue Mar 11 20:02:40 2003
@@ -43,8 +43,8 @@
# PROP Intermediate_Dir Release_TS
# 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 ..\..\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_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 /MD /W3 /GX /O2 /I ..\.. /I ..\..\main /I ..\..\Zend /I
..\..\..\bindlib_w32 /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_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 BASE CPP /nologo /MD /W3 /GX /O2 /I ..\.. /I ..\..\main /I ..\..\Zend /I
..\..\..\bindlib_w32 /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_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 ..\..\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_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
# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D NDEBUG /mktyplib203 /win32
# ADD MTL /nologo /D NDEBUG /mktyplib203 /win32
@@ -515,6 +515,21 @@
# Begin Source File
SOURCE=.\libgd\wbmp.c
+
+!IF $(CFG) == gd_bundled - Win32 Release_TS GD2
+
+# PROP Intermediate_Dir Release_TS_bundled
+
+!ELSEIF $(CFG) == gd_bundled - Win32 Debug_TS GD2
+
+# PROP Intermediate_Dir Debug_TS_bundled
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\libgd\xbm.c
!IF $(CFG) == gd_bundled - Win32 Release_TS GD2
Index: php4/ext/gd/libgd/gd.c
diff -u php4/ext/gd/libgd/gd.c:1.24.2.5 php4/ext/gd/libgd/gd.c:1.24.2.6
--- php4/ext/gd/libgd/gd.c:1.24.2.5 Wed Mar 5 11:04:20 2003
+++ php4/ext/gd/libgd/gd.c Tue Mar 11 20:02:40 2003
@@ -2857,134 +2857,6 @@
}
/* End Rotate function */
-#if MBO_0
-gdImagePtr
-gdImageCreateFromXbm (FILE * fd)
-{
- gdImagePtr im;
[PHP-CVS] cvs: php4 / NEWS
sniper Tue Mar 11 20:09:27 2003 EDT Modified files: /php4 NEWS Log: This was merged into PHP_4_3 branch.. Index: php4/NEWS diff -u php4/NEWS:1.1372 php4/NEWS:1.1373 --- php4/NEWS:1.1372Mon Mar 10 22:13:05 2003 +++ php4/NEWS Tue Mar 11 20:09:27 2003 @@ -68,7 +68,6 @@ . Support for float modifier. . Detection of numeric values inside strings passed as high low. . Proper handle the situations where high == low. -- Added XBM support for bundled GD library. (Marcus) - Added imagefilter() function. Allows application of various filters. Only available with bundled GD. (Pierre-Alain Joye, Ilia) - Added antialiased drawing support to bundled GD. (Pierre-Alain Joye, Ilia) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4_3) / acinclude.m4
sniper Tue Mar 11 21:26:58 2003 EDT Modified files: (Branch: PHP_4_3) /php4 acinclude.m4 Log: MFH Index: php4/acinclude.m4 diff -u php4/acinclude.m4:1.218.2.9 php4/acinclude.m4:1.218.2.10 --- php4/acinclude.m4:1.218.2.9 Mon Mar 10 09:33:10 2003 +++ php4/acinclude.m4 Tue Mar 11 21:26:58 2003 @@ -1,4 +1,4 @@ -dnl $Id: acinclude.m4,v 1.218.2.9 2003/03/10 14:33:10 sniper Exp $ +dnl $Id: acinclude.m4,v 1.218.2.10 2003/03/12 02:26:58 sniper Exp $ dnl dnl This file contains local autoconf functions. @@ -28,7 +28,7 @@ dnl PHP_INIT_BUILD_SYSTEM dnl AC_DEFUN([PHP_INIT_BUILD_SYSTEM],[ -$php_shtool mkdir include +test -d include || $php_shtool mkdir include Makefile.objects Makefile.fragments dnl We need to play tricks here to avoid matching the egrep line itself -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4_3) /ext/gd gd.c gd_ctx.c
sniper Tue Mar 11 23:16:32 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/gdgd.c gd_ctx.c
Log:
MFH
Index: php4/ext/gd/gd.c
diff -u php4/ext/gd/gd.c:1.221.2.15 php4/ext/gd/gd.c:1.221.2.16
--- php4/ext/gd/gd.c:1.221.2.15 Wed Mar 5 11:08:21 2003
+++ php4/ext/gd/gd.cTue Mar 11 23:16:30 2003
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: gd.c,v 1.221.2.15 2003/03/05 16:08:21 iliaa Exp $ */
+/* $Id: gd.c,v 1.221.2.16 2003/03/12 04:16:30 sniper Exp $ */
/* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -1578,7 +1578,7 @@
}
}
- if ((argc == 2) || (argc == 3 Z_STRLEN_PP(file))) {
+ if ((argc == 2) || (argc 2 Z_STRLEN_PP(file))) {
if (!fn || fn == empty_string || php_check_open_basedir(fn TSRMLS_CC))
{
php_error_docref(NULL TSRMLS_CC, E_WARNING, Invalid filename
'%s', fn);
RETURN_FALSE;
Index: php4/ext/gd/gd_ctx.c
diff -u php4/ext/gd/gd_ctx.c:1.15 php4/ext/gd/gd_ctx.c:1.15.2.1
--- php4/ext/gd/gd_ctx.c:1.15 Tue Oct 29 20:05:16 2002
+++ php4/ext/gd/gd_ctx.cTue Mar 11 23:16:31 2003
@@ -50,7 +50,7 @@
}
}
- if ((argc == 2) || (argc == 3 Z_STRLEN_PP(file))) {
+ if ((argc == 2) || (argc 2 Z_STRLEN_PP(file))) {
if (!fn || fn == empty_string || php_check_open_basedir(fn TSRMLS_CC))
{
php_error_docref(NULL TSRMLS_CC, E_WARNING, Invalid filename
'%s', fn);
RETURN_FALSE;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/gd gd.c
sniper Tue Mar 11 23:29:52 2003 EDT Modified files: /php4/ext/gdgd.c Log: Added the type constants for imagegd2() Index: php4/ext/gd/gd.c diff -u php4/ext/gd/gd.c:1.253 php4/ext/gd/gd.c:1.254 --- php4/ext/gd/gd.c:1.253 Tue Mar 11 23:15:26 2003 +++ php4/ext/gd/gd.cTue Mar 11 23:29:51 2003 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: gd.c,v 1.253 2003/03/12 04:15:26 sniper Exp $ */ +/* $Id: gd.c,v 1.254 2003/03/12 04:29:51 sniper Exp $ */ /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, Cold Spring Harbor Labs. */ @@ -389,6 +389,13 @@ REGISTER_LONG_CONSTANT(IMG_ARC_CHORD, gdChord, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT(IMG_ARC_NOFILL, gdNoFill, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT(IMG_ARC_EDGED, gdEdged, CONST_CS | CONST_PERSISTENT); +#endif +/* GD2 image format types */ +#ifdef GD2_FMT_RAW + REGISTER_LONG_CONSTANT(IMG_GD2_RAW, GD2_FMT_RAW, CONST_CS | CONST_PERSISTENT); +#endif +#ifdef GD2_FMT_COMPRESSED + REGISTER_LONG_CONSTANT(IMG_GD2_COMPRESSED, GD2_FMT_COMPRESSED, CONST_CS | CONST_PERSISTENT); #endif #if HAVE_GD_BUNDLED REGISTER_LONG_CONSTANT(IMG_EFFECT_REPLACE, gdEffectReplace, CONST_CS | CONST_PERSISTENT); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4_3) /ext/odbc php_odbc.c
iliaa Tue Mar 11 23:46:15 2003 EDT Modified files: (Branch: PHP_4_3) /php4/ext/odbc php_odbc.c Log: MFH Index: php4/ext/odbc/php_odbc.c diff -u php4/ext/odbc/php_odbc.c:1.143.2.5 php4/ext/odbc/php_odbc.c:1.143.2.6 --- php4/ext/odbc/php_odbc.c:1.143.2.5 Tue Mar 4 11:35:02 2003 +++ php4/ext/odbc/php_odbc.cTue Mar 11 23:46:15 2003 @@ -20,7 +20,7 @@ +--+ */ -/* $Id: php_odbc.c,v 1.143.2.5 2003/03/04 16:35:02 iliaa Exp $ */ +/* $Id: php_odbc.c,v 1.143.2.6 2003/03/12 04:46:15 iliaa Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -2174,7 +2174,7 @@ pval **pv_db, **pv_uid, **pv_pwd, **pv_opt; odbc_connection *db_conn; char *hashed_details; - int hashed_len, len, cur_opt; + int hashed_len, cur_opt; /* Now an optional 4th parameter specifying the cursor type * defaulting to the cursors default @@ -2220,7 +2220,7 @@ persistent = 0; } - hashed_len = spprintf(hashed_details, 0, %s_%s_%s_%s_%d, ODBC_TYPE, db, uid, pwd, cur_opt); + hashed_len = spprintf(hashed_details, 0, %s_%s_%s_%s_%d, ODBC_TYPE, db, uid, pwd, cur_opt); /* FIXME the idea of checking to see if our connection is already persistent is good, but it adds a lot of overhead to non-persistent connections. We -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/standard basic_functions.c file.c file.h
sterlingWed Mar 12 01:47:35 2003 EDT
Modified files:
/php4/ext/standard basic_functions.c file.c file.h
Log:
@ Add the file_set_contents() function, as a complement to the file_get_contents()
@ function. (Sterling)
Index: php4/ext/standard/basic_functions.c
diff -u php4/ext/standard/basic_functions.c:1.595
php4/ext/standard/basic_functions.c:1.596
--- php4/ext/standard/basic_functions.c:1.595 Sun Mar 9 18:12:31 2003
+++ php4/ext/standard/basic_functions.c Wed Mar 12 01:47:34 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.c,v 1.595 2003/03/09 23:12:31 pollita Exp $ */
+/* $Id: basic_functions.c,v 1.596 2003/03/12 06:47:34 sterling Exp $ */
#include php.h
#include php_streams.h
@@ -672,6 +672,7 @@
PHP_STATIC_FE(tmpfile,php_if_tmpfile,
NULL)
PHP_FE(file,
NULL)
PHP_FE(file_get_contents,
NULL)
+ PHP_FE(file_set_contents,
NULL)
PHP_FE(stream_select,
first_through_third_args_force_ref)
PHP_FE(stream_context_create,
NULL)
PHP_FE(stream_context_set_params,
NULL)
Index: php4/ext/standard/file.c
diff -u php4/ext/standard/file.c:1.324 php4/ext/standard/file.c:1.325
--- php4/ext/standard/file.c:1.324 Fri Mar 7 00:15:23 2003
+++ php4/ext/standard/file.cWed Mar 12 01:47:34 2003
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: file.c,v 1.324 2003/03/07 05:15:23 sniper Exp $ */
+/* $Id: file.c,v 1.325 2003/03/12 06:47:34 sterling Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
@@ -458,6 +458,34 @@
}
/* }}} */
+
+/* {{{ proto string file_set_contents(string file, string data)
+ Write/Create a file with contents data */
+PHP_FUNCTION(file_set_contents)
+{
+ php_stream *stream;
+ char *filename, *data;
+ size_t filename_len, data_len;
+ int numbytes;
+ zend_bool use_include_path = 0;
+
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, ss|b, filename,
filename_len,
+ data, data_len, use_include_path) == FAILURE) {
+ return;
+ }
+
+ stream = php_stream_open_wrapper(filename, wb,
+ (use_include_path ? USE_PATH : 0) | ENFORCE_SAFE_MODE |
REPORT_ERRORS, NULL);
+ if (data_len) {
+ numbytes = php_stream_write(stream, data, data_len);
+ if (numbytes 0) {
+ RETURN_FALSE;
+ }
+ }
+ php_stream_close(stream);
+
+ RETURN_TRUE;
+}
/* {{{ proto array file(string filename [, int flags])
Read entire file into an array */
Index: php4/ext/standard/file.h
diff -u php4/ext/standard/file.h:1.79 php4/ext/standard/file.h:1.80
--- php4/ext/standard/file.h:1.79 Fri Feb 28 14:53:20 2003
+++ php4/ext/standard/file.hWed Mar 12 01:47:34 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: file.h,v 1.79 2003/02/28 19:53:20 wez Exp $ */
+/* $Id: file.h,v 1.80 2003/03/12 06:47:34 sterling Exp $ */
/* Synced with php 3.0 revision 1.30 1999-06-16 [ssb] */
@@ -54,6 +54,7 @@
PHP_FUNCTION(copy);
PHP_FUNCTION(file);
PHP_FUNCTION(file_get_contents);
+PHP_FUNCTION(file_set_contents);
PHP_FUNCTION(get_meta_tags);
PHP_FUNCTION(flock);
PHP_FUNCTION(fd_set);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
