[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Mon Mar 28 20:32:12 2005 EDT Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/diff.php/php-src/ChangeLog?r1=1.1936r2=1.1937ty=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.1936 php-src/ChangeLog:1.1937 --- php-src/ChangeLog:1.1936Sun Mar 27 20:34:07 2005 +++ php-src/ChangeLog Mon Mar 28 20:32:11 2005 @@ -1,3 +1,140 @@ +2005-03-28 Ilia Alshanetsky [EMAIL PROTECTED] + +* main/php_variables.c: + Proper fix for the memory leak. + +* main/php_variables.c: + Fixed memory leak when variables_order does not contain 'S'. + +2005-03-28 Greg Beaver [EMAIL PROTECTED] + +* pear/packages/HTML_Template_IT-1.1.tar + pear/packages/HTML_Template_IT-1.1.tar + pear/packages/Net_UserAgent_Detect-2.0.1.tar + pear/packages/Net_UserAgent_Detect-2.0.1.tar + pear/packages/XML_RPC-1.1.0.tar + pear/packages/XML_RPC-1.2.2.tar + pear/packages/XML_RPC-1.2.2.tar: + + update to current bundle ideal + +* (PHP_4_3) + pear/packages/DB-1.6.2.tar + pear/packages/HTML_Template_IT-1.1.tar + pear/packages/HTTP-1.2.2.tar + pear/packages/Mail-1.1.3.tar + pear/packages/Net_SMTP-1.2.6.tar + pear/packages/Net_Socket-1.0.1.tar + pear/packages/Net_UserAgent_Detect-2.0.1.tar + pear/packages/XML_Parser-1.0.1.tar + pear/packages/XML_RPC-1.1.0.tar + pear/packages/XML_RPC-1.1.0.tar + pear/packages/XML_RPC-1.2.2.tar: + update to current bundle ideal + +* pear/packages/HTML_Template_IT-1.1.tar + pear/packages/HTML_Template_IT-1.1.tar + pear/packages/Net_UserAgent_Detect-2.0.1.tar + pear/packages/Net_UserAgent_Detect-2.0.1.tar + pear/packages/XML_RPC-1.2.2.tar + pear/packages/XML_RPC-1.2.2.tar: + + file HTML_Template_IT-1.1.tar was initially added on branch PHP_4_3. + +* pear/PEAR/RunTest.php + pear/PEAR/RunTest.php + pear/PEAR/Command/Auth.php + pear/PEAR/Command/Build.php + pear/PEAR/Command/Common.php + pear/PEAR/Command/Config.php + pear/PEAR/Command/Install.php + pear/PEAR/Command/Mirror.php + pear/PEAR/Command/Package.php + pear/PEAR/Command/Registry.php + pear/PEAR/Command/Remote.php: + + file RunTest.php was initially added on branch PHP_4_3. + +* pear/PEAR.php + pear/PEAR.php + pear/PEAR.php + pear/System.php + pear/package-PEAR.xml + pear/package-PEAR.xml + pear/package-PEAR.xml + pear/package.dtd + pear/package.dtd + pear/package.dtd + pear/template.spec + pear/template.spec + pear/template.spec + pear/Archive/Tar.php + pear/Console/Getopt.php + pear/OS/Guess.php + pear/OS/Guess.php + pear/OS/Guess.php + pear/PEAR/Autoloader.php + pear/PEAR/Builder.php + pear/PEAR/Builder.php + pear/PEAR/Builder.php + pear/PEAR/Command.php + pear/PEAR/Common.php + pear/PEAR/Common.php + pear/PEAR/Common.php + pear/PEAR/Config.php + pear/PEAR/Dependency.php + pear/PEAR/Dependency.php + pear/PEAR/Dependency.php + pear/PEAR/Downloader.php + pear/PEAR/Downloader.php + pear/PEAR/ErrorStack.php + pear/PEAR/ErrorStack.php + pear/PEAR/ErrorStack.php + pear/PEAR/Exception.php + pear/PEAR/Exception.php + pear/PEAR/Exception.php + pear/PEAR/Exception.php + pear/PEAR/Installer.php + pear/PEAR/Installer.php + pear/PEAR/Installer.php + pear/PEAR/Packager.php + pear/PEAR/Registry.php + pear/PEAR/Registry.php + pear/PEAR/Registry.php + pear/PEAR/Remote.php + pear/PEAR/Command/Install.php + pear/PEAR/Command/Package.php + pear/PEAR/Command/Package.php + pear/PEAR/Frontend/CLI.php + pear/scripts/pear.in + pear/scripts/pearcmd.php + pear/scripts/pearcmd.php + pear/scripts/pearcmd.php + pear/tests/pear_config.phpt + pear/tests/pear_config_1.1.phpt + pear/tests/pear_registry_1.1.phpt: + merge in PEAR 1.3.5 + +2005-03-28 Pierre-Alain Joye [EMAIL PROTECTED] + +* ext/gd/libgd/gd.c: + - remove debug code + +* ext/gd/libgd/gd.c: + - MFB, imagerectangle draws 2x each corners (alpha channel uglyness) + +2005-03-28 Joey Smith [EMAIL PROTECTED] + +* php.ini-dist + php.ini-recommended: + Adding comments to .ini files at [EMAIL PROTECTED]'s request. + +2005-03-28 Edin Kadribasic [EMAIL PROTECTED] + +* ext/xmlrpc/libxmlrpc/xml_element.c + ext/xmlrpc/libxmlrpc/xmlrpc.c: + Reshufle includes to make it compile on windows + 2005-03-27 Pierre-Alain Joye [EMAIL PROTECTED] * ext/gd/gd.c @@ -2626,7 +2763,7 @@ ext/session/mod_mm.h ext/session/mod_user.h ext/session/php_session.h: - - Missing $Id: ChangeLog,v 1.1936 2005/03/28 01:34:07 changelog Exp $ tags + - Missing $Id: ChangeLog,v 1.1937
[PHP-CVS] cvs: php-src /ext/gd/libgd gd.c
pajoye Mon Mar 28 03:14:31 2005 EDT
Modified files:
/php-src/ext/gd/libgd gd.c
Log:
- MFB, imagerectangle draws 2x each corners (alpha channel uglyness)
http://cvs.php.net/diff.php/php-src/ext/gd/libgd/gd.c?r1=1.84r2=1.85ty=u
Index: php-src/ext/gd/libgd/gd.c
diff -u php-src/ext/gd/libgd/gd.c:1.84 php-src/ext/gd/libgd/gd.c:1.85
--- php-src/ext/gd/libgd/gd.c:1.84 Sun Mar 27 18:43:52 2005
+++ php-src/ext/gd/libgd/gd.c Mon Mar 28 03:14:30 2005
@@ -2029,24 +2029,71 @@
{
int x1h = x1, x1v = x1, y1h = y1, y1v = y1, x2h = x2, x2v = x2, y2h =
y2, y2v = y2;
int thick = im-thick;
+ int half1 = 1;
+ int t;
+ if (y2 y1) {
+ t=y1;
+ y1 = y2;
+ y2 = t;
+
+ t = x1;
+ x1 = x2;
+ x2 = t;
+ }
+
+ x1h = x1; x1v = x1; y1h = y1; y1v = y1; x2h = x2; x2v = x2; y2h = y2;
y2v = y2;
if (thick 1) {
- int half = thick / 2;
- int half1 = thick - half;
+ int cx, cy, x1ul, y1ul, x2lr, y2lr;
+ int half = thick 1;
+ half1 = thick - half;
+ x1ul = x1 - half;
+ y1ul = y1 - half;
+
+ x2lr = x2 + half;
+ y2lr = y2 + half;
- if (y1 y2) {
- y1v = y1h - half;
- y2v = y2h + half1 - 1;
- } else {
- y1v = y1h + half1 - 1;
- y2v = y2h - half;
+ cy = y1ul + thick;
+ while (cy-- y1ul) {
+ cx = x1ul - 1;
+ while (cx++ x2lr) {
+ gdImageSetPixel(im, cx, cy, color);
+ }
+ }
+
+ cy = y2lr - thick;
+ while (cy++ y2lr) {
+ cx = x1ul - 1;
+ while (cx++ x2lr) {
+ gdImageSetPixel(im, cx, cy, color);
+ }
+ }
+
+ cy = y1ul + thick - 1;
+ while (cy++ y2lr -thick) {
+ cx = x1ul - 1;
+ while (cx++ x1ul + thick) {
+ gdImageSetPixel(im, cx, cy, color);
+ }
+ }
+
+ cy = y1ul + thick - 1;
+ while (cy++ y2lr -thick) {
+ cx = x2lr - thick - 1;
+ while (cx++ x2lr) {
+ gdImageSetPixel(im, cx, cy, color);
+ }
}
- }
- gdImageLine(im, x1h, y1h, x2h, y1h, color);
- gdImageLine(im, x1h, y2h, x2h, y2h, color);
- gdImageLine(im, x1v, y1v, x1v, y2v, color);
- gdImageLine(im, x2v, y1v, x2v, y2v, color);
+ return;
+ } else {
+ y1v = y1h + 1;
+ y2v = y2h - 1;
+ gdImageLine(im, x1h, y1h, x2h, y1h, color);
+ gdImageLine(im, x1h, y2h, x2h, y2h, color);
+ gdImageLine(im, x1v, y1v, x1v, y2v, color);
+ gdImageLine(im, x2v, y1v, x2v, y2v, color);
+ }
}
void gdImageFilledRectangle (gdImagePtr im, int x1, int y1, int x2, int y2,
int color)
--
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 Mon Mar 28 03:17:17 2005 EDT
Modified files:
/php-src/ext/gd/libgd gd.c
Log:
- remove debug code
http://cvs.php.net/diff.php/php-src/ext/gd/libgd/gd.c?r1=1.85r2=1.86ty=u
Index: php-src/ext/gd/libgd/gd.c
diff -u php-src/ext/gd/libgd/gd.c:1.85 php-src/ext/gd/libgd/gd.c:1.86
--- php-src/ext/gd/libgd/gd.c:1.85 Mon Mar 28 03:14:30 2005
+++ php-src/ext/gd/libgd/gd.c Mon Mar 28 03:17:17 2005
@@ -2240,7 +2240,7 @@
int tox, toy;
int ncR, ncG, ncB;
toy = dstY;
-printf(srccpopy:%X, src-transparent);
+
for (y = srcY; y (srcY + h); y++) {
tox = dstX;
for (x = srcX; x (srcX + w); x++) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/soap php_sdl.c
dmitry Mon Mar 28 10:21:51 2005 EDT
Modified files:
/php-src/ext/soap php_sdl.c
Log:
Fixed wrong SOAP headers encoding/decoding.
http://cvs.php.net/diff.php/php-src/ext/soap/php_sdl.c?r1=1.80r2=1.81ty=u
Index: php-src/ext/soap/php_sdl.c
diff -u php-src/ext/soap/php_sdl.c:1.80 php-src/ext/soap/php_sdl.c:1.81
--- php-src/ext/soap/php_sdl.c:1.80 Mon Mar 21 10:52:50 2005
+++ php-src/ext/soap/php_sdl.c Mon Mar 28 10:21:50 2005
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_sdl.c,v 1.80 2005/03/21 15:52:50 dmitry Exp $ */
+/* $Id: php_sdl.c,v 1.81 2005/03/28 15:21:50 dmitry Exp $ */
#include php_soap.h
#include ext/libxml/php_libxml.h
@@ -423,6 +423,10 @@
h-ns = estrdup(h-element-namens);
}
}
+ if (h-element-name) {
+ efree(h-name);
+ h-name = estrdup(h-element-name);
+ }
}
}
if (!fault) {
@@ -1061,7 +1065,7 @@
return ctx.sdl;
}
-#define WSDL_CACHE_VERSION 0x0b
+#define WSDL_CACHE_VERSION 0x0c
#define WSDL_CACHE_GET(ret,type,buf) memcpy(ret,*buf,sizeof(type)); *buf +=
sizeof(type);
#define WSDL_CACHE_GET_INT(ret,buf)ret = ((unsigned
char)(*buf)[0])|((unsigned char)(*buf)[1]8)|((unsigned
char)(*buf)[2]16)|((int)(*buf)[3]24); *buf += 4;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/soap php_encoding.c
dmitry Mon Mar 28 11:28:04 2005 EDT
Modified files:
/php-src/ext/soap php_encoding.c
Log:
Fixed handling of attributes' namespaces
http://cvs.php.net/diff.php/php-src/ext/soap/php_encoding.c?r1=1.88r2=1.89ty=u
Index: php-src/ext/soap/php_encoding.c
diff -u php-src/ext/soap/php_encoding.c:1.88
php-src/ext/soap/php_encoding.c:1.89
--- php-src/ext/soap/php_encoding.c:1.88Wed Mar 23 10:12:54 2005
+++ php-src/ext/soap/php_encoding.c Mon Mar 28 11:28:04 2005
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_encoding.c,v 1.88 2005/03/23 15:12:54 dmitry Exp $ */
+/* $Id: php_encoding.c,v 1.89 2005/03/28 16:28:04 dmitry Exp $ */
#include time.h
@@ -1480,7 +1480,7 @@
soap_error3(E_ERROR, Encoding: Attribute '%s' has fixed value '%s' (value '%s'
is not allowed), (*attr)-name, (*attr)-fixed, dummy-children-content);
}
if
((*attr)-namens
- (type-ns
== NULL || strcmp((*attr)-namens, type-ns))) {
+ (type-ns
== NULL || strcmp((*attr)-namens, type-ns) == 0)) {
xmlNsPtr nsp = encode_add_ns(xmlParam, (*attr)-namens);
xmlSetNsProp(xmlParam, nsp, (*attr)-name, dummy-children-content);
--
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) /pear PEAR.php package-PEAR.xml package.dtd template.spec /pear/OS Guess.php /pear/PEAR Builder.php Common.php Dependency.php ErrorStack.php Exception.php Installer.php Registry.php /pear/PEAR/Command Package.php /pear/scripts pearcmd.php
cellog Mon Mar 28 11:46:07 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/pear/OSGuess.php
/php-src/pear PEAR.php package-PEAR.xml package.dtd template.spec
/php-src/pear/PEAR Builder.php Common.php Dependency.php
ErrorStack.php Exception.php Installer.php
Registry.php
/php-src/pear/PEAR/Command Package.php
/php-src/pear/scripts pearcmd.php
Log:
merge in PEAR 1.3.5
http://cvs.php.net/diff.php/php-src/pear/OS/Guess.php?r1=1.13r2=1.13.4.1ty=u
Index: php-src/pear/OS/Guess.php
diff -u php-src/pear/OS/Guess.php:1.13 php-src/pear/OS/Guess.php:1.13.4.1
--- php-src/pear/OS/Guess.php:1.13 Thu Jan 8 12:33:11 2004
+++ php-src/pear/OS/Guess.php Mon Mar 28 11:46:06 2005
@@ -17,7 +17,7 @@
// | |
// +--+
//
-// $Id: Guess.php,v 1.13 2004/01/08 17:33:11 sniper Exp $
+// $Id: Guess.php,v 1.13.4.1 2005/03/28 16:46:06 cellog Exp $
// {{{ uname examples
@@ -68,6 +68,11 @@
// SparcStation 20 Solaris 8:
// SunOS host.example.com 5.8 Generic_108528-12 sun4m sparc
SUNW,SPARCstation-20
//
+// Mac OS X (Darwin)
+// Darwin home-eden.local 7.5.0 Darwin Kernel Version 7.5.0: Thu Aug 5
19:26:16 PDT 2004; root:xnu/xnu-517.7.21.obj~3/RELEASE_PPC Power Macintosh
+//
+// Mac OS X early versions
+//
// }}}
@@ -97,11 +102,11 @@
static $sysmap = array(
'HP-UX' = 'hpux',
'IRIX64' = 'irix',
-// Darwin?
);
static $cpumap = array(
'i586' = 'i386',
'i686' = 'i386',
+'ppc' = 'powerpc',
);
if ($uname === null) {
$uname = php_uname();
@@ -138,6 +143,24 @@
// use only the first two digits from the kernel version
$release = ereg_replace('^([[:digit:]]+\.[[:digit:]]+).*',
'\1', $parts[2]);
break;
+case 'Mac' :
+$sysname = 'darwin';
+$nodename = $parts[2];
+$release = $parts[3];
+if ($cpu == 'Macintosh') {
+if ($parts[$n - 2] == 'Power') {
+$cpu = 'powerpc';
+}
+}
+break;
+case 'Darwin' :
+if ($cpu == 'Macintosh') {
+if ($parts[$n - 2] == 'Power') {
+$cpu = 'powerpc';
+}
+}
+$release = ereg_replace('^([[:digit:]]+\.[[:digit:]]+).*',
'\1', $parts[2]);
+break;
default:
$release = ereg_replace('-.*', '', $parts[2]);
break;
@@ -255,7 +278,6 @@
}
}
-
/*
* Local Variables:
* indent-tabs-mode: nil
http://cvs.php.net/diff.php/php-src/pear/PEAR.php?r1=1.82r2=1.82.2.1ty=u
Index: php-src/pear/PEAR.php
diff -u php-src/pear/PEAR.php:1.82 php-src/pear/PEAR.php:1.82.2.1
--- php-src/pear/PEAR.php:1.82 Wed Jun 16 12:26:12 2004
+++ php-src/pear/PEAR.php Mon Mar 28 11:46:06 2005
@@ -18,7 +18,7 @@
// | Tomas V.V.Cox [EMAIL PROTECTED] |
// ++
//
-// $Id: PEAR.php,v 1.82 2004/06/16 16:26:12 ssb Exp $
+// $Id: PEAR.php,v 1.82.2.1 2005/03/28 16:46:06 cellog Exp $
//
define('PEAR_ERROR_RETURN', 1);
@@ -59,7 +59,7 @@
$GLOBALS['_PEAR_shutdown_funcs'] = array();
$GLOBALS['_PEAR_error_handler_stack']= array();
-ini_set('track_errors', true);
[EMAIL PROTECTED]('track_errors', true);
/**
* Base class for other PEAR classes. Provides rudimentary
@@ -152,7 +152,7 @@
*/
function PEAR($error_class = null)
{
-$classname = get_class($this);
+$classname = strtolower(get_class($this));
if ($this-_debug) {
print PEAR constructor called, class=$classname\n;
}
@@ -164,6 +164,10 @@
if (method_exists($this, $destructor)) {
global $_PEAR_destructor_object_list;
$_PEAR_destructor_object_list[] = $this;
+if (!isset($GLOBALS['_PEAR_SHUTDOWN_REGISTERED'])) {
+register_shutdown_function(_PEAR_call_destructors);
+$GLOBALS['_PEAR_SHUTDOWN_REGISTERED'] = true;
+}
break;
} else {
$classname = get_parent_class($classname);
@@ -187,7 +191,7 @@
*/
function _PEAR() {
if ($this-_debug) {
-printf(PEAR destructor called, class=%s\n, get_class($this));
+printf(PEAR destructor called, class=%s\n,
strtolower(get_class($this)));
}
}
@@ -561,6 +565,77 @@
}
// }}}
+function staticPushErrorHandling($mode, $options = null)
+{
+
[PHP-CVS] cvs: php-src(PHP_4_3) /pear/packages DB-1.6.2.tar HTML_Template_IT-1.1.tar HTTP-1.2.2.tar Mail-1.1.3.tar Net_SMTP-1.2.6.tar Net_Socket-1.0.1.tar Net_UserAgent_Detect-2.0.1.tar XML_Parser-1.0.1.tar XML_RPC-1.1.0.tar XML_RPC-1.2.2.tar
cellog Mon Mar 28 12:02:31 2005 EDT Added files: (Branch: PHP_4_3) /php-src/pear/packages HTML_Template_IT-1.1.tar Net_UserAgent_Detect-2.0.1.tar XML_RPC-1.2.2.tar Removed files: /php-src/pear/packages DB-1.6.2.tar HTTP-1.2.2.tar Mail-1.1.3.tar Net_SMTP-1.2.6.tar Net_Socket-1.0.1.tar XML_Parser-1.0.1.tar XML_RPC-1.1.0.tar Log: update to current bundle ideal http://cvs.php.net/co.php/php-src/pear/packages/HTML_Template_IT-1.1.tar?r=1.1p=1 Index: php-src/pear/packages/HTML_Template_IT-1.1.tar +++ php-src/pear/packages/HTML_Template_IT-1.1.tar http://cvs.php.net/co.php/php-src/pear/packages/Net_UserAgent_Detect-2.0.1.tar?r=1.1p=1 Index: php-src/pear/packages/Net_UserAgent_Detect-2.0.1.tar +++ php-src/pear/packages/Net_UserAgent_Detect-2.0.1.tar http://cvs.php.net/co.php/php-src/pear/packages/XML_RPC-1.2.2.tar?r=1.1p=1 Index: php-src/pear/packages/XML_RPC-1.2.2.tar +++ php-src/pear/packages/XML_RPC-1.2.2.tar -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /pear/packages HTML_Template_IT-1.1.tar Net_UserAgent_Detect-2.0.1.tar XML_RPC-1.1.0.tar XML_RPC-1.2.2.tar
cellog Mon Mar 28 12:04:01 2005 EDT Removed files: /php-src/pear/packages XML_RPC-1.1.0.tar Modified files: /php-src/pear/packages HTML_Template_IT-1.1.tar Net_UserAgent_Detect-2.0.1.tar XML_RPC-1.2.2.tar Log: update to current bundle ideal http://cvs.php.net/diff.php/php-src/pear/packages/HTML_Template_IT-1.1.tar?r1=1.1r2=1.2ty=u Index: php-src/pear/packages/HTML_Template_IT-1.1.tar http://cvs.php.net/diff.php/php-src/pear/packages/Net_UserAgent_Detect-2.0.1.tar?r1=1.1r2=1.2ty=u Index: php-src/pear/packages/Net_UserAgent_Detect-2.0.1.tar http://cvs.php.net/diff.php/php-src/pear/packages/XML_RPC-1.2.2.tar?r1=1.1r2=1.2ty=u Index: php-src/pear/packages/XML_RPC-1.2.2.tar -- 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) /pear/packages HTML_Template_IT-1.1.tar Net_UserAgent_Detect-2.0.1.tar XML_RPC-1.1.0.tar XML_RPC-1.2.2.tar
cellog Mon Mar 28 12:05:51 2005 EDT Added files: (Branch: PHP_5_0) /php-src/pear/packages HTML_Template_IT-1.1.tar Net_UserAgent_Detect-2.0.1.tar XML_RPC-1.2.2.tar Removed files: /php-src/pear/packages XML_RPC-1.1.0.tar Log: update to current bundle ideal http://cvs.php.net/co.php/php-src/pear/packages/HTML_Template_IT-1.1.tar?r=1.1p=1 Index: php-src/pear/packages/HTML_Template_IT-1.1.tar +++ php-src/pear/packages/HTML_Template_IT-1.1.tar http://cvs.php.net/co.php/php-src/pear/packages/Net_UserAgent_Detect-2.0.1.tar?r=1.1p=1 Index: php-src/pear/packages/Net_UserAgent_Detect-2.0.1.tar +++ php-src/pear/packages/Net_UserAgent_Detect-2.0.1.tar http://cvs.php.net/co.php/php-src/pear/packages/XML_RPC-1.2.2.tar?r=1.1p=1 Index: php-src/pear/packages/XML_RPC-1.2.2.tar +++ php-src/pear/packages/XML_RPC-1.2.2.tar -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/soap php_encoding.c /ext/soap/tests/schema schema037.phpt schema038.phpt schema039.phpt schema040.phpt schema042.phpt schema043.phpt schema044.phpt schema045.phpt schema046.phpt schema047.phpt schema048.phpt schema062.phpt schema065.phpt schema066.phpt schema067.phpt schema069.phpt schema070.phpt
dmitry Mon Mar 28 13:06:30 2005 EDT
Modified files:
/php-src/ext/soap php_encoding.c
/php-src/ext/soap/tests/schema schema037.phpt schema038.phpt
schema039.phpt schema040.phpt
schema042.phpt schema043.phpt
schema044.phpt schema045.phpt
schema046.phpt schema047.phpt
schema048.phpt schema062.phpt
schema065.phpt schema066.phpt
schema067.phpt schema069.phpt
schema070.phpt
Log:
Fixed handling of attributes' namespaces
http://cvs.php.net/diff.php/php-src/ext/soap/php_encoding.c?r1=1.89r2=1.90ty=u
Index: php-src/ext/soap/php_encoding.c
diff -u php-src/ext/soap/php_encoding.c:1.89
php-src/ext/soap/php_encoding.c:1.90
--- php-src/ext/soap/php_encoding.c:1.89Mon Mar 28 11:28:04 2005
+++ php-src/ext/soap/php_encoding.c Mon Mar 28 13:06:28 2005
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_encoding.c,v 1.89 2005/03/28 16:28:04 dmitry Exp $ */
+/* $Id: php_encoding.c,v 1.90 2005/03/28 18:06:28 dmitry Exp $ */
#include time.h
@@ -1479,8 +1479,11 @@
if
((*attr)-fixed strcmp((*attr)-fixed,dummy-children-content) != 0) {
soap_error3(E_ERROR, Encoding: Attribute '%s' has fixed value '%s' (value '%s'
is not allowed), (*attr)-name, (*attr)-fixed, dummy-children-content);
}
+ if
((*attr)-namens) {
+/*
if
((*attr)-namens
- (type-ns
== NULL || strcmp((*attr)-namens, type-ns) == 0)) {
+ (type-ns
== NULL || strcmp((*attr)-namens, type-ns))) {
+*/
xmlNsPtr nsp = encode_add_ns(xmlParam, (*attr)-namens);
xmlSetNsProp(xmlParam, nsp, (*attr)-name, dummy-children-content);
http://cvs.php.net/diff.php/php-src/ext/soap/tests/schema/schema037.phpt?r1=1.2r2=1.3ty=u
Index: php-src/ext/soap/tests/schema/schema037.phpt
diff -u php-src/ext/soap/tests/schema/schema037.phpt:1.2
php-src/ext/soap/tests/schema/schema037.phpt:1.3
--- php-src/ext/soap/tests/schema/schema037.phpt:1.2Thu Jan 20 07:48:00 2005
+++ php-src/ext/soap/tests/schema/schema037.phptMon Mar 28 13:06:29 2005
@@ -18,7 +18,7 @@
?
--EXPECTF--
?xml version=1.0 encoding=UTF-8?
-SOAP-ENV:Envelope xmlns:SOAP-ENV=http://schemas.xmlsoap.org/soap/envelope/;
xmlns:ns1=http://test-uri/; xmlns:xsd=http://www.w3.org/2001/XMLSchema;
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
xmlns:SOAP-ENC=http://schemas.xmlsoap.org/soap/encoding/;
SOAP-ENV:encodingStyle=http://schemas.xmlsoap.org/soap/encoding/;SOAP-ENV:Bodyns1:testtestParam
int=123 xsi:type=ns1:testTypestr
xsi:type=xsd:stringstr/str/testParam/ns1:test/SOAP-ENV:Body/SOAP-ENV:Envelope
+SOAP-ENV:Envelope xmlns:SOAP-ENV=http://schemas.xmlsoap.org/soap/envelope/;
xmlns:ns1=http://test-uri/; xmlns:xsd=http://www.w3.org/2001/XMLSchema;
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
xmlns:SOAP-ENC=http://schemas.xmlsoap.org/soap/encoding/;
SOAP-ENV:encodingStyle=http://schemas.xmlsoap.org/soap/encoding/;SOAP-ENV:Bodyns1:testtestParam
ns1:int=123 xsi:type=ns1:testTypestr
xsi:type=xsd:stringstr/str/testParam/ns1:test/SOAP-ENV:Body/SOAP-ENV:Envelope
object(stdClass)#%d (2) {
[str]=
string(3) str
http://cvs.php.net/diff.php/php-src/ext/soap/tests/schema/schema038.phpt?r1=1.2r2=1.3ty=u
Index: php-src/ext/soap/tests/schema/schema038.phpt
diff -u php-src/ext/soap/tests/schema/schema038.phpt:1.2
php-src/ext/soap/tests/schema/schema038.phpt:1.3
--- php-src/ext/soap/tests/schema/schema038.phpt:1.2Thu Jan 20 07:48:00 2005
+++ php-src/ext/soap/tests/schema/schema038.phptMon Mar 28 13:06:29 2005
@@ -19,7 +19,7 @@
?
--EXPECTF--
?xml version=1.0 encoding=UTF-8?
-SOAP-ENV:Envelope xmlns:SOAP-ENV=http://schemas.xmlsoap.org/soap/envelope/;
xmlns:ns1=http://test-uri/; xmlns:xsd=http://www.w3.org/2001/XMLSchema;
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
xmlns:SOAP-ENC=http://schemas.xmlsoap.org/soap/encoding/;
SOAP-ENV:encodingStyle=http://schemas.xmlsoap.org/soap/encoding/;SOAP-ENV:Bodyns1:testtestParam
int=123 xsi:type=ns1:testTypestr
[PHP-CVS] cvs: php-src /main php_variables.c
iliaa Mon Mar 28 13:09:29 2005 EDT
Modified files:
/php-src/main php_variables.c
Log:
Fixed memory leak when variables_order does not contain 'S'.
http://cvs.php.net/diff.php/php-src/main/php_variables.c?r1=1.85r2=1.86ty=u
Index: php-src/main/php_variables.c
diff -u php-src/main/php_variables.c:1.85 php-src/main/php_variables.c:1.86
--- php-src/main/php_variables.c:1.85 Wed Feb 16 23:44:11 2005
+++ php-src/main/php_variables.cMon Mar 28 13:09:28 2005
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: php_variables.c,v 1.85 2005/02/17 04:44:11 iliaa Exp $ */
+/* $Id: php_variables.c,v 1.86 2005/03/28 18:09:28 iliaa Exp $ */
#include stdio.h
#include php.h
@@ -668,7 +668,7 @@
}
for (i=0; inum_track_vars; i++) {
- if (jit_initialization
auto_global_records[i].jit_initialization) {
+ if ((jit_initialization
auto_global_records[i].jit_initialization) || _gpc_flags[i]) {
continue;
}
if (!PG(http_globals)[i]) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main php_variables.c
iliaa Mon Mar 28 13:46:58 2005 EDT
Modified files:
/php-src/main php_variables.c
Log:
Proper fix for the memory leak.
http://cvs.php.net/diff.php/php-src/main/php_variables.c?r1=1.86r2=1.87ty=u
Index: php-src/main/php_variables.c
diff -u php-src/main/php_variables.c:1.86 php-src/main/php_variables.c:1.87
--- php-src/main/php_variables.c:1.86 Mon Mar 28 13:09:28 2005
+++ php-src/main/php_variables.cMon Mar 28 13:46:57 2005
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: php_variables.c,v 1.86 2005/03/28 18:09:28 iliaa Exp $ */
+/* $Id: php_variables.c,v 1.87 2005/03/28 18:46:57 iliaa Exp $ */
#include stdio.h
#include php.h
@@ -668,7 +668,7 @@
}
for (i=0; inum_track_vars; i++) {
- if ((jit_initialization
auto_global_records[i].jit_initialization) || _gpc_flags[i]) {
+ if (jit_initialization
auto_global_records[i].jit_initialization) {
continue;
}
if (!PG(http_globals)[i]) {
@@ -684,7 +684,6 @@
}
zend_hash_update(EG(symbol_table),
auto_global_records[i].name, auto_global_records[i].name_len,
PG(http_globals)[i], sizeof(zval *), NULL);
- PG(http_globals)[i]-refcount++;
if (PG(register_long_arrays)) {
zend_hash_update(EG(symbol_table),
auto_global_records[i].long_name, auto_global_records[i].long_name_len,
PG(http_globals)[i], sizeof(zval *), NULL);
PG(http_globals)[i]-refcount++;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Fw: [PHP-CVS] cvs: php-src /main php_variables.c
Zeev, do you mind if I merge this patch to PHP_5_0 branch?
The leak is reproducible when PHP is build with --enable-debug and there is no
S in variables_order.
iliaa Mon Mar 28 13:46:58 2005 EDT
Modified files:
/php-src/main php_variables.c
Log:
Proper fix for the memory leak.
http://cvs.php.net/diff.php/php-src/main/php_variables.c?r1=1.86r2=1.87ty=u
Index: php-src/main/php_variables.c
diff -u php-src/main/php_variables.c:1.86 php-src/main/php_variables.c:1.87
--- php-src/main/php_variables.c:1.86 Mon Mar 28 13:09:28 2005
+++ php-src/main/php_variables.cMon Mar 28 13:46:57 2005
@@ -684,7 +684,6 @@
}
zend_hash_update(EG(symbol_table),
auto_global_records[i].name, auto_global_records[i].name_len,
PG(http_globals)[i], sizeof(zval *), NULL);
- PG(http_globals)[i]-refcount++;
if (PG(register_long_arrays)) {
zend_hash_update(EG(symbol_table),
auto_global_records[i].long_name, auto_global_records[i].long_name_len,
PG(http_globals)[i], sizeof(zval *), NULL);
PG(http_globals)[i]-refcount++;
--
Wbr,
Antony Dovgal aka tony2001
[EMAIL PROTECTED]
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
rasmus Mon Mar 28 19:00:04 2005 EDT Modified files: /CVSROOTavail Log: karma for cyberscribe http://cvs.php.net/diff.php/CVSROOT/avail?r1=1.960r2=1.961ty=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.960 CVSROOT/avail:1.961 --- CVSROOT/avail:1.960 Sat Mar 26 13:10:05 2005 +++ CVSROOT/avail Mon Mar 28 19:00:01 2005 @@ -220,6 +220,7 @@ avail|mcmontero|pecl/imagick avail|schst,lucamariano|pear/Net_Server avail|bjori|pear/Net_FTP +avail|cyberscribe|pear/Net_Monitor avail|mroch|pear/XML_RPC avail|olivierg|pear/XML_Indexing avail|djg|pear/File_Ogg -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard streamsfuncs.c /main/streams filter.c php_stream_filter_api.h
pollita Mon Mar 28 23:02:04 2005 EDT
Modified files:
/php-src/main/streams php_stream_filter_api.h filter.c
/php-src/ext/standard streamsfuncs.c
Log:
BugFix #31137 stream_filter_remove() segfaults when stream already closed
http://cvs.php.net/diff.php/php-src/main/streams/php_stream_filter_api.h?r1=1.11r2=1.12ty=u
Index: php-src/main/streams/php_stream_filter_api.h
diff -u php-src/main/streams/php_stream_filter_api.h:1.11
php-src/main/streams/php_stream_filter_api.h:1.12
--- php-src/main/streams/php_stream_filter_api.h:1.11 Mon Sep 13 23:48:16 2004
+++ php-src/main/streams/php_stream_filter_api.hMon Mar 28 23:02:02 2005
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: php_stream_filter_api.h,v 1.11 2004/09/14 03:48:16 pollita Exp $ */
+/* $Id: php_stream_filter_api.h,v 1.12 2005/03/29 04:02:02 pollita Exp $ */
/* The filter API works on the principle of Bucket-Brigades. This is
* partially inspired by the Apache 2 method of doing things, although
@@ -117,6 +117,9 @@
/* buffered buckets */
php_stream_bucket_brigade buffer;
+
+ /* filters are auto_registered when they're applied */
+ int rsrc_id;
};
/* stack filter onto a stream */
http://cvs.php.net/diff.php/php-src/main/streams/filter.c?r1=1.15r2=1.16ty=u
Index: php-src/main/streams/filter.c
diff -u php-src/main/streams/filter.c:1.15 php-src/main/streams/filter.c:1.16
--- php-src/main/streams/filter.c:1.15 Mon Sep 13 23:48:16 2004
+++ php-src/main/streams/filter.c Mon Mar 28 23:02:02 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: filter.c,v 1.15 2004/09/14 03:48:16 pollita Exp $ */
+/* $Id: filter.c,v 1.16 2005/03/29 04:02:02 pollita Exp $ */
#include php.h
#include php_globals.h
@@ -499,6 +499,11 @@
} else {
filter-chain-tail = filter-prev;
}
+
+ if (filter-rsrc_id 0) {
+ zend_list_delete(filter-rsrc_id);
+ }
+
if (call_dtor) {
php_stream_filter_free(filter TSRMLS_CC);
return NULL;
http://cvs.php.net/diff.php/php-src/ext/standard/streamsfuncs.c?r1=1.54r2=1.55ty=u
Index: php-src/ext/standard/streamsfuncs.c
diff -u php-src/ext/standard/streamsfuncs.c:1.54
php-src/ext/standard/streamsfuncs.c:1.55
--- php-src/ext/standard/streamsfuncs.c:1.54Sun Mar 13 12:03:55 2005
+++ php-src/ext/standard/streamsfuncs.c Mon Mar 28 23:02:03 2005
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: streamsfuncs.c,v 1.54 2005/03/13 17:03:55 iliaa Exp $ */
+/* $Id: streamsfuncs.c,v 1.55 2005/03/29 04:02:03 pollita Exp $ */
#include php.h
#include php_globals.h
@@ -1097,7 +1097,7 @@
}
if (filter) {
- RETURN_RESOURCE(ZEND_REGISTER_RESOURCE(NULL, filter,
php_file_le_stream_filter()));
+ RETURN_RESOURCE(filter-rsrc_id = ZEND_REGISTER_RESOURCE(NULL,
filter, php_file_le_stream_filter()));
} else {
RETURN_FALSE;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
