[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Sun Nov 5 01:32:15 2006 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.2502r2=1.2503diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.2502 php-src/ChangeLog:1.2503 --- php-src/ChangeLog:1.2502Sat Nov 4 01:31:11 2006 +++ php-src/ChangeLog Sun Nov 5 01:32:14 2006 @@ -1,3 +1,97 @@ +2006-11-04 Marcus Boerger [EMAIL PROTECTED] + +* (PHP_5_2) + ext/exif/exif.c: + - MFH: Make parameter parsing api check happy + +* ext/exif/exif.c: + - Make parameter parsing api check happy + +2006-11-04 Rasmus Lerdorf [EMAIL PROTECTED] + +* main/streams/memory.c + main/streams/memory.c: + Mark memory streams as is_url + +2006-11-04 Marcus Boerger [EMAIL PROTECTED] + +* (PHP_5_2) + ext/spl/php_spl.c + ext/spl/php_spl.h: + - MFH Store length of autoload file exts + +* ext/spl/php_spl.c + ext/spl/php_spl.h: + - Store length of autoload file exts + +* ext/spl/php_spl.c: + - Mark some funcs as unicode ready + +2006-11-04 Frank M. Kromann [EMAIL PROTECTED] + +* ext/mbstring/config.w32 + ext/mbstring/config.w32: + Fix win32 build + +2006-11-04 Pierre-Alain Joye [EMAIL PROTECTED] + +* ext/gd/libgd/.cvsignore: + - MFB: update cvsignore + +* (PHP_5_2) + ext/gd/libgd/gd_png.c: + - WS + +* ext/gd/libgd/gd_png.c: + - Fixed filter argument for imagepng in gdImagePngEx + +* ext/gd/libgd/gd_gif_in.c: + - MFB: vim folding + +* ext/gd/libgd/gd_gd2.c: + - MFB: silent compiler warnings + +* (PHP_5_2) + NEWS + ext/gd/libgd/gd.c: + - MFH: optimize horizontal and vertical lines + +* ext/gd/libgd/gd.c: + - ws + +2006-11-04 Hannes Magnusson [EMAIL PROTECTED] + +* (PHP_5_2) + sapi/apache2filter/sapi_apache2.c: + Fix build + +2006-11-04 Pierre-Alain Joye [EMAIL PROTECTED] + +* (PHP_5_2) + NEWS + ext/gd/libgd/gd.c + ext/gd/tests/bug39366.phpt: + - MFH #39366, imagerotate does not use alpha with angles45 + +* ext/gd/libgd/gd.c + ext/gd/tests/bug39366.phpt + ext/gd/tests/bug39366.phpt: + - #39366, imagerotate does not use alpha with angles45 + +* (PHP_5_2) + NEWS: + - #39273 entry + +* ext/gd/libgd/gd.c + ext/gd/tests/bug39273.phpt: + - MFB: #39273, imagecopyresized and alpha channel + +* (PHP_5_2) + ext/gd/libgd/gd.c + ext/gd/tests/bug39273.phpt + ext/gd/tests/bug39273.phpt: + - #39273, imagecopyresized and alpha channel + 2006-11-03 Ilia Alshanetsky [EMAIL PROTECTED] * (PHP_5_2)
[PHP-CVS] cvs: php-src(PHP_5_2) /sapi/apache2filter sapi_apache2.c
bjori Sat Nov 4 13:03:56 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/sapi/apache2filter sapi_apache2.c
Log:
Fix build
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2filter/sapi_apache2.c?r1=1.136.2.2.2.4r2=1.136.2.2.2.5diff_format=u
Index: php-src/sapi/apache2filter/sapi_apache2.c
diff -u php-src/sapi/apache2filter/sapi_apache2.c:1.136.2.2.2.4
php-src/sapi/apache2filter/sapi_apache2.c:1.136.2.2.2.5
--- php-src/sapi/apache2filter/sapi_apache2.c:1.136.2.2.2.4 Fri Nov 3
13:51:47 2006
+++ php-src/sapi/apache2filter/sapi_apache2.c Sat Nov 4 13:03:56 2006
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: sapi_apache2.c,v 1.136.2.2.2.4 2006/11/03 13:51:47 iliaa Exp $ */
+/* $Id: sapi_apache2.c,v 1.136.2.2.2.5 2006/11/04 13:03:56 bjori Exp $ */
#include fcntl.h
@@ -210,6 +210,7 @@
php_struct *ctx = SG(server_context);
const apr_array_header_t *arr = apr_table_elts(ctx-r-subprocess_env);
char *key, *val;
+ int new_val_len;
APR_ARRAY_FOREACH_OPEN(arr, key, val)
if (!val) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/gd/libgd gd.c
pajoye Sat Nov 4 14:22:24 2006 UTC
Modified files:
/php-src/ext/gd/libgd gd.c
Log:
- ws
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/libgd/gd.c?r1=1.97r2=1.98diff_format=u
Index: php-src/ext/gd/libgd/gd.c
diff -u php-src/ext/gd/libgd/gd.c:1.97 php-src/ext/gd/libgd/gd.c:1.98
--- php-src/ext/gd/libgd/gd.c:1.97 Sat Nov 4 03:12:36 2006
+++ php-src/ext/gd/libgd/gd.c Sat Nov 4 14:22:23 2006
@@ -1042,10 +1042,7 @@
gdImageSetPixel(im, x1,y1, color);
}
return;
- }
-
- /* Horizontal */
- if (y1==y2) {
+ } else if (y1==y2) { /* Horizontal */
if (x2 x1) {
t = x2;
x2 = x1;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/gd/libgd gd.c
pajoye Sat Nov 4 14:27:07 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-srcNEWS
/php-src/ext/gd/libgd gd.c
Log:
- MFH: optimize horizontal and vertical lines
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.329r2=1.2027.2.547.2.330diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.329 php-src/NEWS:1.2027.2.547.2.330
--- php-src/NEWS:1.2027.2.547.2.329 Sat Nov 4 03:15:31 2006
+++ php-src/NEWSSat Nov 4 14:27:06 2006
@@ -11,6 +11,7 @@
. Make sure PHP_SELF is filtered in Apache 1 sapi.
. Fixed bug #39358 (INSTALL_HEADERS contains incorrect reference to
php_filter.h).
+- Added optimization for imageline with horizontal and vertial lines (Pierre)
- Fixed bug #39366 (imagerotate does not use alpha with angle 45°) (Pierre)
- Fixed bug #39273 (imagecopyresized may ignore alpha channel) (Pierre)
- Fixed bug #39364 (Removed warning on empty haystack inside mb_strstr()).
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/libgd/gd.c?r1=1.90.2.1.2.4r2=1.90.2.1.2.5diff_format=u
Index: php-src/ext/gd/libgd/gd.c
diff -u php-src/ext/gd/libgd/gd.c:1.90.2.1.2.4
php-src/ext/gd/libgd/gd.c:1.90.2.1.2.5
--- php-src/ext/gd/libgd/gd.c:1.90.2.1.2.4 Sat Nov 4 03:15:31 2006
+++ php-src/ext/gd/libgd/gd.c Sat Nov 4 14:27:07 2006
@@ -1019,6 +1019,7 @@
/* Bresenham as presented in Foley Van Dam */
void gdImageLine (gdImagePtr im, int x1, int y1, int x2, int y2, int color)
{
+ int t;
int dx, dy, incr1, incr2, d, x, y, xend, yend, xdirflag, ydirflag;
int wid;
int w, wstart;
@@ -1029,6 +1030,31 @@
return;
}
+ /* Vertical */
+ if (x1==x2) {
+ if (y2 y1) {
+ t = y2;
+ y2 = y1;
+ y1 = t;
+ }
+
+ for (;y1 = y2; y1++) {
+ gdImageSetPixel(im, x1,y1, color);
+ }
+ return;
+ } else if (y1==y2) {/* Horizontal */
+ if (x2 x1) {
+ t = x2;
+ x2 = x1;
+ x1 = t;
+ }
+
+ for (;x1 = x2; x1++) {
+ gdImageSetPixel(im, x1,y1, color);
+ }
+ return;
+ }
+
/* gdAntiAliased passed as color: set anti-aliased line (AAL) global
vars. */
if (color == gdAntiAliased) {
im-AAL_x1 = x1;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/gd/libgd gd_gd2.c
pajoye Sat Nov 4 14:29:00 2006 UTC
Modified files:
/php-src/ext/gd/libgd gd_gd2.c
Log:
- MFB: silent compiler warnings
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/libgd/gd_gd2.c?r1=1.18r2=1.19diff_format=u
Index: php-src/ext/gd/libgd/gd_gd2.c
diff -u php-src/ext/gd/libgd/gd_gd2.c:1.18 php-src/ext/gd/libgd/gd_gd2.c:1.19
--- php-src/ext/gd/libgd/gd_gd2.c:1.18 Wed Jul 26 08:51:53 2006
+++ php-src/ext/gd/libgd/gd_gd2.c Sat Nov 4 14:29:00 2006
@@ -544,7 +544,7 @@
chunkNum = cx + cy * ncx;
chunkLen = chunkMax;
- if (!_gd2ReadChunk (chunkIdx[chunkNum].offset,
compBuf, chunkIdx[chunkNum].size, chunkBuf, chunkLen, in)) {
+ if (!_gd2ReadChunk (chunkIdx[chunkNum].offset,
compBuf, chunkIdx[chunkNum].size, (char *)chunkBuf, chunkLen, in)) {
php_gd_error(Error reading comproessed
chunk);
goto fail2;
}
@@ -558,7 +558,7 @@
for (x = xlo; x xhi; x++) {
if (!gd2_compressed(fmt)) {
if (im-trueColor) {
- if (!gdGetInt(ch, in))
{
+ if (!gdGetInt((int
*)ch, in)) {
ch = 0;
}
} else {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/gd/libgd gd_gif_in.c
pajoye Sat Nov 4 14:32:24 2006 UTC
Modified files:
/php-src/ext/gd/libgd gd_gif_in.c
Log:
- MFB: vim folding
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/libgd/gd_gif_in.c?r1=1.11r2=1.12diff_format=u
Index: php-src/ext/gd/libgd/gd_gif_in.c
diff -u php-src/ext/gd/libgd/gd_gif_in.c:1.11
php-src/ext/gd/libgd/gd_gif_in.c:1.12
--- php-src/ext/gd/libgd/gd_gif_in.c:1.11 Mon Jul 17 15:08:46 2006
+++ php-src/ext/gd/libgd/gd_gif_in.cSat Nov 4 14:32:23 2006
@@ -78,7 +78,7 @@
int ZeroDataBlock;
-gdImagePtr gdImageCreateFromGifSource(gdSourcePtr inSource)
+gdImagePtr gdImageCreateFromGifSource(gdSourcePtr inSource) /* {{{ */
{
gdIOCtx *in = gdNewSSCtx(inSource, NULL);
gdImagePtr im;
@@ -89,9 +89,9 @@
return im;
}
+/* }}} */
- gdImagePtr
-gdImageCreateFromGif(FILE *fdFile)
+gdImagePtr gdImageCreateFromGif(FILE *fdFile) /* {{{ */
{
gdIOCtx *fd = gdNewFileCtx(fdFile);
gdImagePtr im = 0;
@@ -102,8 +102,9 @@
return im;
}
+/* }}} */
-gdImagePtr gdImageCreateFromGifCtx(gdIOCtxPtr fd)
+gdImagePtr gdImageCreateFromGifCtx(gdIOCtxPtr fd) /* {{{ */
{
/* 1.4 int imageNumber; */
int BitPixel;
@@ -205,6 +206,7 @@
BitSet(buf[8], INTERLACE));
/*1.4//imageCount != imageNumber); */
}
+
if (Transparent != (-1)) {
gdImageColorTransparent(im, Transparent);
}
@@ -234,8 +236,9 @@
}
return im;
}
+/* }}} */
-static int ReadColorMap(gdIOCtx *fd, int number, unsigned char (*buffer)[256])
+static int ReadColorMap(gdIOCtx *fd, int number, unsigned char (*buffer)[256])
/* {{{ */
{
int i;
unsigned char rgb[3];
@@ -253,8 +256,9 @@
return FALSE;
}
+/* }}} */
-static int DoExtension(gdIOCtx *fd, int label, int *Transparent)
+static int DoExtension(gdIOCtx *fd, int label, int *Transparent) /* {{{ */
{
static unsigned char buf[256];
@@ -278,9 +282,9 @@
return FALSE;
}
+/* }}} */
- static int
-GetDataBlock_(gdIOCtx *fd, unsigned char *buf)
+static int GetDataBlock_(gdIOCtx *fd, unsigned char *buf) /* {{{ */
{
unsigned char count;
@@ -296,8 +300,9 @@
return count;
}
+/* }}} */
-static int GetDataBlock(gdIOCtx *fd, unsigned char *buf)
+static int GetDataBlock(gdIOCtx *fd, unsigned char *buf) /* {{{ */
{
int rv;
int i;
@@ -318,8 +323,9 @@
}
return(rv);
}
+/* }}} */
-static int GetCode_(gdIOCtx *fd, int code_size, int flag)
+static int GetCode_(gdIOCtx *fd, int code_size, int flag) /* {{{ */
{
static unsigned charbuf[280];
static int curbit, lastbit, done, last_byte;
@@ -359,8 +365,7 @@
return ret;
}
- static int
-GetCode(gdIOCtx *fd, int code_size, int flag)
+static int GetCode(gdIOCtx *fd, int code_size, int flag) /* {{{ */
{
int rv;
@@ -368,9 +373,10 @@
if (VERBOSE) php_gd_error_ex(E_NOTICE, [GetCode(,%d,%d) returning
%d],code_size,flag,rv);
return(rv);
}
+/* }}} */
#define STACK_SIZE ((1(MAX_LWZ_BITS))*2)
-static int LWZReadByte_(gdIOCtx *fd, int flag, int input_code_size)
+static int LWZReadByte_(gdIOCtx *fd, int flag, int input_code_size) /* {{{ */
{
static int fresh = FALSE;
int code, incode;
@@ -489,8 +495,9 @@
}
return code;
}
+/* }}} */
-static int LWZReadByte(gdIOCtx *fd, int flag, int input_code_size)
+static int LWZReadByte(gdIOCtx *fd, int flag, int input_code_size) /* {{{ */
{
int rv;
@@ -498,8 +505,9 @@
if (VERBOSE) php_gd_error_ex(E_NOTICE, [LWZReadByte(,%d,%d) returning
%d],flag,input_code_size,rv);
return(rv);
}
+/* }}} */
-static void ReadImage(gdImagePtr im, gdIOCtx *fd, int len, int height,
unsigned char (*cmap)[256], int interlace) /*1.4//, int ignore) */
+static void ReadImage(gdImagePtr im, gdIOCtx *fd, int len, int height,
unsigned char (*cmap)[256], int interlace) /* {{{ */ /*1.4//, int ignore) */
{
unsigned char c;
int v;
@@ -586,4 +594,4 @@
/* Ignore extra */
}
}
-
+/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/gd/libgd gd_png.c
pajoye Sat Nov 4 14:34:04 2006 UTC
Modified files:
/php-src/ext/gd/libgd gd_png.c
Log:
- Fixed filter argument for imagepng in gdImagePngEx
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/libgd/gd_png.c?r1=1.20r2=1.21diff_format=u
Index: php-src/ext/gd/libgd/gd_png.c
diff -u php-src/ext/gd/libgd/gd_png.c:1.20 php-src/ext/gd/libgd/gd_png.c:1.21
--- php-src/ext/gd/libgd/gd_png.c:1.20 Wed Oct 11 00:21:33 2006
+++ php-src/ext/gd/libgd/gd_png.c Sat Nov 4 14:34:04 2006
@@ -390,7 +390,7 @@
void gdImagePngEx (gdImagePtr im, FILE * outFile, int level, int basefilter)
{
gdIOCtx *out = gdNewFileCtx(outFile);
- gdImagePngCtxEx(im, out, level, -1);
+ gdImagePngCtxEx(im, out, level, basefilter);
out-gd_free(out);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/gd/libgd gd_png.c
pajoye Sat Nov 4 14:34:33 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/gd/libgd gd_png.c
Log:
- WS
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/libgd/gd_png.c?r1=1.17.4.2.2.1r2=1.17.4.2.2.2diff_format=u
Index: php-src/ext/gd/libgd/gd_png.c
diff -u php-src/ext/gd/libgd/gd_png.c:1.17.4.2.2.1
php-src/ext/gd/libgd/gd_png.c:1.17.4.2.2.2
--- php-src/ext/gd/libgd/gd_png.c:1.17.4.2.2.1 Wed Oct 11 00:19:12 2006
+++ php-src/ext/gd/libgd/gd_png.c Sat Nov 4 14:34:33 2006
@@ -490,7 +490,7 @@
if (basefilter = 0) {
png_set_filter(png_ptr, PNG_FILTER_TYPE_BASE, basefilter);
}
-
+
/* can set this to a smaller value without compromising compression if
all
* image data is 16K or less; will save some decoder memory [min == 8]
*/
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/gd/libgd .cvsignore
pajoye Sat Nov 4 14:36:18 2006 UTC Modified files: /php-src/ext/gd/libgd .cvsignore Log: - MFB: update cvsignore http://cvs.php.net/viewvc.cgi/php-src/ext/gd/libgd/.cvsignore?r1=1.2r2=1.3diff_format=u Index: php-src/ext/gd/libgd/.cvsignore diff -u php-src/ext/gd/libgd/.cvsignore:1.2 php-src/ext/gd/libgd/.cvsignore:1.3 --- php-src/ext/gd/libgd/.cvsignore:1.2 Sun Oct 10 16:09:45 2004 +++ php-src/ext/gd/libgd/.cvsignore Sat Nov 4 14:36:18 2006 @@ -13,3 +13,4 @@ Debug_TS *.gcda *.gcno +.libs -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/mbstring config.w32
fmk Sat Nov 4 17:25:14 2006 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/mbstring config.w32 Log: Fix win32 build http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/config.w32?r1=1.10.2.1.2.2r2=1.10.2.1.2.3diff_format=u Index: php-src/ext/mbstring/config.w32 diff -u php-src/ext/mbstring/config.w32:1.10.2.1.2.2 php-src/ext/mbstring/config.w32:1.10.2.1.2.3 --- php-src/ext/mbstring/config.w32:1.10.2.1.2.2Thu Sep 21 16:37:20 2006 +++ php-src/ext/mbstring/config.w32 Sat Nov 4 17:25:14 2006 @@ -1,4 +1,4 @@ -// $Id: config.w32,v 1.10.2.1.2.2 2006/09/21 16:37:20 masugata Exp $ +// $Id: config.w32,v 1.10.2.1.2.3 2006/11/04 17:25:14 fmk Exp $ // vim:ft=javascript ARG_ENABLE(mbstring, multibyte string functions, no); @@ -21,8 +21,8 @@ ADD_SOURCES(ext/mbstring/libmbfl/filters, html_entities.c \ mbfilter_7bit.c mbfilter_ascii.c mbfilter_base64.c mbfilter_big5.c \ mbfilter_byte2.c mbfilter_byte4.c mbfilter_cp1251.c mbfilter_cp1252.c \ - mbfilter_cp866.c mbfilter_cp932.c mbfilter_cp936.c mbfilter_euc_cn.c \ - mbfilter_euc_jp.c mbfilter_euc_jp_win.c mbfilter_euc_kr.c \ + mbfilter_cp866.c mbfilter_cp932.c mbfilter_cp936.c mbfilter_cp51932.c \ + mbfilter_euc_cn.c mbfilter_euc_jp.c mbfilter_euc_jp_win.c mbfilter_euc_kr.c \ mbfilter_euc_tw.c mbfilter_htmlent.c mbfilter_hz.c mbfilter_iso2022_kr.c \ mbfilter_iso8859_1.c mbfilter_iso8859_10.c mbfilter_iso8859_13.c \ mbfilter_iso8859_14.c mbfilter_iso8859_15.c mbfilter_iso8859_16.c \ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mbstring config.w32
fmk Sat Nov 4 17:25:37 2006 UTC Modified files: /php-src/ext/mbstring config.w32 Log: Fix win32 build http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/config.w32?r1=1.11r2=1.12diff_format=u Index: php-src/ext/mbstring/config.w32 diff -u php-src/ext/mbstring/config.w32:1.11 php-src/ext/mbstring/config.w32:1.12 --- php-src/ext/mbstring/config.w32:1.11Fri Dec 23 13:53:30 2005 +++ php-src/ext/mbstring/config.w32 Sat Nov 4 17:25:37 2006 @@ -1,4 +1,4 @@ -// $Id: config.w32,v 1.11 2005/12/23 13:53:30 hirokawa Exp $ +// $Id: config.w32,v 1.12 2006/11/04 17:25:37 fmk Exp $ // vim:ft=javascript ARG_ENABLE(mbstring, multibyte string functions, no); @@ -20,8 +20,8 @@ ADD_SOURCES(ext/mbstring/libmbfl/filters, html_entities.c \ mbfilter_7bit.c mbfilter_ascii.c mbfilter_base64.c mbfilter_big5.c \ mbfilter_byte2.c mbfilter_byte4.c mbfilter_cp1251.c mbfilter_cp1252.c \ - mbfilter_cp866.c mbfilter_cp932.c mbfilter_cp936.c mbfilter_euc_cn.c \ - mbfilter_euc_jp.c mbfilter_euc_jp_win.c mbfilter_euc_kr.c \ + mbfilter_cp866.c mbfilter_cp932.c mbfilter_cp936.c mbfilter_cp51932.c \ + mbfilter_euc_cn.c mbfilter_euc_jp.c mbfilter_euc_jp_win.c mbfilter_euc_kr.c \ mbfilter_euc_tw.c mbfilter_htmlent.c mbfilter_hz.c mbfilter_iso2022_kr.c \ mbfilter_iso8859_1.c mbfilter_iso8859_10.c mbfilter_iso8859_13.c \ mbfilter_iso8859_14.c mbfilter_iso8859_15.c mbfilter_iso8859_16.c \ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/spl php_spl.c
helly Sat Nov 4 20:12:27 2006 UTC
Modified files:
/php-src/ext/splphp_spl.c
Log:
- Mark some funcs as unicode ready
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/php_spl.c?r1=1.97r2=1.98diff_format=u
Index: php-src/ext/spl/php_spl.c
diff -u php-src/ext/spl/php_spl.c:1.97 php-src/ext/spl/php_spl.c:1.98
--- php-src/ext/spl/php_spl.c:1.97 Tue Oct 31 23:18:00 2006
+++ php-src/ext/spl/php_spl.c Sat Nov 4 20:12:26 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_spl.c,v 1.97 2006/10/31 23:18:00 helly Exp $ */
+/* $Id: php_spl.c,v 1.98 2006/11/04 20:12:26 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -83,7 +83,7 @@
return *ce;
}
-/* {{{ proto array class_parents(object instance)
+/* {{{ proto array class_parents(object instance) U
Return an array containing the names of all parent classes */
PHP_FUNCTION(class_parents)
{
@@ -117,7 +117,7 @@
}
/* }}} */
-/* {{{ proto array class_implements(mixed what [, bool autoload ])
+/* {{{ proto array class_implements(mixed what [, bool autoload ]) U
Return all classes and interfaces implemented by SPL */
PHP_FUNCTION(class_implements)
{
@@ -194,7 +194,7 @@
SPL_ADD_CLASS(UnderflowException, z_list, sub, allow, ce_flags); \
SPL_ADD_CLASS(UnexpectedValueException, z_list, sub, allow, ce_flags); \
-/* {{{ proto array spl_classes()
+/* {{{ proto array spl_classes() U
Return an array containing the names of all clsses and interfaces defined in
SPL */
PHP_FUNCTION(spl_classes)
{
@@ -388,7 +388,7 @@
}
} /* }}} */
-/* {{{ proto bool spl_autoload_register([mixed autoload_function =
spl_autoload [, throw = true]])
+/* {{{ proto bool spl_autoload_register([mixed autoload_function =
spl_autoload [, throw = true]]) U
Register given function as __autoload() implementation */
PHP_FUNCTION(spl_autoload_register)
{
@@ -493,7 +493,7 @@
RETURN_TRUE;
} /* }}} */
-/* {{{ proto bool spl_autoload_unregister(mixed autoload_function)
+/* {{{ proto bool spl_autoload_unregister(mixed autoload_function) U
Unregister given function as __autoload() implementation */
PHP_FUNCTION(spl_autoload_unregister)
{
@@ -544,7 +544,7 @@
RETURN_BOOL(success == SUCCESS);
} /* }}} */
-/* {{{ proto false|array spl_autoload_functions()
+/* {{{ proto false|array spl_autoload_functions() U
Return all registered __autoload() functionns */
PHP_FUNCTION(spl_autoload_functions)
{
@@ -587,7 +587,7 @@
add_next_index_text(return_value,
EG(autoload_func)-common.function_name, 1);
} /* }}} */
-/* {{{ proto string spl_object_hash(object obj)
+/* {{{ proto string spl_object_hash(object obj) U
Return hash id for given object */
PHP_FUNCTION(spl_object_hash)
{
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/spl php_spl.c php_spl.h
helly Sat Nov 4 20:22:29 2006 UTC
Modified files:
/php-src/ext/splphp_spl.c php_spl.h
Log:
- Store length of autoload file exts
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/php_spl.c?r1=1.98r2=1.99diff_format=u
Index: php-src/ext/spl/php_spl.c
diff -u php-src/ext/spl/php_spl.c:1.98 php-src/ext/spl/php_spl.c:1.99
--- php-src/ext/spl/php_spl.c:1.98 Sat Nov 4 20:12:26 2006
+++ php-src/ext/spl/php_spl.c Sat Nov 4 20:22:29 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_spl.c,v 1.98 2006/11/04 20:12:26 helly Exp $ */
+/* $Id: php_spl.c,v 1.99 2006/11/04 20:22:29 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -55,9 +55,10 @@
*/
static PHP_GINIT_FUNCTION(spl)
{
- spl_globals-autoload_extensions = NULL;
- spl_globals-autoload_functions = NULL;
- spl_globals-autoload_running= 0;
+ spl_globals-autoload_extensions = NULL;
+ spl_globals-autoload_extensions_len = 0;
+ spl_globals-autoload_functions = NULL;
+ spl_globals-autoload_running= 0;
}
/* }}} */
@@ -267,8 +268,8 @@
Default implementation for __autoload() */
PHP_FUNCTION(spl_autoload)
{
- char *class_name, *lc_name, *file_exts;
- int class_name_len, file_exts_len, found = 0;
+ char *class_name, *lc_name, *file_exts = SPL_G(autoload_extensions);
+ int class_name_len, file_exts_len = SPL_G(autoload_extensions_len),
found = 0;
char *copy, *pos1, *pos2;
zval **original_return_value = EG(return_value_ptr_ptr);
zend_op **original_opline_ptr = EG(opline_ptr);
@@ -279,7 +280,7 @@
RETURN_FALSE;
}
- copy = pos1 = estrdup(ZEND_NUM_ARGS() 1 ? file_exts :
SPL_G(autoload_extensions));
+ copy = pos1 = estrndup(file_exts, file_exts_len);
lc_name = zend_str_tolower_dup(class_name, class_name_len);
while(pos1 *pos1 !EG(exception)) {
EG(return_value_ptr_ptr) = original_return_value;
@@ -324,10 +325,11 @@
if (SPL_G(autoload_extensions)) {
efree(SPL_G(autoload_extensions));
}
- SPL_G(autoload_extensions) = estrdup(file_exts);
+ SPL_G(autoload_extensions) = estrndup(file_exts, file_exts_len);
+ SPL_G(autoload_extensions_len) = file_exts_len;
}
- RETURN_STRING(SPL_G(autoload_extensions), 1);
+ RETURN_STRINGL(SPL_G(autoload_extensions),
SPL_G(autoload_extensions_len), 1);
} /* }}} */
typedef struct {
@@ -707,7 +709,9 @@
PHP_RINIT_FUNCTION(spl) /* {{{ */
{
SPL_G(autoload_extensions) = estrndup(.inc,.php,
sizeof(.inc,.php)-1);
+ SPL_G(autoload_extensions_len) = sizeof(.inc,.php)-1;
SPL_G(autoload_functions) = NULL;
+ SPL_G(autoload_running) = 0;
return SUCCESS;
} /* }}} */
@@ -716,6 +720,7 @@
if (SPL_G(autoload_extensions)) {
efree(SPL_G(autoload_extensions));
SPL_G(autoload_extensions) = NULL;
+ SPL_G(autoload_extensions_len) = 0;
}
if (SPL_G(autoload_functions)) {
zend_hash_destroy(SPL_G(autoload_functions));
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/php_spl.h?r1=1.19r2=1.20diff_format=u
Index: php-src/ext/spl/php_spl.h
diff -u php-src/ext/spl/php_spl.h:1.19 php-src/ext/spl/php_spl.h:1.20
--- php-src/ext/spl/php_spl.h:1.19 Tue Oct 31 23:18:00 2006
+++ php-src/ext/spl/php_spl.h Sat Nov 4 20:22:29 2006
@@ -57,6 +57,7 @@
ZEND_BEGIN_MODULE_GLOBALS(spl)
char * autoload_extensions;
+ int autoload_extensions_len;
HashTable * autoload_functions;
int autoload_running;
ZEND_END_MODULE_GLOBALS(spl)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/spl php_spl.c php_spl.h
helly Sat Nov 4 20:27:28 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/splphp_spl.c php_spl.h
Log:
- MFH Store length of autoload file exts
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/php_spl.c?r1=1.52.2.28.2.7r2=1.52.2.28.2.8diff_format=u
Index: php-src/ext/spl/php_spl.c
diff -u php-src/ext/spl/php_spl.c:1.52.2.28.2.7
php-src/ext/spl/php_spl.c:1.52.2.28.2.8
--- php-src/ext/spl/php_spl.c:1.52.2.28.2.7 Fri Nov 3 18:58:41 2006
+++ php-src/ext/spl/php_spl.c Sat Nov 4 20:27:28 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_spl.c,v 1.52.2.28.2.7 2006/11/03 18:58:41 helly Exp $ */
+/* $Id: php_spl.c,v 1.52.2.28.2.8 2006/11/04 20:27:28 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -55,9 +55,10 @@
*/
static PHP_GINIT_FUNCTION(spl)
{
- spl_globals-autoload_extensions = NULL;
- spl_globals-autoload_functions = NULL;
- spl_globals-autoload_running= 0;
+ spl_globals-autoload_extensions = NULL;
+ spl_globals-autoload_extensions_len = 0;
+ spl_globals-autoload_functions = NULL;
+ spl_globals-autoload_running= 0;
}
/* }}} */
@@ -269,8 +270,8 @@
Default implementation for __autoload() */
PHP_FUNCTION(spl_autoload)
{
- char *class_name, *lc_name, *file_exts;
- int class_name_len, file_exts_len, found = 0;
+ char *class_name, *lc_name, *file_exts = SPL_G(autoload_extensions);
+ int class_name_len, file_exts_len = SPL_G(autoload_extensions_len),
found = 0;
char *copy, *pos1, *pos2;
zval **original_return_value = EG(return_value_ptr_ptr);
zend_op **original_opline_ptr = EG(opline_ptr);
@@ -281,7 +282,7 @@
RETURN_FALSE;
}
- copy = pos1 = estrdup(ZEND_NUM_ARGS() 1 ? file_exts :
SPL_G(autoload_extensions));
+ copy = pos1 = estrndup(file_exts, file_exts_len);
lc_name = zend_str_tolower_dup(class_name, class_name_len);
while(pos1 *pos1 !EG(exception)) {
EG(return_value_ptr_ptr) = original_return_value;
@@ -326,10 +327,11 @@
if (SPL_G(autoload_extensions)) {
efree(SPL_G(autoload_extensions));
}
- SPL_G(autoload_extensions) = estrdup(file_exts);
+ SPL_G(autoload_extensions) = estrndup(file_exts, file_exts_len);
+ SPL_G(autoload_extensions_len) = file_exts_len;
}
- RETURN_STRING(SPL_G(autoload_extensions), 1);
+ RETURN_STRINGL(SPL_G(autoload_extensions),
SPL_G(autoload_extensions_len), 1);
} /* }}} */
typedef struct {
@@ -696,6 +698,7 @@
PHP_RINIT_FUNCTION(spl) /* {{{ */
{
SPL_G(autoload_extensions) = estrndup(.inc,.php,
sizeof(.inc,.php)-1);
+ SPL_G(autoload_extensions_len) = sizeof(.inc,.php)-1;
SPL_G(autoload_functions) = NULL;
return SUCCESS;
} /* }}} */
@@ -705,6 +708,7 @@
if (SPL_G(autoload_extensions)) {
efree(SPL_G(autoload_extensions));
SPL_G(autoload_extensions) = NULL;
+ SPL_G(autoload_extensions_len) = 0;
}
if (SPL_G(autoload_functions)) {
zend_hash_destroy(SPL_G(autoload_functions));
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/php_spl.h?r1=1.17.2.1.2.1r2=1.17.2.1.2.2diff_format=u
Index: php-src/ext/spl/php_spl.h
diff -u php-src/ext/spl/php_spl.h:1.17.2.1.2.1
php-src/ext/spl/php_spl.h:1.17.2.1.2.2
--- php-src/ext/spl/php_spl.h:1.17.2.1.2.1 Fri Nov 3 18:58:41 2006
+++ php-src/ext/spl/php_spl.h Sat Nov 4 20:27:28 2006
@@ -59,6 +59,7 @@
char * autoload_extensions;
HashTable * autoload_functions;
int autoload_running;
+ int autoload_extensions_len;
ZEND_END_MODULE_GLOBALS(spl)
#ifdef ZTS
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /main/streams memory.c
rasmus Sat Nov 4 20:43:28 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/main/streams memory.c
Log:
Mark memory streams as is_url
http://cvs.php.net/viewvc.cgi/php-src/main/streams/memory.c?r1=1.8.2.6.2.8r2=1.8.2.6.2.9diff_format=u
Index: php-src/main/streams/memory.c
diff -u php-src/main/streams/memory.c:1.8.2.6.2.8
php-src/main/streams/memory.c:1.8.2.6.2.9
--- php-src/main/streams/memory.c:1.8.2.6.2.8 Thu Jun 29 14:40:49 2006
+++ php-src/main/streams/memory.c Sat Nov 4 20:43:28 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: memory.c,v 1.8.2.6.2.8 2006/06/29 14:40:49 bjori Exp $ */
+/* $Id: memory.c,v 1.8.2.6.2.9 2006/11/04 20:43:28 rasmus Exp $ */
#define _GNU_SOURCE
#include php.h
@@ -708,7 +708,7 @@
php_stream_wrapper php_stream_rfc2397_wrapper ={
php_stream_rfc2397_wops,
NULL,
- 0, /* is_url */
+ 1, /* is_url */
};
/*
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main/streams memory.c
rasmus Sat Nov 4 20:44:02 2006 UTC
Modified files:
/php-src/main/streams memory.c
Log:
Mark memory streams as is_url
http://cvs.php.net/viewvc.cgi/php-src/main/streams/memory.c?r1=1.25r2=1.26diff_format=u
Index: php-src/main/streams/memory.c
diff -u php-src/main/streams/memory.c:1.25 php-src/main/streams/memory.c:1.26
--- php-src/main/streams/memory.c:1.25 Tue Sep 19 10:38:31 2006
+++ php-src/main/streams/memory.c Sat Nov 4 20:44:02 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: memory.c,v 1.25 2006/09/19 10:38:31 dmitry Exp $ */
+/* $Id: memory.c,v 1.26 2006/11/04 20:44:02 rasmus Exp $ */
#define _GNU_SOURCE
#include php.h
@@ -708,7 +708,7 @@
php_stream_wrapper php_stream_rfc2397_wrapper ={
php_stream_rfc2397_wops,
NULL,
- 0, /* is_url */
+ 1, /* is_url */
};
/*
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/exif exif.c
helly Sat Nov 4 20:46:22 2006 UTC
Modified files:
/php-src/ext/exif exif.c
Log:
- Make parameter parsing api check happy
http://cvs.php.net/viewvc.cgi/php-src/ext/exif/exif.c?r1=1.184r2=1.185diff_format=u
Index: php-src/ext/exif/exif.c
diff -u php-src/ext/exif/exif.c:1.184 php-src/ext/exif/exif.c:1.185
--- php-src/ext/exif/exif.c:1.184 Tue Oct 10 22:21:36 2006
+++ php-src/ext/exif/exif.c Sat Nov 4 20:46:21 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: exif.c,v 1.184 2006/10/10 22:21:36 tony2001 Exp $ */
+/* $Id: exif.c,v 1.185 2006/11/04 20:46:21 helly Exp $ */
/* ToDos
*
@@ -139,7 +139,7 @@
};
/* }}} */
-#define EXIF_VERSION 1.4 $Id: exif.c,v 1.184 2006/10/10 22:21:36 tony2001 Exp
$
+#define EXIF_VERSION 1.4 $Id: exif.c,v 1.185 2006/11/04 20:46:21 helly Exp $
/* {{{ PHP_MINFO_FUNCTION
*/
@@ -3984,7 +3984,7 @@
Reads the embedded thumbnail */
PHP_FUNCTION(exif_thumbnail)
{
- zval *p_width, *p_height, *p_imagetype;
+ zval *p_width = 0, *p_height = 0, *p_imagetype = 0;
char *p_name;
int p_name_len, ret, arg_c = ZEND_NUM_ARGS();
image_info_type ImageInfo;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
