[PHP-CVS] cvs: php-src /ext/gd/libgd gdft.c
pajoye Fri Feb 23 01:02:57 2007 UTC
Modified files:
/php-src/ext/gd/libgd gdft.c
Log:
- MFB: #40578, fix the 2nd race condition on shutdown when the cache is
freed
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/libgd/gdft.c?r1=1.39&r2=1.40&diff_format=u
Index: php-src/ext/gd/libgd/gdft.c
diff -u php-src/ext/gd/libgd/gdft.c:1.39 php-src/ext/gd/libgd/gdft.c:1.40
--- php-src/ext/gd/libgd/gdft.c:1.39Wed Feb 21 14:59:36 2007
+++ php-src/ext/gd/libgd/gdft.c Fri Feb 23 01:02:57 2007
@@ -718,9 +718,10 @@
void gdFontCacheShutdown()
{
if (fontCache) {
- gdMutexShutdown(gdFontCacheMutex);
+ gdMutexLock(gdFontCacheMutex);
gdCacheDelete(fontCache);
fontCache = NULL;
+ gdMutexShutdown(gdFontCacheMutex);
FT_Done_FreeType(library);
}
}
--
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 gdft.c
pajoye Fri Feb 23 00:58:49 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-srcNEWS
/php-src/ext/gd/libgd gdft.c
Log:
- #40578, fix the 2nd race condition on shutdown when the cache is freed
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.556&r2=1.2027.2.547.2.557&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.556 php-src/NEWS:1.2027.2.547.2.557
--- php-src/NEWS:1.2027.2.547.2.556 Wed Feb 21 15:00:26 2007
+++ php-src/NEWSFri Feb 23 00:58:49 2007
@@ -9,7 +9,7 @@
- Added --ri switch to CLI which allows to check extension information.
(Marcus)
- Added tidyNode::getParent() method (John, Nuno)
- Fixed zend_llist_remove_tail (Michael Wallner, Dmitry)
-- Fixed bug #40578 (imagettftext() multithreading issue). (Tony)
+- Fixed bug #40578 (imagettftext() multithreading issue). (Tony, Pierre)
- Fixed bug #40576 (double values are truncated to 6 decimal digits when
encoding). (Tony)
- Fixed bug #40560 (DIR functions do not work on root UNC path). (Dmitry)
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/libgd/gdft.c?r1=1.36.4.3&r2=1.36.4.4&diff_format=u
Index: php-src/ext/gd/libgd/gdft.c
diff -u php-src/ext/gd/libgd/gdft.c:1.36.4.3
php-src/ext/gd/libgd/gdft.c:1.36.4.4
--- php-src/ext/gd/libgd/gdft.c:1.36.4.3Wed Feb 21 15:00:26 2007
+++ php-src/ext/gd/libgd/gdft.c Fri Feb 23 00:58:49 2007
@@ -718,9 +718,10 @@
void gdFontCacheShutdown()
{
if (fontCache) {
- gdMutexShutdown(gdFontCacheMutex);
+ gdMutexLock(gdFontCacheMutex);
gdCacheDelete(fontCache);
fontCache = NULL;
+ gdMutexShutdown(gdFontCacheMutex);
FT_Done_FreeType(library);
}
}
--
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/pgsql pgsql.c /ext/standard dl.c /ext/sybase php_sybase_db.c /ext/sybase_ct php_sybase_ct.c
iliaa Fri Feb 23 00:37:36 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/sybase php_sybase_db.c
/php-src/ext/standard dl.c
/php-src/ext/sybase_ct php_sybase_ct.c
/php-src/ext/pgsql pgsql.c
Log:
Simplify code by converting emalloc() + sprintf() to spprintf()
http://cvs.php.net/viewvc.cgi/php-src/ext/sybase/php_sybase_db.c?r1=1.66.2.5.2.1&r2=1.66.2.5.2.2&diff_format=u
Index: php-src/ext/sybase/php_sybase_db.c
diff -u php-src/ext/sybase/php_sybase_db.c:1.66.2.5.2.1
php-src/ext/sybase/php_sybase_db.c:1.66.2.5.2.2
--- php-src/ext/sybase/php_sybase_db.c:1.66.2.5.2.1 Mon Jan 1 09:36:09 2007
+++ php-src/ext/sybase/php_sybase_db.c Fri Feb 23 00:37:35 2007
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: php_sybase_db.c,v 1.66.2.5.2.1 2007/01/01 09:36:09 sebastian Exp $ */
+/* $Id: php_sybase_db.c,v 1.66.2.5.2.2 2007/02/23 00:37:35 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
@@ -327,9 +327,7 @@
}
convert_to_string_ex(yyhost);
host = Z_STRVAL_PP(yyhost);
- hashed_details_length = Z_STRLEN_PP(yyhost)+6+5;
- hashed_details = (char *)
emalloc(hashed_details_length+1);
- sprintf(hashed_details,"sybase_%s",
Z_STRVAL_PP(yyhost));
+ hashed_details_length =
spprintf(&hashed_details, 0, "sybase_%s", Z_STRVAL_PP(yyhost));
}
break;
case 2: {
@@ -342,9 +340,7 @@
convert_to_string_ex(yyuser);
host = Z_STRVAL_PP(yyhost);
user = Z_STRVAL_PP(yyuser);
- hashed_details_length =
Z_STRLEN_PP(yyhost)+Z_STRLEN_PP(yyuser)+6+5;
- hashed_details = (char *)
emalloc(hashed_details_length+1);
-
sprintf(hashed_details,"sybase_%s_%s___",Z_STRVAL_PP(yyhost),Z_STRVAL_PP(yyuser));
+ hashed_details_length =
sprintf(&hashed_details, 0, "sybase_%s_%s___", Z_STRVAL_PP(yyhost),
Z_STRVAL_PP(yyuser));
}
break;
case 3: {
@@ -359,9 +355,7 @@
host = Z_STRVAL_PP(yyhost);
user = Z_STRVAL_PP(yyuser);
passwd = Z_STRVAL_PP(yypasswd);
- hashed_details_length =
Z_STRLEN_PP(yyhost)+Z_STRLEN_PP(yyuser)+Z_STRLEN_PP(yypasswd)+6+5;
- hashed_details = (char *)
emalloc(hashed_details_length+1);
-
sprintf(hashed_details,"sybase_%s_%s_%s__",Z_STRVAL_PP(yyhost),Z_STRVAL_PP(yyuser),Z_STRVAL_PP(yypasswd));
/* SAFE */
+ spprintf(&hashed_details, 0,
"sybase_%s_%s_%s__", Z_STRVAL_PP(yyhost), Z_STRVAL_PP(yyuser),
Z_STRVAL_PP(yypasswd));
}
break;
case 4: {
@@ -378,9 +372,7 @@
user = Z_STRVAL_PP(yyuser);
passwd = Z_STRVAL_PP(yypasswd);
charset = Z_STRVAL_PP(yycharset);
- hashed_details_length =
Z_STRLEN_PP(yyhost)+Z_STRLEN_PP(yyuser)+Z_STRLEN_PP(yypasswd)+Z_STRLEN_PP(yycharset)+6+5;
- hashed_details = (char *)
emalloc(hashed_details_length+1);
-
sprintf(hashed_details,"sybase_%s_%s_%s_%s_",Z_STRVAL_PP(yyhost),Z_STRVAL_PP(yyuser),Z_STRVAL_PP(yypasswd),Z_STRVAL_PP(yycharset));
/* SAFE */
+ hashed_details_length =
spprintf(&hashed_details, 0, "sybase_%s_%s_%s_%s_", Z_STRVAL_PP(yyhost),
Z_STRVAL_PP(yyuser), Z_STRVAL_PP(yypasswd), Z_STRVAL_PP(yycharset));
}
break;
case 5: {
@@ -399,9 +391,7 @@
passwd = Z_STRVAL_PP(yypasswd);
charset = Z_STRVAL_PP(yycharset);
appname = Z_STRVAL_PP(yyappname);
- hashed_details_length =
Z_STRLEN_PP(yyhost)+Z_STRLEN_PP(yyuser)+Z_STRLEN_PP(yypasswd)+Z_STRLEN_PP(yycharset)+Z_STRLEN_PP(yyappname)+6+5;
- hashed_details = (char *)
emalloc(hashed_details_length+1);
-
sprintf(hashed_details,"sybase_%s_%s_%s_%s_%s",Z_STRVAL_PP(yyhost),Z_STRVAL_PP(yyuser),Z_STRVAL_PP(yypasswd),Z_STRVAL_PP(yycharset),Z_STRVAL_PP(yyappname));
/* SAFE */
+ hashed_details_length =
spprintf(hashed_details, 0, "sybase_%s_%s_%s_%s_%s", Z_STRVAL_PP(yyhost),
Z_STRVAL_PP(yyuser), Z_STRVAL_PP(yypasswd), Z_STRVAL
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/posix posix.c
tony2001Thu Feb 22 23:40:39 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/posix posix.c
Log:
MFH: check for buflen (on FreeBSD _SC_GETGR_R_SIZE_MAX is not implemented)
patch by stas at FreeBSD dot org
http://cvs.php.net/viewvc.cgi/php-src/ext/posix/posix.c?r1=1.70.2.3.2.14&r2=1.70.2.3.2.15&diff_format=u
Index: php-src/ext/posix/posix.c
diff -u php-src/ext/posix/posix.c:1.70.2.3.2.14
php-src/ext/posix/posix.c:1.70.2.3.2.15
--- php-src/ext/posix/posix.c:1.70.2.3.2.14 Sat Feb 10 00:50:38 2007
+++ php-src/ext/posix/posix.c Thu Feb 22 23:40:39 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: posix.c,v 1.70.2.3.2.14 2007/02/10 00:50:38 tony2001 Exp $ */
+/* $Id: posix.c,v 1.70.2.3.2.15 2007/02/22 23:40:39 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -147,7 +147,7 @@
static PHP_MINFO_FUNCTION(posix)
{
php_info_print_table_start();
- php_info_print_table_row(2, "Revision", "$Revision: 1.70.2.3.2.14 $");
+ php_info_print_table_row(2, "Revision", "$Revision: 1.70.2.3.2.15 $");
php_info_print_table_end();
}
/* }}} */
@@ -887,6 +887,10 @@
#if defined(ZTS) && defined(HAVE_GETGRGID_R) && defined(_SC_GETGR_R_SIZE_MAX)
grbuflen = sysconf(_SC_GETGR_R_SIZE_MAX);
+ if (grbuflen < 1) {
+ RETURN_FALSE;
+ }
+
grbuf = emalloc(grbuflen);
ret = getgrgid_r(gid, &_g, grbuf, grbuflen, &retgrptr);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/posix posix.c
tony2001Thu Feb 22 23:40:26 2007 UTC
Modified files:
/php-src/ext/posix posix.c
Log:
check for buflen (on FreeBSD _SC_GETGR_R_SIZE_MAX is not implemented)
patch by stas at FreeBSD dot org
http://cvs.php.net/viewvc.cgi/php-src/ext/posix/posix.c?r1=1.92&r2=1.93&diff_format=u
Index: php-src/ext/posix/posix.c
diff -u php-src/ext/posix/posix.c:1.92 php-src/ext/posix/posix.c:1.93
--- php-src/ext/posix/posix.c:1.92 Sat Feb 10 00:50:29 2007
+++ php-src/ext/posix/posix.c Thu Feb 22 23:40:25 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: posix.c,v 1.92 2007/02/10 00:50:29 tony2001 Exp $ */
+/* $Id: posix.c,v 1.93 2007/02/22 23:40:25 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -147,7 +147,7 @@
static PHP_MINFO_FUNCTION(posix)
{
php_info_print_table_start();
- php_info_print_table_row(2, "Revision", "$Revision: 1.92 $");
+ php_info_print_table_row(2, "Revision", "$Revision: 1.93 $");
php_info_print_table_end();
}
/* }}} */
@@ -885,6 +885,10 @@
#if defined(ZTS) && defined(HAVE_GETGRGID_R) && defined(_SC_GETGR_R_SIZE_MAX)
grbuflen = sysconf(_SC_GETGR_R_SIZE_MAX);
+ if (grbuflen < 1) {
+ RETURN_FALSE;
+ }
+
grbuf = emalloc(grbuflen);
ret = getgrgid_r(gid, &_g, grbuf, grbuflen, &retgrptr);
--
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
helly Thu Feb 22 23:26:03 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/main/streams memory.c
Log:
- MFH Fix logic
http://cvs.php.net/viewvc.cgi/php-src/main/streams/memory.c?r1=1.8.2.6.2.16&r2=1.8.2.6.2.17&diff_format=u
Index: php-src/main/streams/memory.c
diff -u php-src/main/streams/memory.c:1.8.2.6.2.16
php-src/main/streams/memory.c:1.8.2.6.2.17
--- php-src/main/streams/memory.c:1.8.2.6.2.16 Wed Feb 7 20:59:59 2007
+++ php-src/main/streams/memory.c Thu Feb 22 23:26:03 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: memory.c,v 1.8.2.6.2.16 2007/02/07 20:59:59 helly Exp $ */
+/* $Id: memory.c,v 1.8.2.6.2.17 2007/02/22 23:26:03 helly Exp $ */
#define _GNU_SOURCE
#include "php.h"
@@ -260,14 +260,14 @@
if (newsize <= ms->fsize) {
if (newsize < ms->fpos) {
ms->fpos = newsize;
- } else {
- ms->data =
erealloc(ms->data, newsize);
-
memset(ms->data+ms->fsize, 0, newsize - ms->fsize);
- ms->fsize = newsize;
}
+ } else {
+ ms->data = erealloc(ms->data,
newsize);
+ memset(ms->data+ms->fsize, 0,
newsize - ms->fsize);
ms->fsize = newsize;
- return
PHP_STREAM_OPTION_RETURN_OK;
}
+ ms->fsize = newsize;
+ return PHP_STREAM_OPTION_RETURN_OK;
}
default:
return PHP_STREAM_OPTION_RETURN_NOTIMPL;
--
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
helly Thu Feb 22 23:25:36 2007 UTC
Modified files:
/php-src/main/streams memory.c
Log:
- Fix logic
http://cvs.php.net/viewvc.cgi/php-src/main/streams/memory.c?r1=1.33&r2=1.34&diff_format=u
Index: php-src/main/streams/memory.c
diff -u php-src/main/streams/memory.c:1.33 php-src/main/streams/memory.c:1.34
--- php-src/main/streams/memory.c:1.33 Sat Feb 3 14:45:54 2007
+++ php-src/main/streams/memory.c Thu Feb 22 23:25:36 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: memory.c,v 1.33 2007/02/03 14:45:54 helly Exp $ */
+/* $Id: memory.c,v 1.34 2007/02/22 23:25:36 helly Exp $ */
#define _GNU_SOURCE
#include "php.h"
@@ -260,14 +260,14 @@
if (newsize <= ms->fsize) {
if (newsize < ms->fpos) {
ms->fpos = newsize;
- } else {
- ms->data =
erealloc(ms->data, newsize);
-
memset(ms->data+ms->fsize, 0, newsize - ms->fsize);
- ms->fsize = newsize;
}
+ } else {
+ ms->data = erealloc(ms->data,
newsize);
+ memset(ms->data+ms->fsize, 0,
newsize - ms->fsize);
ms->fsize = newsize;
- return
PHP_STREAM_OPTION_RETURN_OK;
}
+ ms->fsize = newsize;
+ return PHP_STREAM_OPTION_RETURN_OK;
}
default:
return PHP_STREAM_OPTION_RETURN_NOTIMPL;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_4) /ext/imap imap.dsp
edink Thu Feb 22 20:32:11 2007 UTC Modified files: (Branch: PHP_4_4) /php-src/ext/imap imap.dsp Log: fix build http://cvs.php.net/viewvc.cgi/php-src/ext/imap/imap.dsp?r1=1.14.14.3&r2=1.14.14.4&diff_format=u Index: php-src/ext/imap/imap.dsp diff -u php-src/ext/imap/imap.dsp:1.14.14.3 php-src/ext/imap/imap.dsp:1.14.14.4 --- php-src/ext/imap/imap.dsp:1.14.14.3 Thu May 18 21:12:55 2006 +++ php-src/ext/imap/imap.dsp Thu Feb 22 20:32:11 2007 @@ -55,7 +55,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4nts.lib wsock32.lib winmm.lib cclient.lib /nologo /dll /machine:I386 /out:"Release/php_imap.dll" /libpath:"..\..\Release" /libpath:"..\..\..\php_build\IMAP\C-Client" +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4nts.lib winmm.lib cclient.lib ws2_32.lib /nologo /dll /machine:I386 /out:"Release/php_imap.dll" /libpath:"..\..\Release" /libpath:"..\..\..\php_build\IMAP\C-Client" !ELSEIF "$(CFG)" == "imap - Win32 Debug" @@ -81,7 +81,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4nts_debug.lib wsock32.lib winmm.lib cclient.lib /nologo /dll /debug /machine:I386 /out:"Debug/php_imap.dll" /pdbtype:sept /libpath:"..\..\Debug" /libpath:"..\..\..\php_build\IMAP\C-Client" +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4nts_debug.lib winmm.lib cclient.lib ws2_32.lib /nologo /dll /debug /machine:I386 /out:"Debug/php_imap.dll" /pdbtype:sept /libpath:"..\..\Debug" /libpath:"..\..\..\php_build\IMAP\C-Client" !ELSEIF "$(CFG)" == "imap - Win32 Debug_TS" @@ -107,7 +107,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts_debug.lib wsock32.lib winmm.lib cclient.lib crypt32.lib /nologo /dll /debug /machine:I386 /out:"..\..\Debug_TS/php_imap.dll" /pdbtype:sept /libpath:"..\..\..\\" /libpath:"..\..\Debug_TS" +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts_debug.lib winmm.lib cclient.lib Crypt32.lib ws2_32.lib /nologo /dll /debug /machine:I386 /out:"..\..\Debug_TS/php_imap.dll" /pdbtype:sept /libpath:"..\..\..\\" /libpath:"..\..\Debug_TS" !ELSEIF "$(CFG)" == "imap - Win32 Release_TS" @@ -133,7 +133,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib wsock32.lib winmm.lib cclient.lib Secur32.lib CertIdl.Lib crypt32.lib /nologo /dll /machine:I386 /nodefaultlib:"LIBCMT" /out:"..\..\Release_TS/php_imap.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline" /libpath:"..\..\..\php_build\imap" +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib winmm.lib cclient.lib Secur32.lib CertIdl.Lib Crypt32.lib ws2_32.lib /nologo /dll /machine:I386 /nodefaultlib:"LIBCMT" /out:"..\..\Release_TS/php_imap.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline" /libpath:"..\..\..\php_build\imap" # SUBTRACT LINK32 /nodefaultlib !ENDIF -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_4) /ext/ircg ircg.c php_ircg.h
derick Thu Feb 22 14:44:32 2007 UTC
Modified files: (Branch: PHP_4_4)
/php-src/ext/ircg ircg.c php_ircg.h
Log:
- Revert newly added functions.
http://cvs.php.net/viewvc.cgi/php-src/ext/ircg/ircg.c?r1=1.137.2.18.4.3&r2=1.137.2.18.4.4&diff_format=u
Index: php-src/ext/ircg/ircg.c
diff -u php-src/ext/ircg/ircg.c:1.137.2.18.4.3
php-src/ext/ircg/ircg.c:1.137.2.18.4.4
--- php-src/ext/ircg/ircg.c:1.137.2.18.4.3 Tue Feb 20 19:04:28 2007
+++ php-src/ext/ircg/ircg.c Thu Feb 22 14:44:32 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: ircg.c,v 1.137.2.18.4.3 2007/02/20 19:04:28 sas Exp $ */
+/* $Id: ircg.c,v 1.137.2.18.4.4 2007/02/22 14:44:32 derick Exp $ */
/* {{{ includes */
@@ -124,7 +124,6 @@
/* {{{ ircg_functions[] */
function_entry ircg_functions[] = {
PHP_FE(ircg_set_on_die, NULL)
- PHP_FE(ircg_create_file_on_die, NULL)
PHP_FE(ircg_pconnect, NULL)
PHP_FE(ircg_set_current, NULL)
PHP_FE(ircg_set_file, NULL)
@@ -205,8 +204,6 @@
struct in_addr od_ip;
short od_port;
#endif
-
- char *od_file;
int file_fd;
@@ -234,7 +231,6 @@
P_NICKNAME_JS = 3,
P_HTML= 4,
P_HTML_JS = 5,
- P_XML = 6,
P_NOAUTO_LINKS = 8, /* Don't automatically convert links */
P_CONV_BR = 16,/* Convert a special character to */
P_COND_STOP= 32,/* If argument != username, stop */
@@ -397,7 +393,6 @@
static void quit_handler(irconn_t *c, void *dummy)
{
php_irconn_t *conn = dummy;
- int fd;
irc_quit_handlers++;
if (conn->fd > -1) {
@@ -430,14 +425,6 @@
free(conn->od_data);
}
#endif
-
- if (conn->od_file) {
- fd = open(conn->od_file, O_CREAT | O_WRONLY, 0666);
- if (fd != -1) {
- close(fd);
- }
- free(conn->od_file);
- }
free(conn);
}
@@ -464,47 +451,6 @@
}
}
-static void ircg_xml_escape(smart_str *input, smart_str *output)
-{
- unsigned char *p;
- unsigned char *end;
- unsigned char c;
-
- end = input->c + input->len;
-
- for(p = input->c; p < end; p++) {
- c = *p;
-
- if (c >= 0 && c < 32) {
- smart_str_appendl_ex(output, "&#", 2, 1);
- smart_str_append_long_ex(output, c, 1);
- smart_str_appendc_ex(output, ';', 1);
- continue;
- }
-
- switch (c) {
- case '"':
- smart_str_appendl_ex(output, """, 6, 1);
- break;
- case '\'':
- smart_str_appendl_ex(output, "'", 6, 1);
- break;
-
- case '<':
- smart_str_appendl_ex(output, "<", 4, 1);
- break;
-
- case '>':
- smart_str_appendl_ex(output, ">", 4, 1);
- break;
-
- default:
- smart_str_appendc_ex(output, c, 1);
- break;
- }
- }
-}
-
static const char hextab[] = "0123456789abcdef";
#define NICKNAME_ESC_CHAR '|'
@@ -675,7 +621,6 @@
case '4': mode |= P_CONV_BR; goto next;
case '5': mode |= P_COND_STOP; goto next;
case '6': mode |= P_HTML; goto next;
- case '7': mode |= P_XML; goto next;
/* associate mode bits with each command where applicable */
case 'c': NEW_TOKEN(C_CHANNEL, v) = mode; break;
@@ -756,10 +701,6 @@
ircg_js_escape(&tmp, result); \
smart_str_free_ex(&tmp, 1);
\
break;
\
- case P_XML:
\
- if (!what) break;
\
- ircg_xml_escape(what, result); \
- break;
\
case P_HTML:
\
if (!what) break;
\
if (use_cache) {
\
@@ -1501,33 +1442,6 @@
#endif
/* }}} */
-/* {{{ proto bool ircg_create_file_on_die(int connection, string path)
- Sets hostaction to be executed when connection dies */
-PHP_FUNCTION(ircg_create_file_on_die)
-{
- zval **p1, **p2;
- php_irconn_t *conn;
[PHP-CVS] cvs: php-src(PHP_4_4) / NEWS configure.in /main php_version.h
derick Thu Feb 22 14:47:30 2007 UTC Modified files: (Branch: PHP_4_4) /php-srcNEWS configure.in /php-src/main php_version.h Log: - Back to -dev. http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.1247.2.920.2.197&r2=1.1247.2.920.2.198&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.920.2.197 php-src/NEWS:1.1247.2.920.2.198 --- php-src/NEWS:1.1247.2.920.2.197 Thu Feb 22 14:45:30 2007 +++ php-src/NEWSThu Feb 22 14:47:29 2007 @@ -1,6 +1,9 @@ PHP 4 NEWS ||| +?? Feb 2007, Version 4.4.6 + 22 Feb 2007, Version 4.4.6RC1 + - Updated PCRE to version 7.0. (Nuno) - Fixed segfault in ext/session when register_globals=On. (Tony) - Fixed bug #40578 (imagettftext() multithreading issue). (Tony) http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.396.2.164.2.39&r2=1.396.2.164.2.40&diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.396.2.164.2.39 php-src/configure.in:1.396.2.164.2.40 --- php-src/configure.in:1.396.2.164.2.39 Thu Feb 22 14:45:30 2007 +++ php-src/configure.inThu Feb 22 14:47:29 2007 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.396.2.164.2.39 2007/02/22 14:45:30 derick Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.396.2.164.2.40 2007/02/22 14:47:29 derick Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -38,7 +38,7 @@ MAJOR_VERSION=4 MINOR_VERSION=4 RELEASE_VERSION=6 -EXTRA_VERSION="RC1" +EXTRA_VERSION="RC2-dev" VERSION="$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION" dnl Define where extension directories are located in the configure context http://cvs.php.net/viewvc.cgi/php-src/main/php_version.h?r1=1.66.2.81.2.35&r2=1.66.2.81.2.36&diff_format=u Index: php-src/main/php_version.h diff -u php-src/main/php_version.h:1.66.2.81.2.35 php-src/main/php_version.h:1.66.2.81.2.36 --- php-src/main/php_version.h:1.66.2.81.2.35 Thu Feb 22 14:45:30 2007 +++ php-src/main/php_version.h Thu Feb 22 14:47:30 2007 @@ -3,5 +3,5 @@ #define PHP_MAJOR_VERSION 4 #define PHP_MINOR_VERSION 4 #define PHP_RELEASE_VERSION 6 -#define PHP_EXTRA_VERSION "RC1" -#define PHP_VERSION "4.4.6RC1" +#define PHP_EXTRA_VERSION "RC2-dev" +#define PHP_VERSION "4.4.6RC2-dev" -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_4) / NEWS configure.in /main php_version.h
derick Thu Feb 22 14:45:31 2007 UTC Modified files: (Branch: PHP_4_4) /php-srcNEWS configure.in /php-src/main php_version.h Log: - Go with RC1. http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.1247.2.920.2.196&r2=1.1247.2.920.2.197&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.920.2.196 php-src/NEWS:1.1247.2.920.2.197 --- php-src/NEWS:1.1247.2.920.2.196 Wed Feb 21 18:41:22 2007 +++ php-src/NEWSThu Feb 22 14:45:30 2007 @@ -1,6 +1,6 @@ PHP 4 NEWS ||| -?? ??? 2007, Version 4.4.6 +22 Feb 2007, Version 4.4.6RC1 - Updated PCRE to version 7.0. (Nuno) - Fixed segfault in ext/session when register_globals=On. (Tony) - Fixed bug #40578 (imagettftext() multithreading issue). (Tony) http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.396.2.164.2.38&r2=1.396.2.164.2.39&diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.396.2.164.2.38 php-src/configure.in:1.396.2.164.2.39 --- php-src/configure.in:1.396.2.164.2.38 Tue Feb 13 18:22:06 2007 +++ php-src/configure.inThu Feb 22 14:45:30 2007 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.396.2.164.2.38 2007/02/13 18:22:06 derick Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.396.2.164.2.39 2007/02/22 14:45:30 derick Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -38,7 +38,7 @@ MAJOR_VERSION=4 MINOR_VERSION=4 RELEASE_VERSION=6 -EXTRA_VERSION="-dev" +EXTRA_VERSION="RC1" VERSION="$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION" dnl Define where extension directories are located in the configure context http://cvs.php.net/viewvc.cgi/php-src/main/php_version.h?r1=1.66.2.81.2.34&r2=1.66.2.81.2.35&diff_format=u Index: php-src/main/php_version.h diff -u php-src/main/php_version.h:1.66.2.81.2.34 php-src/main/php_version.h:1.66.2.81.2.35 --- php-src/main/php_version.h:1.66.2.81.2.34 Tue Feb 13 18:22:06 2007 +++ php-src/main/php_version.h Thu Feb 22 14:45:30 2007 @@ -3,5 +3,5 @@ #define PHP_MAJOR_VERSION 4 #define PHP_MINOR_VERSION 4 #define PHP_RELEASE_VERSION 6 -#define PHP_EXTRA_VERSION "-dev" -#define PHP_VERSION "4.4.6-dev" +#define PHP_EXTRA_VERSION "RC1" +#define PHP_VERSION "4.4.6RC1" -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard/tests/general_functions proc_open02.phpt
nlopess Thu Feb 22 11:49:23 2007 UTC Modified files: /php-src/ext/standard/tests/general_functions proc_open02.phpt Log: MFB http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/proc_open02.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/standard/tests/general_functions/proc_open02.phpt diff -u php-src/ext/standard/tests/general_functions/proc_open02.phpt:1.4 php-src/ext/standard/tests/general_functions/proc_open02.phpt:1.5 --- php-src/ext/standard/tests/general_functions/proc_open02.phpt:1.4 Wed Feb 21 16:27:12 2007 +++ php-src/ext/standard/tests/general_functions/proc_open02.phpt Thu Feb 22 11:49:23 2007 @@ -15,6 +15,8 @@ $pipes ); +sleep(1); // let the OS run the nohup process before sending the signal + var_dump(proc_terminate($cat, 1)); // send a SIGHUP sleep(1); var_dump(proc_get_status($cat)); -- 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/standard/tests/general_functions proc_open02.phpt
nlopess Thu Feb 22 11:48:15 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/standard/tests/general_functions proc_open02.phpt Log: fix test on ultra-fast-machines and/or SOs with long time slices # Thanks Tony http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/proc_open02.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u Index: php-src/ext/standard/tests/general_functions/proc_open02.phpt diff -u php-src/ext/standard/tests/general_functions/proc_open02.phpt:1.1.2.2 php-src/ext/standard/tests/general_functions/proc_open02.phpt:1.1.2.3 --- php-src/ext/standard/tests/general_functions/proc_open02.phpt:1.1.2.2 Wed Feb 21 16:25:37 2007 +++ php-src/ext/standard/tests/general_functions/proc_open02.phpt Thu Feb 22 11:48:14 2007 @@ -15,6 +15,8 @@ $pipes ); +sleep(1); // let the OS run the nohup process before sending the signal + var_dump(proc_terminate($cat, 1)); // send a SIGHUP sleep(1); var_dump(proc_get_status($cat)); -- 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) /sapi/cli php_cli.c
tony2001Thu Feb 22 10:06:22 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/sapi/cli php_cli.c
Log:
MFH
http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/php_cli.c?r1=1.129.2.13.2.15&r2=1.129.2.13.2.16&diff_format=u
Index: php-src/sapi/cli/php_cli.c
diff -u php-src/sapi/cli/php_cli.c:1.129.2.13.2.15
php-src/sapi/cli/php_cli.c:1.129.2.13.2.16
--- php-src/sapi/cli/php_cli.c:1.129.2.13.2.15 Wed Feb 21 21:57:21 2007
+++ php-src/sapi/cli/php_cli.c Thu Feb 22 10:06:22 2007
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: php_cli.c,v 1.129.2.13.2.15 2007/02/21 21:57:21 tony2001 Exp $ */
+/* $Id: php_cli.c,v 1.129.2.13.2.16 2007/02/22 10:06:22 tony2001 Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -476,12 +476,6 @@
s_out = php_stream_open_wrapper_ex("php://stdout", "wb", 0, NULL,
sc_out);
s_err = php_stream_open_wrapper_ex("php://stderr", "wb", 0, NULL,
sc_err);
-#if PHP_DEBUG
- /* do not close stdout and stderr */
- s_out->flags |= PHP_STREAM_FLAG_NO_CLOSE;
- s_err->flags |= PHP_STREAM_FLAG_NO_CLOSE;
-#endif
-
if (s_in==NULL || s_out==NULL || s_err==NULL) {
FREE_ZVAL(zin);
FREE_ZVAL(zout);
@@ -491,7 +485,13 @@
if (s_err) php_stream_close(s_err);
return;
}
-
+
+#if PHP_DEBUG
+ /* do not close stdout and stderr */
+ s_out->flags |= PHP_STREAM_FLAG_NO_CLOSE;
+ s_err->flags |= PHP_STREAM_FLAG_NO_CLOSE;
+#endif
+
s_in_process = s_in;
php_stream_to_zval(s_in, zin);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/cli php_cli.c
tony2001Thu Feb 22 10:06:02 2007 UTC
Modified files:
/php-src/sapi/cli php_cli.c
Log:
check for NULL, then add flag
http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/php_cli.c?r1=1.169&r2=1.170&diff_format=u
Index: php-src/sapi/cli/php_cli.c
diff -u php-src/sapi/cli/php_cli.c:1.169 php-src/sapi/cli/php_cli.c:1.170
--- php-src/sapi/cli/php_cli.c:1.169Wed Feb 21 21:56:45 2007
+++ php-src/sapi/cli/php_cli.c Thu Feb 22 10:06:02 2007
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: php_cli.c,v 1.169 2007/02/21 21:56:45 tony2001 Exp $ */
+/* $Id: php_cli.c,v 1.170 2007/02/22 10:06:02 tony2001 Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -487,12 +487,6 @@
s_out = php_stream_open_wrapper_ex("php://stdout", "wb", 0, NULL,
sc_out);
s_err = php_stream_open_wrapper_ex("php://stderr", "wb", 0, NULL,
sc_err);
-#if PHP_DEBUG
- /* do not close stdout and stderr */
- s_out->flags |= PHP_STREAM_FLAG_NO_CLOSE;
- s_err->flags |= PHP_STREAM_FLAG_NO_CLOSE;
-#endif
-
if (s_in==NULL || s_out==NULL || s_err==NULL) {
FREE_ZVAL(zin);
FREE_ZVAL(zout);
@@ -502,7 +496,13 @@
if (s_err) php_stream_close(s_err);
return;
}
-
+
+#if PHP_DEBUG
+ /* do not close stdout and stderr */
+ s_out->flags |= PHP_STREAM_FLAG_NO_CLOSE;
+ s_err->flags |= PHP_STREAM_FLAG_NO_CLOSE;
+#endif
+
s_in_process = s_in;
php_stream_to_zval(s_in, zin);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
mj Thu Feb 22 09:31:10 2007 UTC Modified files: /CVSROOTavail Log: * Karma for Daniel Rossi http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1247&r2=1.1248&diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1247 CVSROOT/avail:1.1248 --- CVSROOT/avail:1.1247Mon Feb 19 15:43:52 2007 +++ CVSROOT/avail Thu Feb 22 09:31:10 2007 @@ -375,6 +375,7 @@ avail|shangxiao|pear/HTML_QuickForm_altselect avail|schmidt|pear/OLE,peardoc avail|void|pecl/bbcode +avail|electroteque|pear/Structures_DataGrid_Renderer_Flexy,peardoc # php windows installer avail|jmertic|php-src/win32/installer -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard basic_functions.c
dmitry Thu Feb 22 08:23:44 2007 UTC
Modified files:
/php-src/ext/standard basic_functions.c
Log:
Fixed possible crash in putenv() on win32
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.848&r2=1.849&diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.848
php-src/ext/standard/basic_functions.c:1.849
--- php-src/ext/standard/basic_functions.c:1.848Fri Feb 16 16:33:37 2007
+++ php-src/ext/standard/basic_functions.c Thu Feb 22 08:23:44 2007
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.c,v 1.848 2007/02/16 16:33:37 dmitry Exp $ */
+/* $Id: basic_functions.c,v 1.849 2007/02/22 08:23:44 dmitry Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -4431,7 +4431,7 @@
if (!strncmp(*env, pe.key, pe.key_len) &&
(*env)[pe.key_len] == '=') { /* found it */
#if defined(PHP_WIN32)
/* must copy previous value because MSVCRT's
putenv can free the string without notice */
- pe.previous_value = estrndup(*env, 1024);
+ pe.previous_value = estrdup(*env);
#else
pe.previous_value = *env;
#endif
--
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/standard basic_functions.c
dmitry Thu Feb 22 08:23:18 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard basic_functions.c
Log:
Fixed possible crash in putenv() on win32
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.725.2.31.2.42&r2=1.725.2.31.2.43&diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.725.2.31.2.42
php-src/ext/standard/basic_functions.c:1.725.2.31.2.43
--- php-src/ext/standard/basic_functions.c:1.725.2.31.2.42 Wed Feb 21
03:03:37 2007
+++ php-src/ext/standard/basic_functions.c Thu Feb 22 08:23:17 2007
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.c,v 1.725.2.31.2.42 2007/02/21 03:03:37 stas Exp $ */
+/* $Id: basic_functions.c,v 1.725.2.31.2.43 2007/02/22 08:23:17 dmitry Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -4446,7 +4446,7 @@
if (!strncmp(*env, pe.key, pe.key_len) &&
(*env)[pe.key_len] == '=') { /* found it */
#if defined(PHP_WIN32)
/* must copy previous value because MSVCRT's
putenv can free the string without notice */
- pe.previous_value = estrndup(*env, 1024);
+ pe.previous_value = estrdup(*env);
#else
pe.previous_value = *env;
#endif
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
