Re: [PHP-CVS] cvs: php-src /ext/standard http.c
This is not entirely correct. With IS_UNICODE you need to compare
against a 16-bit 0, not a '\0' which is an 8-bit one.
-Andrei
P.S. Why am I writing this after getting back from a bar?
On Jul 22, 2006, at 11:05 PM, Marcus Boerger wrote:
+ if ((key_type == HASH_KEY_IS_STRING || key_type ==
HASH_KEY_IS_UNICODE)
+ && key_len && key.s[key_len-1] == '\0') {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /main rfc1867.c rfc1867.h
Antony, > So this is the reason you think you can break the upcoming release now? > Please revert it, as I don't want to see yet another broken release > just because you decided you can do what you want. Instead of bothering me with your opinion have a look at my code and tell me where it is broken. Unless you find a bug this discussion is pointless. I seriously doubt that you will find anything, but try. We have completely different ideas about what "testing" means. Code commited by me usually WORKS. But that doesn't mean it is 100% bugfree and just because it seems to work doesn't mean I consider it 100% tested. And spare me your believes that PHP developers commit to HEAD first and then backport to branches. This is a) not true and b) doesn't lead to not broken releases (Hello Zend) and c) doesn't solve the sync problem, because those working on HEAD often don't care at all about backporting. This has happened f.e. a bunch of times with security patches that were never backported from HEAD. When I say I will take care of later merging the new code into HEAD when I am 100%ly sure that there is no obvious bug left, then I will do that. I see no point in reverting the code. If you fear that it breaks an upcoming release then simply install PHP 5.2 and try uploading files. Wait that would be a too easy check and you would not be able to flame... (Wait... the same check would have catched the Zend fault in 5.1.3...) Stefan -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /main rfc1867.c rfc1867.h
On 23.07.2006 11:16, Stefan Esser wrote: Antony, So this is the reason you think you can break the upcoming release now? Please revert it, as I don't want to see yet another broken release just because you decided you can do what you want. Instead of bothering me with your opinion Please stop "bothering me with your opionion" regarding Zend and current policies in PHP community. Just follow the rules that were set for all the developers, including you. By actively ignoring the rules you just show your disrespect to the others. I pretty sure you don't care about it, but we do. have a look at my code and tell me where it is broken. Oh, please. You said it yourself that your code is not stable, no need to waste my time on your code. Unless you find a bug this discussion is pointless. The discussion is more about you and your attitude. And spare me your believes that PHP developers commit to HEAD first and then backport to branches. This is a) not true and b) doesn't lead to not broken releases (Hello Zend) IIRC you did manage to break a release (or even two?) either, so please calm down and change your attitude. and c) doesn't solve the sync problem, because those working on HEAD often don't care at all about backporting. This sentence doesn't make any sense to me, as "those working on HEAD" add either HEAD only features or backport them into 5.2. There are no 5.2 only features, and you're trying to make one. This has happened f.e. a bunch of times with security patches that were never backported from HEAD. Great joke, Stefan! I really like it! "Several years ago somebody forgot to MFH a patch from HEAD, so I decided to leave HEAD out of sync and I don't give a shit what others think about it". What a LOL =) When I say I will take care of later merging the new code into HEAD when I am 100%ly sure that there is no obvious bug left, then I will do that. I see no point in reverting the code. If you fear that it breaks an upcoming release then simply install PHP 5.2 and try uploading files. No problem, I'll do it as soon as you revert the patch and leave it for the next release. Wait that would be a too easy check and you would not be able to flame... (Wait... the same check would have catched the Zend fault in 5.1.3...) Aw, you're so smart, but you didn't catch the problem either, did you? -- Wbr, Antony Dovgal -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] Re: [PHP-DEV] Re: [PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /main rfc1867.c rfc1867.h
Antony, grow up. Stefan -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/xmlreader php_xmlreader.c /ext/xmlreader/tests 012.phpt 013.phpt
On 19.07.2006 21:32, Rob Richards wrote:
@@ -607,11 +613,18 @@
zval *id;
int name_len = 0, ns_uri_len = 0;
xmlreader_object *intern;
- char *name, *ns_uri, *retchar = NULL;
+ xmlChar *retchar = NULL;
+ char *name, *ns_uri;
+ UConverter *orig_runtime_conv;
+
+ orig_runtime_conv = ZEND_U_CONVERTER(UG(runtime_encoding_conv));
+ UG(runtime_encoding_conv) = UG(utf8_conv);
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss", &name, &name_len, &ns_uri, &ns_uri_len) == FAILURE) {
+ UG(runtime_encoding_conv) = orig_runtime_conv;
return;
}
+ UG(runtime_encoding_conv) = orig_runtime_conv;
First of all, why would you want to do that when Unicode mode is disabled?
Second, here is what we've got now:
1) UG(runtime_encoding_conv) is not set;
2) ZEND_U_CONVERTER() returns UG(fallback_encoding_conv);
3) you set UG(runtime_encoding_conv) to UG(fallback_encoding_conv);
4) on shutdown unicode_globals_dtor() destroys UG(fallback_encoding_conv) first;
5) then it tries to destroy UG(runtime_encoding_conv) that points to UG(fallback_encoding_conv), which just has been destroyed;
6) Segfault. The end.
--
Wbr,
Antony Dovgal
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/xmlreader php_xmlreader.c /ext/xmlreader/tests 012.phpt 013.phpt
Right, we need a different workaround. I am about to jump on a plane,
but will revisit it as soon as possible.
-Andrei
On Jul 23, 2006, at 5:22 AM, Antony Dovgal wrote:
On 19.07.2006 21:32, Rob Richards wrote:
@@ -607,11 +613,18 @@
zval *id;
int name_len = 0, ns_uri_len = 0;
xmlreader_object *intern;
- char *name, *ns_uri, *retchar = NULL;
+ xmlChar *retchar = NULL;
+ char *name, *ns_uri;
+ UConverter *orig_runtime_conv;
+
+ orig_runtime_conv = ZEND_U_CONVERTER(UG(runtime_encoding_conv));
+ UG(runtime_encoding_conv) = UG(utf8_conv);
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss",
&name, &name_len, &ns_uri, &ns_uri_len) == FAILURE) {
+ UG(runtime_encoding_conv) = orig_runtime_conv;
return;
}
+ UG(runtime_encoding_conv) = orig_runtime_conv;
First of all, why would you want to do that when Unicode mode is
disabled?
Second, here is what we've got now:
1) UG(runtime_encoding_conv) is not set;
2) ZEND_U_CONVERTER() returns UG(fallback_encoding_conv);
3) you set UG(runtime_encoding_conv) to UG(fallback_encoding_conv);
4) on shutdown unicode_globals_dtor() destroys UG
(fallback_encoding_conv) first;
5) then it tries to destroy UG(runtime_encoding_conv) that points
to UG(fallback_encoding_conv), which just has been destroyed; 6)
Segfault. The end.
--
Wbr, Antony Dovgal
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/xmlreader php_xmlreader.c /ext/xmlreader/tests 012.phpt 013.phpt
On 23.07.2006 15:27, Andrei Zmievski wrote:
Right, we need a different workaround. I am about to jump on a plane,
but will revisit it as soon as possible.
Great, thanks a lot.
On Jul 23, 2006, at 5:22 AM, Antony Dovgal wrote:
On 19.07.2006 21:32, Rob Richards wrote:
@@ -607,11 +613,18 @@
zval *id;
int name_len = 0, ns_uri_len = 0;
xmlreader_object *intern;
- char *name, *ns_uri, *retchar = NULL;
+ xmlChar *retchar = NULL;
+ char *name, *ns_uri;
+ UConverter *orig_runtime_conv;
+
+ orig_runtime_conv = ZEND_U_CONVERTER(UG(runtime_encoding_conv));
+ UG(runtime_encoding_conv) = UG(utf8_conv);
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss",
&name, &name_len, &ns_uri, &ns_uri_len) == FAILURE) {
+ UG(runtime_encoding_conv) = orig_runtime_conv;
return;
}
+ UG(runtime_encoding_conv) = orig_runtime_conv;
First of all, why would you want to do that when Unicode mode is
disabled?
Second, here is what we've got now:
1) UG(runtime_encoding_conv) is not set;
2) ZEND_U_CONVERTER() returns UG(fallback_encoding_conv);
3) you set UG(runtime_encoding_conv) to UG(fallback_encoding_conv);
4) on shutdown unicode_globals_dtor() destroys UG
(fallback_encoding_conv) first;
5) then it tries to destroy UG(runtime_encoding_conv) that points
to UG(fallback_encoding_conv), which just has been destroyed; 6)
Segfault. The end.
--
Wbr, Antony Dovgal
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
--
Wbr,
Antony Dovgal
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /main rfc1867.c rfc1867.h
On Sun, 23 Jul 2006, Stefan Esser wrote: > Antony, > > So this is the reason you think you can break the upcoming release now? > > Please revert it, as I don't want to see yet another broken release > > just because you decided you can do what you want. > Instead of bothering me with your opinion have a look at my code and > tell me where it is broken. Unless you find a bug this discussion is > pointless. Sorry, but that's not the point. The point is that we don't introduce new experimental code in *just* the stable branch for all the reasons that Tony mentioned. Whether the code is perfect is irrelevant. Derick -- Derick Rethans http://derickrethans.nl | http://ez.no | http://xdebug.org -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /main rfc1867.c rfc1867.h
Doing unicode from scratch in PDO when I'm ready to do it has always been my intention. Stop moaning about it. --Wez. On 7/22/06, Marcus Boerger <[EMAIL PROTECTED]> wrote: Hello Stefan, well the policy is you commit to HEAD first so that HEAD and base do not get out of synch. For PDO we already have the situation and it will most likely require us to drop all of PDO in HEAD and start adding unicode from scratch without loosing new stuff in HEAD. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] Re: [PHP-DEV] Re: [PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /main rfc1867.c rfc1867.h
I agree; this upload patch should be reverted. --Wez. On 7/23/06, Derick Rethans <[EMAIL PROTECTED]> wrote: On Sun, 23 Jul 2006, Stefan Esser wrote: > Antony, > > So this is the reason you think you can break the upcoming release now? > > Please revert it, as I don't want to see yet another broken release > > just because you decided you can do what you want. > Instead of bothering me with your opinion have a look at my code and > tell me where it is broken. Unless you find a bug this discussion is > pointless. Sorry, but that's not the point. The point is that we don't introduce new experimental code in *just* the stable branch for all the reasons that Tony mentioned. Whether the code is perfect is irrelevant. Derick -- Derick Rethans http://derickrethans.nl | http://ez.no | http://xdebug.org -- PHP Internals - PHP Runtime Development Mailing List To unsubscribe, visit: http://www.php.net/unsub.php -- 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) / README.UPDATE_5_2
helly Sun Jul 23 18:51:23 2006 UTC Modified files: (Branch: PHP_5_2) /php-srcREADME.UPDATE_5_2 Log: - This was reintroduced by Zeev # I could need help in writing this file. Actually i know why i didn't want # to start it in the first place. http://cvs.php.net/viewvc.cgi/php-src/README.UPDATE_5_2?r1=1.1.2.5&r2=1.1.2.6&diff_format=u Index: php-src/README.UPDATE_5_2 diff -u php-src/README.UPDATE_5_2:1.1.2.5 php-src/README.UPDATE_5_2:1.1.2.6 --- php-src/README.UPDATE_5_2:1.1.2.5 Thu May 25 10:20:56 2006 +++ php-src/README.UPDATE_5_2 Sun Jul 23 18:51:23 2006 @@ -14,12 +14,6 @@ kind of error they behave as fatal errors just like in any PHP version prior to 5.2. Errors of this type are logged as 'Catchable fatal error'. -- Removed ze1 compatibility mode. (Marcus) - - The backwards compatibility support for the old PHP 4.x object handling that - uses copying by default instead of the 5.x reference handling has been - removed completley. - - Added support for constructors in interfaces to force constructor signature checks in implementations. (Marcus) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_2) / README.UPDATE_5_2
If someone pokes me before release I'll clean up the English. You just worry about the tech side ;) - Original Message - From: "Marcus Boerger" <[EMAIL PROTECTED]> To: Sent: Sunday, July 23, 2006 8:51 PM Subject: [PHP-CVS] cvs: php-src(PHP_5_2) / README.UPDATE_5_2 helly Sun Jul 23 18:51:23 2006 UTC Modified files: (Branch: PHP_5_2) /php-src README.UPDATE_5_2 Log: - This was reintroduced by Zeev # I could need help in writing this file. Actually i know why i didn't want # to start it in the first place. http://cvs.php.net/viewvc.cgi/php-src/README.UPDATE_5_2?r1=1.1.2.5&r2=1.1.2.6&diff_format=u Index: php-src/README.UPDATE_5_2 diff -u php-src/README.UPDATE_5_2:1.1.2.5 php-src/README.UPDATE_5_2:1.1.2.6 --- php-src/README.UPDATE_5_2:1.1.2.5 Thu May 25 10:20:56 2006 +++ php-src/README.UPDATE_5_2 Sun Jul 23 18:51:23 2006 @@ -14,12 +14,6 @@ kind of error they behave as fatal errors just like in any PHP version prior to 5.2. Errors of this type are logged as 'Catchable fatal error'. -- Removed ze1 compatibility mode. (Marcus) - - The backwards compatibility support for the old PHP 4.x object handling that - uses copying by default instead of the 5.x reference handling has been - removed completley. - - Added support for constructors in interfaces to force constructor signature checks in implementations. (Marcus) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php __ NOD32 1.1380 (20060125) Information __ This message was checked by NOD32 antivirus system. http://www.eset.com -- 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 /ext/gd/tests 38179.phpt
pajoye Sun Jul 23 21:48:18 2006 UTC
Modified files:
/php-src/ext/gd/tests 38179.phpt
/php-src/ext/gd/libgd gd.c
Log:
- MFB: #38179, imagecopy, palette to truecolor must use alpha channel too
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/tests/38179.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/gd/tests/38179.phpt
diff -u /dev/null php-src/ext/gd/tests/38179.phpt:1.2
--- /dev/null Sun Jul 23 21:48:18 2006
+++ php-src/ext/gd/tests/38179.phpt Sun Jul 23 21:48:18 2006
@@ -0,0 +1,28 @@
+--TEST--
+imagecopy doen't copy alpha, palette to truecolor
+--SKIPIF--
+
+--FILE--
+
+--EXPECTF--
+46FF
+
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/libgd/gd.c?r1=1.93&r2=1.94&diff_format=u
Index: php-src/ext/gd/libgd/gd.c
diff -u php-src/ext/gd/libgd/gd.c:1.93 php-src/ext/gd/libgd/gd.c:1.94
--- php-src/ext/gd/libgd/gd.c:1.93 Fri Dec 30 09:53:05 2005
+++ php-src/ext/gd/libgd/gd.c Sun Jul 23 21:48:18 2006
@@ -2190,7 +2190,7 @@
for (x = 0; (x < w); x++) {
int c = gdImageGetPixel (src, srcX + x,
srcY + y);
if (c != src->transparent) {
- gdImageSetPixel (dst, dstX + x,
dstY + y, gdTrueColor(src->red[c], src->green[c], src->blue[c]));
+ gdImageSetPixel(dst, dstX + x,
dstY + y, gdTrueColorAlpha(src->red[c], src->green[c], src->blue[c],
src->alpha[c]));
}
}
}
--
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.c /ext/gd/tests 38179.phpt
pajoye Sun Jul 23 21:41:12 2006 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/gd/tests 38179.phpt
Modified files:
/php-src/ext/gd/libgd gd.c
Log:
- #38179, imagecopy, palette to truecolor must use alpha channel too
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/libgd/gd.c?r1=1.90.2.1&r2=1.90.2.1.2.1&diff_format=u
Index: php-src/ext/gd/libgd/gd.c
diff -u php-src/ext/gd/libgd/gd.c:1.90.2.1
php-src/ext/gd/libgd/gd.c:1.90.2.1.2.1
--- php-src/ext/gd/libgd/gd.c:1.90.2.1 Fri Sep 30 20:48:05 2005
+++ php-src/ext/gd/libgd/gd.c Sun Jul 23 21:41:11 2006
@@ -2161,7 +2161,7 @@
for (x = 0; (x < w); x++) {
int c = gdImageGetPixel (src, srcX + x,
srcY + y);
if (c != src->transparent) {
- gdImageSetPixel (dst, dstX + x,
dstY + y, gdTrueColor(src->red[c], src->green[c], src->blue[c]));
+ gdImageSetPixel(dst, dstX + x,
dstY + y, gdTrueColorAlpha(src->red[c], src->green[c], src->blue[c],
src->alpha[c]));
}
}
}
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/tests/38179.phpt?view=markup&rev=1.1
Index: php-src/ext/gd/tests/38179.phpt
+++ php-src/ext/gd/tests/38179.phpt
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /scripts phpize.in
sniper Sun Jul 23 23:40:19 2006 UTC Modified files: /php-src/scriptsphpize.in Log: typofix http://cvs.php.net/viewvc.cgi/php-src/scripts/phpize.in?r1=1.32&r2=1.33&diff_format=u Index: php-src/scripts/phpize.in diff -u php-src/scripts/phpize.in:1.32 php-src/scripts/phpize.in:1.33 --- php-src/scripts/phpize.in:1.32 Mon Jul 17 01:17:00 2006 +++ php-src/scripts/phpize.in Sun Jul 23 23:40:19 2006 @@ -102,7 +102,7 @@ test -z "$PHP_AUTOCONF" && PHP_AUTOCONF=autoconf test -z "$PHP_AUTOHEADER" && PHP_AUTOHEADER=autoheader - if ! text -x $PHP_AUTOCONF && ! test -x "`$php_shtool path $PHP_AUTOCONF`"; then + if ! test -x $PHP_AUTOCONF && ! test -x "`$php_shtool path $PHP_AUTOCONF`"; then cat
[PHP-CVS] cvs: php-src /ext/sybase_ct php_sybase_ct.c
sniper Sun Jul 23 23:50:24 2006 UTC
Modified files:
/php-src/ext/sybase_ct php_sybase_ct.c
Log:
fix compile failure and remove unnecessary TSRMLS_FETCH calls
http://cvs.php.net/viewvc.cgi/php-src/ext/sybase_ct/php_sybase_ct.c?r1=1.112&r2=1.113&diff_format=u
Index: php-src/ext/sybase_ct/php_sybase_ct.c
diff -u php-src/ext/sybase_ct/php_sybase_ct.c:1.112
php-src/ext/sybase_ct/php_sybase_ct.c:1.113
--- php-src/ext/sybase_ct/php_sybase_ct.c:1.112 Tue Jun 13 13:12:20 2006
+++ php-src/ext/sybase_ct/php_sybase_ct.c Sun Jul 23 23:50:24 2006
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: php_sybase_ct.c,v 1.112 2006/06/13 13:12:20 dmitry Exp $ */
+/* $Id: php_sybase_ct.c,v 1.113 2006/07/23 23:50:24 sniper Exp $ */
#ifdef HAVE_CONFIG_H
@@ -374,7 +374,6 @@
static PHP_GINIT_FUNCTION(sybase)
{
long opt;
- TSRMLS_FETCH();
if (cs_ctx_alloc(CTLIB_VERSION, &sybase_globals->context)!=CS_SUCCEED
|| ct_init(sybase_globals->context, CTLIB_VERSION)!=CS_SUCCEED) {
return;
@@ -477,11 +476,10 @@
}
-static int php_sybase_do_connect_internal(sybase_link *sybase, char *host,
char *user, char *passwd, char *charset, char *appname)
+static int php_sybase_do_connect_internal(sybase_link *sybase, char *host,
char *user, char *passwd, char *charset, char *appname TSRMLS_DC)
{
CS_LOCALE *tmp_locale;
long packetsize;
- TSRMLS_FETCH();
/* set a CS_CONNECTION record */
if (ct_con_alloc(SybCtG(context), &sybase->connection)!=CS_SUCCEED) {
@@ -708,7 +706,7 @@
}
sybase_ptr = (sybase_link *)
malloc(sizeof(sybase_link));
- if (!php_sybase_do_connect_internal(sybase_ptr, host,
user, passwd, charset, appname)) {
+ if (!php_sybase_do_connect_internal(sybase_ptr, host,
user, passwd, charset, appname TSRMLS_CC)) {
free(sybase_ptr);
efree(hashed_details);
RETURN_FALSE;
@@ -762,7 +760,7 @@
* NULL before trying to use it elsewhere . . .)
*/
memcpy(&sybase, sybase_ptr,
sizeof(sybase_link));
- if (!php_sybase_do_connect_internal(sybase_ptr,
host, user, passwd, charset, appname)) {
+ if (!php_sybase_do_connect_internal(sybase_ptr,
host, user, passwd, charset, appname TSRMLS_CC)) {
memcpy(sybase_ptr, &sybase,
sizeof(sybase_link));
efree(hashed_details);
RETURN_FALSE;
@@ -806,7 +804,7 @@
}
sybase_ptr = (sybase_link *) emalloc(sizeof(sybase_link));
- if (!php_sybase_do_connect_internal(sybase_ptr, host, user,
passwd, charset, appname)) {
+ if (!php_sybase_do_connect_internal(sybase_ptr, host, user,
passwd, charset, appname TSRMLS_CC)) {
efree(sybase_ptr);
efree(hashed_details);
RETURN_FALSE;
@@ -1022,12 +1020,11 @@
/* }}} */
-static int php_sybase_finish_results (sybase_result *result)
+static int php_sybase_finish_results(sybase_result *result TSRMLS_DC)
{
int i, fail;
CS_RETCODE retcode;
CS_INT restype;
- TSRMLS_FETCH();
efree(result->datafmt);
efree(result->lengths);
@@ -1209,7 +1206,7 @@
result->last_retcode= retcode;
switch (retcode) {
case CS_END_DATA:
- retcode = php_sybase_finish_results(result);
+ retcode = php_sybase_finish_results(result TSRMLS_CC);
break;
case CS_ROW_FAIL:
@@ -1434,7 +1431,7 @@
*/
#if O_TIMM
if (result) {
- php_sybase_finish_results(result);
+ php_sybase_finish_results(result TSRMLS_CC);
}
#endif
@@ -1669,7 +1666,7 @@
if (result->last_retcode != CS_END_DATA && result->last_retcode !=
CS_END_RESULTS) {
/* php_error_docref(NULL TSRMLS_CC, E_WARNING, "Sybase:
Cancelling the rest of the results"); */
ct_cancel(NULL, result->sybase_ptr->cmd, CS_CANCEL_ALL);
- php_sybase_finish_results(result);
+ php_sybase_finish_results(result TSRMLS_CC);
}
zend_list_delete(Z_LVAL_PP(sybase_result_index));
--
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/sybase_ct php_sybase_ct.c
sniper Sun Jul 23 23:50:43 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/sybase_ct php_sybase_ct.c
Log:
MFH: fix compile failure and remove unnecessary TSRMLS_FETCH calls
http://cvs.php.net/viewvc.cgi/php-src/ext/sybase_ct/php_sybase_ct.c?r1=1.103.2.5.2.2&r2=1.103.2.5.2.3&diff_format=u
Index: php-src/ext/sybase_ct/php_sybase_ct.c
diff -u php-src/ext/sybase_ct/php_sybase_ct.c:1.103.2.5.2.2
php-src/ext/sybase_ct/php_sybase_ct.c:1.103.2.5.2.3
--- php-src/ext/sybase_ct/php_sybase_ct.c:1.103.2.5.2.2 Thu Jun 15 18:33:09 2006
+++ php-src/ext/sybase_ct/php_sybase_ct.c Sun Jul 23 23:50:43 2006
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: php_sybase_ct.c,v 1.103.2.5.2.2 2006/06/15 18:33:09 dmitry Exp $ */
+/* $Id: php_sybase_ct.c,v 1.103.2.5.2.3 2006/07/23 23:50:43 sniper Exp $ */
#ifdef HAVE_CONFIG_H
@@ -374,7 +374,6 @@
static PHP_GINIT_FUNCTION(sybase)
{
long opt;
- TSRMLS_FETCH();
if (cs_ctx_alloc(CTLIB_VERSION, &sybase_globals->context)!=CS_SUCCEED
|| ct_init(sybase_globals->context, CTLIB_VERSION)!=CS_SUCCEED) {
return;
@@ -477,11 +476,10 @@
}
-static int php_sybase_do_connect_internal(sybase_link *sybase, char *host,
char *user, char *passwd, char *charset, char *appname)
+static int php_sybase_do_connect_internal(sybase_link *sybase, char *host,
char *user, char *passwd, char *charset, char *appname TSRMLS_DC)
{
CS_LOCALE *tmp_locale;
long packetsize;
- TSRMLS_FETCH();
/* set a CS_CONNECTION record */
if (ct_con_alloc(SybCtG(context), &sybase->connection)!=CS_SUCCEED) {
@@ -708,7 +706,7 @@
}
sybase_ptr = (sybase_link *)
malloc(sizeof(sybase_link));
- if (!php_sybase_do_connect_internal(sybase_ptr, host,
user, passwd, charset, appname)) {
+ if (!php_sybase_do_connect_internal(sybase_ptr, host,
user, passwd, charset, appname TSRMLS_CC)) {
free(sybase_ptr);
efree(hashed_details);
RETURN_FALSE;
@@ -762,7 +760,7 @@
* NULL before trying to use it elsewhere . . .)
*/
memcpy(&sybase, sybase_ptr,
sizeof(sybase_link));
- if (!php_sybase_do_connect_internal(sybase_ptr,
host, user, passwd, charset, appname)) {
+ if (!php_sybase_do_connect_internal(sybase_ptr,
host, user, passwd, charset, appname TSRMLS_CC)) {
memcpy(sybase_ptr, &sybase,
sizeof(sybase_link));
efree(hashed_details);
RETURN_FALSE;
@@ -806,7 +804,7 @@
}
sybase_ptr = (sybase_link *) emalloc(sizeof(sybase_link));
- if (!php_sybase_do_connect_internal(sybase_ptr, host, user,
passwd, charset, appname)) {
+ if (!php_sybase_do_connect_internal(sybase_ptr, host, user,
passwd, charset, appname TSRMLS_CC)) {
efree(sybase_ptr);
efree(hashed_details);
RETURN_FALSE;
@@ -1022,12 +1020,11 @@
/* }}} */
-static int php_sybase_finish_results (sybase_result *result)
+static int php_sybase_finish_results(sybase_result *result TSRMLS_DC)
{
int i, fail;
CS_RETCODE retcode;
CS_INT restype;
- TSRMLS_FETCH();
efree(result->datafmt);
efree(result->lengths);
@@ -1209,7 +1206,7 @@
result->last_retcode= retcode;
switch (retcode) {
case CS_END_DATA:
- retcode = php_sybase_finish_results(result);
+ retcode = php_sybase_finish_results(result TSRMLS_CC);
break;
case CS_ROW_FAIL:
@@ -1434,7 +1431,7 @@
*/
#if O_TIMM
if (result) {
- php_sybase_finish_results(result);
+ php_sybase_finish_results(result TSRMLS_CC);
}
#endif
@@ -1669,7 +1666,7 @@
if (result->last_retcode != CS_END_DATA && result->last_retcode !=
CS_END_RESULTS) {
/* php_error_docref(NULL TSRMLS_CC, E_WARNING, "Sybase:
Cancelling the rest of the results"); */
ct_cancel(NULL, result->sybase_ptr->cmd, CS_CANCEL_ALL);
- php_sybase_finish_results(result);
+ php_sybase_finish_results(result TSRMLS_CC);
}
zend_list_delete(Z_LVAL_PP(sybase_result_index));
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/fdf fdf.c
sniper Sun Jul 23 23:55:26 2006 UTC Modified files: /php-src/ext/fdffdf.c Log: fix another compile failure. (bjori: TEST before commit!) http://cvs.php.net/viewvc.cgi/php-src/ext/fdf/fdf.c?r1=1.96&r2=1.97&diff_format=u Index: php-src/ext/fdf/fdf.c diff -u php-src/ext/fdf/fdf.c:1.96 php-src/ext/fdf/fdf.c:1.97 --- php-src/ext/fdf/fdf.c:1.96 Sun Jul 2 00:10:36 2006 +++ php-src/ext/fdf/fdf.c Sun Jul 23 23:55:26 2006 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: fdf.c,v 1.96 2006/07/02 00:10:36 bjori Exp $ */ +/* $Id: fdf.c,v 1.97 2006/07/23 23:55:26 sniper Exp $ */ /* FdfTk lib 2.0 is a Complete C/C++ FDF Toolkit available from http://beta1.adobe.com/ada/acrosdk/forms.html. */ @@ -269,7 +269,7 @@ ZEND_END_ARG_INFO() static -ZEND_BEGIN_ARG_INFO_EX(arginfo_fdf_header, 0) +ZEND_BEGIN_ARG_INFO(arginfo_fdf_header, 0) ZEND_END_ARG_INFO() /* }}} */ -- 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/fdf fdf.c
sniper Sun Jul 23 23:55:46 2006 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/fdffdf.c Log: MFH: cleanup after lazy people http://cvs.php.net/viewvc.cgi/php-src/ext/fdf/fdf.c?r1=1.89.2.2.2.3&r2=1.89.2.2.2.4&diff_format=u Index: php-src/ext/fdf/fdf.c diff -u php-src/ext/fdf/fdf.c:1.89.2.2.2.3 php-src/ext/fdf/fdf.c:1.89.2.2.2.4 --- php-src/ext/fdf/fdf.c:1.89.2.2.2.3 Sun Jul 2 00:11:06 2006 +++ php-src/ext/fdf/fdf.c Sun Jul 23 23:55:46 2006 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: fdf.c,v 1.89.2.2.2.3 2006/07/02 00:11:06 bjori Exp $ */ +/* $Id: fdf.c,v 1.89.2.2.2.4 2006/07/23 23:55:46 sniper Exp $ */ /* FdfTk lib 2.0 is a Complete C/C++ FDF Toolkit available from http://beta1.adobe.com/ada/acrosdk/forms.html. */ @@ -269,7 +269,7 @@ ZEND_END_ARG_INFO() static -ZEND_BEGIN_ARG_INFO_EX(arginfo_fdf_header, 0) +ZEND_BEGIN_ARG_INFO(arginfo_fdf_header, 0) ZEND_END_ARG_INFO() /* }}} */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/pdo_dblib pdo_dblib.c
sniper Mon Jul 24 00:00:35 2006 UTC
Modified files:
/php-src/ext/pdo_dblib pdo_dblib.c
Log:
fix build
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_dblib/pdo_dblib.c?r1=1.13&r2=1.14&diff_format=u
Index: php-src/ext/pdo_dblib/pdo_dblib.c
diff -u php-src/ext/pdo_dblib/pdo_dblib.c:1.13
php-src/ext/pdo_dblib/pdo_dblib.c:1.14
--- php-src/ext/pdo_dblib/pdo_dblib.c:1.13 Tue Jun 13 13:12:19 2006
+++ php-src/ext/pdo_dblib/pdo_dblib.c Mon Jul 24 00:00:35 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: pdo_dblib.c,v 1.13 2006/06/13 13:12:19 dmitry Exp $ */
+/* $Id: pdo_dblib.c,v 1.14 2006/07/24 00:00:35 sniper Exp $ */
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -33,7 +33,7 @@
#include "zend_exceptions.h"
ZEND_DECLARE_MODULE_GLOBALS(dblib)
-static PHP_GINIT_FUNCTION(dblib)
+static PHP_GINIT_FUNCTION(dblib);
zend_function_entry pdo_dblib_functions[] = {
{NULL, NULL, NULL}
--
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/pdo_dblib pdo_dblib.c
sniper Mon Jul 24 00:01:02 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/pdo_dblib pdo_dblib.c
Log:
fix build and typo after another lazy ass who does not test before commit:
Dmitry
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_dblib/pdo_dblib.c?r1=1.9.2.6.2.1&r2=1.9.2.6.2.2&diff_format=u
Index: php-src/ext/pdo_dblib/pdo_dblib.c
diff -u php-src/ext/pdo_dblib/pdo_dblib.c:1.9.2.6.2.1
php-src/ext/pdo_dblib/pdo_dblib.c:1.9.2.6.2.2
--- php-src/ext/pdo_dblib/pdo_dblib.c:1.9.2.6.2.1 Thu Jun 15 18:33:08 2006
+++ php-src/ext/pdo_dblib/pdo_dblib.c Mon Jul 24 00:01:02 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: pdo_dblib.c,v 1.9.2.6.2.1 2006/06/15 18:33:08 dmitry Exp $ */
+/* $Id: pdo_dblib.c,v 1.9.2.6.2.2 2006/07/24 00:01:02 sniper Exp $ */
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -33,7 +33,7 @@
#include "zend_exceptions.h"
ZEND_DECLARE_MODULE_GLOBALS(dblib)
-static PHP_GINIT_FUNCTION(dblib)
+static PHP_GINIT_FUNCTION(dblib);
zend_function_entry pdo_dblib_functions[] = {
{NULL, NULL, NULL}
@@ -67,7 +67,7 @@
PHP_RSHUTDOWN(pdo_dblib),
PHP_MINFO(pdo_dblib),
"1.0.1",
- PHP_MODULE_GLOBASLS(dblib),
+ PHP_MODULE_GLOBALS(dblib),
PHP_GINIT(dblib),
NULL,
NULL,
--
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/filter filter.c
iliaa Mon Jul 24 03:58:41 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/filter filter.c
Log:
Fixed compiler warning.
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/filter.c?r1=1.52.2.6&r2=1.52.2.7&diff_format=u
Index: php-src/ext/filter/filter.c
diff -u php-src/ext/filter/filter.c:1.52.2.6
php-src/ext/filter/filter.c:1.52.2.7
--- php-src/ext/filter/filter.c:1.52.2.6Sat Jul 22 12:49:36 2006
+++ php-src/ext/filter/filter.c Mon Jul 24 03:58:41 2006
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: filter.c,v 1.52.2.6 2006/07/22 12:49:36 nlopess Exp $ */
+/* $Id: filter.c,v 1.52.2.7 2006/07/24 03:58:41 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -274,7 +274,7 @@
{
php_info_print_table_start();
php_info_print_table_row( 2, "Input Validation and Filtering",
"enabled" );
- php_info_print_table_row( 2, "Revision", "$Revision: 1.52.2.6 $");
+ php_info_print_table_row( 2, "Revision", "$Revision: 1.52.2.7 $");
php_info_print_table_end();
DISPLAY_INI_ENTRIES();
@@ -790,7 +790,7 @@
array_init(return_value);
for (i = 0; i < size; ++i) {
- add_next_index_string(return_value, filter_list[i].name, 1);
+ add_next_index_string(return_value, (char
*)filter_list[i].name, 1);
}
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/filter filter.c
iliaa Mon Jul 24 03:59:04 2006 UTC
Modified files:
/php-src/ext/filter filter.c
Log:
MFB: Fixed compiler warning.
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/filter.c?r1=1.58&r2=1.59&diff_format=u
Index: php-src/ext/filter/filter.c
diff -u php-src/ext/filter/filter.c:1.58 php-src/ext/filter/filter.c:1.59
--- php-src/ext/filter/filter.c:1.58Sat Jul 22 12:54:05 2006
+++ php-src/ext/filter/filter.c Mon Jul 24 03:59:03 2006
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: filter.c,v 1.58 2006/07/22 12:54:05 nlopess Exp $ */
+/* $Id: filter.c,v 1.59 2006/07/24 03:59:03 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -274,7 +274,7 @@
{
php_info_print_table_start();
php_info_print_table_row( 2, "Input Validation and Filtering",
"enabled" );
- php_info_print_table_row( 2, "Revision", "$Revision: 1.58 $");
+ php_info_print_table_row( 2, "Revision", "$Revision: 1.59 $");
php_info_print_table_end();
DISPLAY_INI_ENTRIES();
@@ -798,7 +798,7 @@
array_init(return_value);
for (i = 0; i < size; ++i) {
- add_next_index_string(return_value, filter_list[i].name, 1);
+ add_next_index_string(return_value, (char
*)filter_list[i].name, 1);
}
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
