[PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar/phar pharcommand.inc
felipe Fri Oct 17 01:58:20 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/phar/phar pharcommand.inc
Log:
- MFH: Fixed bug #45726 (PHP_Archive / Archive.php missing)
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar/pharcommand.inc?r1=1.49.2.12&r2=1.49.2.13&diff_format=u
Index: php-src/ext/phar/phar/pharcommand.inc
diff -u php-src/ext/phar/phar/pharcommand.inc:1.49.2.12
php-src/ext/phar/phar/pharcommand.inc:1.49.2.13
--- php-src/ext/phar/phar/pharcommand.inc:1.49.2.12 Fri Sep 12 16:09:01 2008
+++ php-src/ext/phar/phar/pharcommand.inc Fri Oct 17 01:58:20 2008
@@ -488,7 +488,9 @@
if (isset($loader)) {
$s = "";
- $s .= file_get_contents($loader);
+ if (is_file($loader)) {
+ $s .= file_get_contents($loader);
+ }
$s .= " phpversion(),
- 'phar.phar version' => '$Revision: 1.49.2.12 $',
+ 'phar.phar version' => '$Revision: 1.49.2.13 $',
'Phar EXT version' => $use_ext ? phpversion('phar') :
'Not available',
'Phar API version' => Phar::apiVersion(),
'Phar-based phar archives' => true,
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/phar/phar pharcommand.inc
felipe Fri Oct 17 01:53:26 2008 UTC
Modified files:
/php-src/ext/phar/phar pharcommand.inc
Log:
- Fixed bug #45726 (PHP_Archive / Archive.php missing)
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar/pharcommand.inc?r1=1.51&r2=1.52&diff_format=u
Index: php-src/ext/phar/phar/pharcommand.inc
diff -u php-src/ext/phar/phar/pharcommand.inc:1.51
php-src/ext/phar/phar/pharcommand.inc:1.52
--- php-src/ext/phar/phar/pharcommand.inc:1.51 Fri Sep 12 16:08:42 2008
+++ php-src/ext/phar/phar/pharcommand.inc Fri Oct 17 01:53:26 2008
@@ -488,7 +488,9 @@
if (isset($loader)) {
$s = "";
- $s .= file_get_contents($loader);
+ if (is_file($loader)) {
+ $s .= file_get_contents($loader);
+ }
$s .= " phpversion(),
- 'phar.phar version' => '$Revision: 1.51 $',
+ 'phar.phar version' => '$Revision: 1.52 $',
'Phar EXT version' => $use_ext ? phpversion('phar') :
'Not available',
'Phar API version' => Phar::apiVersion(),
'Phar-based phar archives' => true,
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/cgi cgi_main.c
iliaa Fri Oct 17 01:34:27 2008 UTC
Modified files:
/php-src/sapi/cgi cgi_main.c
Log:
MFB: Fixed bug #46319 (PHP sets default Content-Type header for HTTP 304
response code, in cgi sapi)
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/cgi_main.c?r1=1.365&r2=1.366&diff_format=u
Index: php-src/sapi/cgi/cgi_main.c
diff -u php-src/sapi/cgi/cgi_main.c:1.365 php-src/sapi/cgi/cgi_main.c:1.366
--- php-src/sapi/cgi/cgi_main.c:1.365 Tue Sep 2 13:22:27 2008
+++ php-src/sapi/cgi/cgi_main.c Fri Oct 17 01:34:26 2008
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: cgi_main.c,v 1.365 2008/09/02 13:22:27 dmitry Exp $ */
+/* $Id: cgi_main.c,v 1.366 2008/10/17 01:34:26 iliaa Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -376,6 +376,7 @@
sapi_header_struct *h;
zend_llist_position pos;
zend_bool ignore_status = 0;
+ int response_status = SG(sapi_headers).http_response_code;
if (SG(request_info).no_headers == 1) {
return SAPI_HEADER_SENT_SUCCESSFULLY;
@@ -387,7 +388,11 @@
zend_bool has_status = 0;
if (CGIG(rfc2616_headers) && SG(sapi_headers).http_status_line)
{
+ char *s;
len = snprintf(buf, SAPI_CGI_MAX_HEADER_LENGTH,
"%s\r\n", SG(sapi_headers).http_status_line);
+ if ((s = strchr(SG(sapi_headers).http_status_line, '
'))) {
+ response_status = atoi((s + 1));
+ }
if (len > SAPI_CGI_MAX_HEADER_LENGTH) {
len = SAPI_CGI_MAX_HEADER_LENGTH;
@@ -402,6 +407,7 @@
strncasecmp(SG(sapi_headers).http_status_line,
"HTTP/", 5) == 0
) {
len = slprintf(buf, sizeof(buf),
"Status:%s\r\n", s);
+ response_status = atoi((s + 1));
} else {
h =
(sapi_header_struct*)zend_llist_get_first_ex(&sapi_headers->headers, &pos);
while (h) {
@@ -447,6 +453,9 @@
PHPWRITE_H(h->header, h->header_len);
PHPWRITE_H("\r\n", 2);
}
+ } else if (response_status == 304 && h->header_len >
sizeof("Content-Type:")-1 &&
+ strncasecmp(h->header, "Content-Type:",
sizeof("Content-Type:")-1) == 0) {
+ continue;
} else {
PHPWRITE_H(h->header, h->header_len);
PHPWRITE_H("\r\n", 2);
--
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 /sapi/cgi cgi_main.c
iliaa Fri Oct 17 01:32:59 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/sapi/cgi cgi_main.c
/php-srcNEWS
Log:
MFB: Fixed bug #46319 (PHP sets default Content-Type header for HTTP 304
response code, in cgi sapi)
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/cgi_main.c?r1=1.267.2.15.2.61&r2=1.267.2.15.2.62&diff_format=u
Index: php-src/sapi/cgi/cgi_main.c
diff -u php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.61
php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.62
--- php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.61 Tue Sep 2 13:22:00 2008
+++ php-src/sapi/cgi/cgi_main.c Fri Oct 17 01:32:59 2008
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: cgi_main.c,v 1.267.2.15.2.61 2008/09/02 13:22:00 dmitry Exp $ */
+/* $Id: cgi_main.c,v 1.267.2.15.2.62 2008/10/17 01:32:59 iliaa Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -370,6 +370,7 @@
sapi_header_struct *h;
zend_llist_position pos;
zend_bool ignore_status = 0;
+ int response_status = SG(sapi_headers).http_response_code;
if (SG(request_info).no_headers == 1) {
return SAPI_HEADER_SENT_SUCCESSFULLY;
@@ -381,8 +382,11 @@
zend_bool has_status = 0;
if (CGIG(rfc2616_headers) && SG(sapi_headers).http_status_line)
{
- len = slprintf(buf, SAPI_CGI_MAX_HEADER_LENGTH,
- "%s\r\n",
SG(sapi_headers).http_status_line);
+ char *s;
+ len = slprintf(buf, SAPI_CGI_MAX_HEADER_LENGTH,
"%s\r\n", SG(sapi_headers).http_status_line);
+ if ((s = strchr(SG(sapi_headers).http_status_line, '
'))) {
+ response_status = atoi((s + 1));
+ }
if (len > SAPI_CGI_MAX_HEADER_LENGTH) {
len = SAPI_CGI_MAX_HEADER_LENGTH;
@@ -396,6 +400,7 @@
(s - SG(sapi_headers).http_status_line) >= 5 &&
strncasecmp(SG(sapi_headers).http_status_line,
"HTTP/", 5) == 0) {
len = slprintf(buf, sizeof(buf),
"Status:%s\r\n", s);
+ response_status = atoi((s + 1));
} else {
h =
(sapi_header_struct*)zend_llist_get_first_ex(&sapi_headers->headers, &pos);
while (h) {
@@ -440,6 +445,9 @@
PHPWRITE_H(h->header, h->header_len);
PHPWRITE_H("\r\n", 2);
}
+ } else if (response_status == 304 && h->header_len >
sizeof("Content-Type:")-1 &&
+ strncasecmp(h->header, "Content-Type:",
sizeof("Content-Type:")-1) == 0) {
+ continue;
} else {
PHPWRITE_H(h->header, h->header_len);
PHPWRITE_H("\r\n", 2);
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1261&r2=1.2027.2.547.2.1262&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1261 php-src/NEWS:1.2027.2.547.2.1262
--- php-src/NEWS:1.2027.2.547.2.1261Thu Oct 16 16:20:52 2008
+++ php-src/NEWSFri Oct 17 01:32:59 2008
@@ -1,6 +1,8 @@
PHPNEWS
|||
?? Oct 2008, PHP 5.2.7RC2
+- Fixed bug #46319 (PHP sets default Content-Type header for HTTP 304
+ response code, in cgi sapi). (Ilia)
- Fixed bug #46292 (PDO::setFetchMode() shouldn't requires the 2nd arg when
using FETCH_CLASSTYPE). (Felipe)
- Fixed bug #46274, #46249 (pdo_pgsql always fill in NULL for empty BLOB and
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /sapi/cgi cgi_main.c
iliaa Fri Oct 17 01:31:13 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/sapi/cgi cgi_main.c
Log:
Fixed bug #46319 (PHP sets default Content-Type header for HTTP 304 response
code, in cgi sapi)
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/cgi_main.c?r1=1.267.2.15.2.50.2.28&r2=1.267.2.15.2.50.2.29&diff_format=u
Index: php-src/sapi/cgi/cgi_main.c
diff -u php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.50.2.28
php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.50.2.29
--- php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.50.2.28Tue Sep 2 13:22:15 2008
+++ php-src/sapi/cgi/cgi_main.c Fri Oct 17 01:31:12 2008
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: cgi_main.c,v 1.267.2.15.2.50.2.28 2008/09/02 13:22:15 dmitry Exp $ */
+/* $Id: cgi_main.c,v 1.267.2.15.2.50.2.29 2008/10/17 01:31:12 iliaa Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -376,6 +376,7 @@
sapi_header_struct *h;
zend_llist_position pos;
zend_bool ignore_status = 0;
+ int response_status = SG(sapi_headers).http_response_code;
if (SG(request_info).no_headers == 1) {
return SAPI_HEADER_SENT_SUCCESSFULLY;
@@ -387,7 +388,11 @@
zend_bool has_status = 0;
if (CGIG(rfc2616_headers) && SG(sapi_headers).http_status_line)
{
+ char *s;
len = slprintf(buf, SAPI_CGI_MAX_HEADER_LENGTH,
"%s\r\n", SG(sapi_headers).http_status_line);
+ if ((s = strchr(SG(sapi_headers).http_status_line, '
'))) {
+ response_status = atoi((s + 1));
+ }
if (len > SAPI_CGI_MAX_HEADER_LENGTH) {
len = SAPI_CGI_MAX_HEADER_LENGTH;
@@ -402,6 +407,7 @@
strncasecmp(SG(sapi_headers).http_status_line,
"HTTP/", 5) == 0
) {
len = slprintf(buf, sizeof(buf),
"Status:%s\r\n", s);
+ response_status = atoi((s + 1));
} else {
h =
(sapi_header_struct*)zend_llist_get_first_ex(&sapi_headers->headers, &pos);
while (h) {
@@ -446,6 +452,9 @@
PHPWRITE_H(h->header, h->header_len);
PHPWRITE_H("\r\n", 2);
}
+ } else if (response_status == 304 && h->header_len >
sizeof("Content-Type:")-1 &&
+ strncasecmp(h->header, "Content-Type:",
sizeof("Content-Type:")-1) == 0) {
+ continue;
} else {
PHPWRITE_H(h->header, h->header_len);
PHPWRITE_H("\r\n", 2);
--
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_3) / NEWS /ext/standard syslog.c /win32/build registersyslog.php
Hi 2008/10/16 Hannes Magnusson <[EMAIL PROTECTED]>: > On Wed, Oct 15, 2008 at 20:41, Kalle Sommer Nielsen <[EMAIL PROTECTED]> wrote: >> kalle Wed Oct 15 18:41:58 2008 UTC >> >> Modified files: (Branch: PHP_5_3) >>/php-srcNEWS >>/php-src/ext/standard syslog.c >>/php-src/win32/buildregistersyslog.php >> Log: >> [DOC] Deprecate define_syslog_variables() in 5.3 >> >> http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.344&r2=1.2027.2.547.2.965.2.345&diff_format=u >> Index: php-src/NEWS >> diff -u php-src/NEWS:1.2027.2.547.2.965.2.344 >> php-src/NEWS:1.2027.2.547.2.965.2.345 >> --- php-src/NEWS:1.2027.2.547.2.965.2.344 Tue Oct 14 19:03:36 2008 >> +++ php-src/NEWSWed Oct 15 18:41:57 2008 >> @@ -14,6 +14,8 @@ >> (Keisial at gmail dot com, Greg) >> - Added support for using compressed connections with PDO_mysql. (Johannes) >> >> +- Deprecated define_syslog_variables(). (Kalle) >> + >> - Fixed bug causing the algorithm parameter of mhash() to be modified. >> (Scott) >> >> - Fixed bug #46238 (Segmentation fault on static call with empty string >> method). >> http://cvs.php.net/viewvc.cgi/php-src/ext/standard/syslog.c?r1=1.49.2.3.2.2.2.3&r2=1.49.2.3.2.2.2.4&diff_format=u >> Index: php-src/ext/standard/syslog.c >> diff -u php-src/ext/standard/syslog.c:1.49.2.3.2.2.2.3 >> php-src/ext/standard/syslog.c:1.49.2.3.2.2.2.4 >> --- php-src/ext/standard/syslog.c:1.49.2.3.2.2.2.3 Mon Mar 10 22:12:36 >> 2008 >> +++ php-src/ext/standard/syslog.c Wed Oct 15 18:41:57 2008 >> @@ -16,7 +16,7 @@ >>+--+ >> */ >> >> -/* $Id: syslog.c,v 1.49.2.3.2.2.2.3 2008/03/10 22:12:36 felipe Exp $ */ >> +/* $Id: syslog.c,v 1.49.2.3.2.2.2.4 2008/10/15 18:41:57 kalle Exp $ */ >> >> #include "php.h" >> >> @@ -207,6 +207,8 @@ >>return; >>} >> >> + php_error_docref(NULL TSRMLS_CC, E_DEPRECATED, >> "define_syslog_variables is deprecated, please use the syslog constants >> instead"); >> + > > Why not use PHP_DEP_FE() ? Thanks for that, I didn't know there was a macro for that, committed! > > -Hannes > > -- > PHP CVS Mailing List (http://www.php.net/) > To unsubscribe, visit: http://www.php.net/unsub.php > > -- Kalle Sommer Nielsen -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard basic_functions.c syslog.c
kalle Thu Oct 16 23:19:14 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard basic_functions.c syslog.c
Log:
Use PHP_DEP_FE instead of throwing an E_DEPRECATED manually inside
define_syslog_variables() (Thanks Hannes!)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.725.2.31.2.64.2.63&r2=1.725.2.31.2.64.2.64&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.64.2.63
php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.64
--- php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.63 Sun Aug 31
00:19:50 2008
+++ php-src/ext/standard/basic_functions.c Thu Oct 16 23:19:13 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: basic_functions.c,v 1.725.2.31.2.64.2.63 2008/08/31 00:19:50 jani Exp
$ */
+/* $Id: basic_functions.c,v 1.725.2.31.2.64.2.64 2008/10/16 23:19:13 kalle Exp
$ */
#include "php.h"
#include "php_streams.h"
@@ -3668,7 +3668,7 @@
PHP_FE(openlog,
arginfo_openlog)
PHP_FE(syslog,
arginfo_syslog)
PHP_FE(closelog,
arginfo_closelog)
- PHP_FE(define_syslog_variables,
arginfo_define_syslog_variables)
+ PHP_DEP_FE(define_syslog_variables,
arginfo_define_syslog_variables)
#endif
/* functions from lcg.c */
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/syslog.c?r1=1.49.2.3.2.2.2.4&r2=1.49.2.3.2.2.2.5&diff_format=u
Index: php-src/ext/standard/syslog.c
diff -u php-src/ext/standard/syslog.c:1.49.2.3.2.2.2.4
php-src/ext/standard/syslog.c:1.49.2.3.2.2.2.5
--- php-src/ext/standard/syslog.c:1.49.2.3.2.2.2.4 Wed Oct 15 18:41:57 2008
+++ php-src/ext/standard/syslog.c Thu Oct 16 23:19:13 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: syslog.c,v 1.49.2.3.2.2.2.4 2008/10/15 18:41:57 kalle Exp $ */
+/* $Id: syslog.c,v 1.49.2.3.2.2.2.5 2008/10/16 23:19:13 kalle Exp $ */
#include "php.h"
@@ -207,8 +207,6 @@
return;
}
- php_error_docref(NULL TSRMLS_CC, E_DEPRECATED, "define_syslog_variables
is deprecated, please use the syslog constants instead");
-
if (!BG(syslog_started)) {
start_syslog(TSRMLS_C);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
philip Thu Oct 16 18:34:55 2008 UTC Modified files: /CVSROOTavail Log: - phpdoc karma for Anthony Bedford (abedford) http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1455&r2=1.1456&diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1455 CVSROOT/avail:1.1456 --- CVSROOT/avail:1.1455Thu Oct 16 17:52:02 2008 +++ CVSROOT/avail Thu Oct 16 18:34:54 2008 @@ -41,7 +41,7 @@ # The PHP Documentation Group maintains the documentation and its # translations. -avail|lucas,jmertic,bobby,takagi,gcc,cem,mfp,ansriniv,jsgoupil,mazzanet,dbs,frogger,coldocean,alan_k,fleaslob,torben,lynch,kk,ted,paul,mbritton,coar,joey,bibi,mrobinso,perugini,tzwenny,hirokawa,drews,paulsen,hartmann,leon,jonen,tschuer,tfromm,manuel,stas,danbeck,sli,jmcastagnetto,mohrt,goba,samesch,jon,soneca,ronabop,glace,latoserver,rafael,jan,jcmeloni,chrullrich,mk,sebastian,troels,mathieu,phaethon,mj,corean,pandach,cycle98,vizvil,regina,cynic,jpm,dams,karoora,pcraft,suvia,zak,zimt,jmoore,ftfuture,ag315,bbonev,afortaleza,neotron,cg,delrom,jkj,hellekin,kgergely,cnewbill,fuzzy74,bjoern,fams,smasiello,dim,lucasr,cpereira,ernani,theseer,noribsd,subjective,ufux,hadar_p,asautins,dbenson,aleczapka,tom,amiller,cortesi,rarruda,betz,philip,alindeman,thyla,cucinato,zyprexia,tpug,mitja,conni,sts,georg,nmav,subbie,leszek,spheroid,slawek,alan_dangelo,ae,nohn,kaser01,visualmind,kurtz,luk,tronic,moh,bernd,yohgaki,fujimoto,gerzson,webler,spooky,cece,daniel,boo,nhoizey,joerg,imajes,hakan,c! hief977,shlomi,raful,yuval,tomer,barak,ido,mork,lior,gal,adiju,cr_depend,florian,kappu,muricaru,dt,critix,ck,costra,fancao0515,tibee,eriksson,wenz,bs,anderson,tal,sander,matroz,ave,adu,mmeier,wentzel,scaro,aspinei,lmaxcar,manuzhai,darvina,peter,maxim,romakhin,n0nick,attila,sagi,kai,microbrain,rhheo,shimi,k.schroeder,djworld,emil,lboshell,netholic,dmitry83,progcom,verdana,yincheng,surfmax,nicos,chregu,msopacua,bbd,cyril,gregory,hudzilla,klean,mignoni,wiesemann,xqi,mersal,zruya,sean,staybyte,aber_sabeel,alzahrani,thomaslio,sfox,jippie,antonio,ahxiao,akcakayaa,allhibi,aner,black,class007,digo,dima,dorons,eshare,hpop1,itay,juppie,mrmatrix,saad,thomasgm,xbite,tobsn,jome,analytik,outsider,heymarcel,asmodean,bader,elmaystro,sp,truelight,gnuhacker,_batman_,sachat,dallas,dejan,zer0fill,steve3d,lm92,bradmssw,tahani,victor,erica,simonh,phpman,mrphp,notarius,joseph,mmkhajah,mohammed,proton,klootz,takashima,leoca,ahmad,abobader,fboudot,wurm,hakawy,felix,ahmedss,mahrous2020,yorgo,gal_ga,! abodive,ama,andras,hassen,jkhdk,okamura,popov,xman,fernandoc,avenger,h win,tix,alrehawi_,liuming,ramysaweres,astone,shiflett,jaenecke,bdensley,adamchan,jingfs,murphy,potatotsang,the_q,jsheets,xelis,equerci,phpcatala,tofanini,umut,kriga,ray,royhuggins,logician,almanar,alexws,gonik,haiaw,lkwang_cn,shadowwulf,telecart,pongsakorn,naveed,shivas,tularis,angela,decorj,hitcho,kevinkee,nmee,thx1140,crotalus,didou,novotnyr,sil,traduim,gui,mgf,ivanr,michal,tsirman,momo,cysoft,firefox,kouber,mipac,muslem,tomysk,vemarkov,garth,lord_lele,stone,laacz,retnug,ernestyang,hatem,house,luisdaniel,nizar,nvivo,seth,tomh,danguer,adam,nio,wassago,beeven,colacino,zvaranka,cesarguru,chubu,dark2907,portoban,reven,wizzard,sywr,koendw83,rylin,webstudio,jsjohnst,dmanusset,et,pitiphan,mbr,cdalar,alrashoudi,hafid,enough,zhouhao007,jnorbi,lorenzohgh,denisr,coder03,jcclaros,thomas,freeman,rioter,jschultz,davey,belleto,jtacon,yuw,ohill,elfyn,noam,nathan,salman,cheezy,ene,rezaiqbal,purnomo,dufiga_php,ftp_geo,udhien,prio,luckyguy354,maf,handi,meme,satiri,maddankara,rildo,hd,ali,lpj! ,adhitama,engkongs,preilly,dave,marcelo,curt,fd,javi,mrmaster,fa,nlopess,vrana,apaxx,pjotrik,marduk,narcotia1234,enloma,trizo,xmadda,redshift,alifikri,coder,dodol_maniac,eflorin,adywarna,kyokpae,milans,lovchy,spermwhale,phaze,baoengb,derek,yannick,daan,xxiengb,ott,mg,kennyt,tomsommer,poz,zamolxe,bishmila,ph1,irchtml,rogamer,bortolini,sapfir,guru,ahmed,robinhood,sohli,amt,romain,hlecuanda,thessoro,nforbes,jolan,laze,bagilevi,young,shakaali,chokobo,portalufpa,teecee,blindman,holst,schst,mnv,sodhi,aidan,jellybob,lauer,shenkong,jad,robert,peterhuewe,ogre,techtonik,narigone,realtebo,krid,mclay,dasch,miwaniec,abdshomad,sammywg,aeoris,mez,jed,hsc,luckec,dmytton,choudesh,phpvcn,simp,michael,grantc,atex,katja,sthulbourn,mikl,kevinsz,roast,lsmith,tessus,gavinfo,rant,ramsey,arkadius,bjori,erinet,omar,sixd,oliver,rquadling,timo,shadda,joeaccord,ezyang,ljbuesch,knut,asonge,mkoppanen,ron,nicobn,jacques,void,mcbrown,simionea,preinheimer,stanprog,msaraujo,felipe,asbjornit,philippe,sezer,ka! lle,rmlr,hradtke,alan,danielc,danbrown,alexxed,psalehpoor,loudi|phpdoc ,phpdoc-ar,phpdoc-bg,phpdoc-cs,phpdoc-da,phpdoc-de,phpdoc-el,phpdoc-es,phpdoc-fa,phpdoc-fi,phpdoc-fr,phpdoc-he,phpdoc-hk,phpdoc-hu,phpdoc-id,phpdoc-it,phpdoc-ja,phpdoc-kr,phpdoc-lt,phpdoc-nl,phpdoc-pl,phpdoc-pt_BR,phpdoc-pt,phpdoc-ro,phpdoc-ru,phpdoc-sk,phpdoc-sl,phpdoc-sv,phpdoc-tr,phpdoc-tw,phpdoc-zh,phpdoc-ca,phpdoc-no,phd,docweb +avail|lucas,jmertic,bobby,takagi,
[PHP-CVS] cvs: php-src /ext/intl/msgformat msgformat_helpers.cpp
ebatutisThu Oct 16 18:10:43 2008 UTC
Modified files:
/php-src/ext/intl/msgformat msgformat_helpers.cpp
Log:
Fix for pecl bug 14664 - problem with older gcc
http://cvs.php.net/viewvc.cgi/php-src/ext/intl/msgformat/msgformat_helpers.cpp?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/intl/msgformat/msgformat_helpers.cpp
diff -u php-src/ext/intl/msgformat/msgformat_helpers.cpp:1.2
php-src/ext/intl/msgformat/msgformat_helpers.cpp:1.3
--- php-src/ext/intl/msgformat/msgformat_helpers.cpp:1.2Mon Jul 7
23:42:29 2008
+++ php-src/ext/intl/msgformat/msgformat_helpers.cppThu Oct 16 18:10:43 2008
@@ -20,6 +20,7 @@
#include
#include
+#include
extern "C" {
#include "php_intl.h"
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/intl/msgformat msgformat_helpers.cpp
ebatutisThu Oct 16 18:06:05 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/intl/msgformat msgformat_helpers.cpp
Log:
Fix for pecl bug 14664 - problem with older gcc
http://cvs.php.net/viewvc.cgi/php-src/ext/intl/msgformat/msgformat_helpers.cpp?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/intl/msgformat/msgformat_helpers.cpp
diff -u php-src/ext/intl/msgformat/msgformat_helpers.cpp:1.1.2.1
php-src/ext/intl/msgformat/msgformat_helpers.cpp:1.1.2.2
--- php-src/ext/intl/msgformat/msgformat_helpers.cpp:1.1.2.1Mon Jul 7
22:51:03 2008
+++ php-src/ext/intl/msgformat/msgformat_helpers.cppThu Oct 16 18:06:05 2008
@@ -20,6 +20,7 @@
#include
#include
+#include
extern "C" {
#include "php_intl.h"
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
stasThu Oct 16 17:52:03 2008 UTC Modified files: /CVSROOTavail Log: add karma for old intl devs to new intl place http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1454&r2=1.1455&diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1454 CVSROOT/avail:1.1455 --- CVSROOT/avail:1.1454Wed Oct 15 06:46:17 2008 +++ CVSROOT/avail Thu Oct 16 17:52:02 2008 @@ -275,7 +275,7 @@ avail|tias|pear/PEAR_Frontend_Web,peardoc avail|va|pecl/yami avail|msaraujo,mansion|pecl/lua -avail|merletenney,kirtig,harveyrd,kuntakinte14,ebatutis,tex,vsavchuk|pecl/intl,pecl/unicode,phpdoc/en/reference/intl +avail|merletenney,kirtig,harveyrd,kuntakinte14,ebatutis,tex,vsavchuk|pecl/intl,pecl/unicode,phpdoc/en/reference/intl,php-src/ext/intl avail|lucas|pecl/apd avail|rotsenmarcello|pecl/puno avail|lwe|pecl/pdo_firebird,php-src/ext/pdo_firebird -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/mbstring/tests bug45722.phpt
moriyoshi Thu Oct 16 17:38:42 2008 UTC Added files: (Branch: PHP_5_2) /php-src/ext/mbstring/tests bug45722.phpt Log: * MFH remainder http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/bug45722.phpt?view=markup&rev=1.1 Index: php-src/ext/mbstring/tests/bug45722.phpt +++ php-src/ext/mbstring/tests/bug45722.phpt --TEST-- Bug #45722 (mb_check_encoding() crashes) --FILE-- --EXPECT-- bool(false) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mbstring/tests bug45722.phpt
moriyoshi Thu Oct 16 17:38:31 2008 UTC Added files: (Branch: PHP_5_3) /php-src/ext/mbstring/tests bug45722.phpt Log: * MFH remainder http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/bug45722.phpt?view=markup&rev=1.1 Index: php-src/ext/mbstring/tests/bug45722.phpt +++ php-src/ext/mbstring/tests/bug45722.phpt --TEST-- Bug #45722 (mb_check_encoding() crashes) --FILE-- --EXPECT-- bool(false) -- 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 /ext/imap config.m4 php_imap.c
hi Dmitry, Thanks for the fix. But next time, please ask before doing it. Especially as the bug was assigned to me and there was reasons why it was not done yet. Stan asked the status a couple of days ago, he did not mention that you were on it too. To communicate avoids waste of our precious time and resources. Also please give the right credits in the NEWS file, please mention the author of the original patch. -- Pierre 2008/10/16 Dmitry Stogov <[EMAIL PROTECTED]>: > dmitry Thu Oct 16 16:20:53 2008 UTC > > Modified files: (Branch: PHP_5_2) >/php-srcNEWS >/php-src/ext/imap config.m4 php_imap.c > Log: > Fixed bug #42862 (IMAP toolkit crash: rfc822.c legacy routine buffer > overflow) > > > -- > PHP CVS Mailing List (http://www.php.net/) > To unsubscribe, visit: http://www.php.net/unsub.php > -- Pierre http://blog.thepimp.net | http://www.libgd.org -- 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/imap config.m4 php_imap.c
dmitry Thu Oct 16 16:20:53 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-srcNEWS
/php-src/ext/imap config.m4 php_imap.c
Log:
Fixed bug #42862 (IMAP toolkit crash: rfc822.c legacy routine buffer overflow)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1260&r2=1.2027.2.547.2.1261&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1260 php-src/NEWS:1.2027.2.547.2.1261
--- php-src/NEWS:1.2027.2.547.2.1260Thu Oct 16 15:36:45 2008
+++ php-src/NEWSThu Oct 16 16:20:52 2008
@@ -16,6 +16,8 @@
- Fixed bug #44251, #41125 (PDO + quote() + prepare() can result in segfault).
(tsteiner at nerdclub dot net)
- Fixed bug #43723 (SOAP not sent properly from client for ). (Dmitry)
+- Fixed bug #42862 (IMAP toolkit crash: rfc822.c legacy routine buffer
+ overflow). (Dmitry)
- Fixed bug #42078 (pg_meta_data mix tables metadata from different schemas).
(Felipe)
- Fixed bug #37100 (data is returned truncated with BINARY CURSOR). (Tony)
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/config.m4?r1=1.69.4.7&r2=1.69.4.8&diff_format=u
Index: php-src/ext/imap/config.m4
diff -u php-src/ext/imap/config.m4:1.69.4.7 php-src/ext/imap/config.m4:1.69.4.8
--- php-src/ext/imap/config.m4:1.69.4.7 Sun Feb 11 09:25:32 2007
+++ php-src/ext/imap/config.m4 Thu Oct 16 16:20:53 2008
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.69.4.7 2007/02/11 09:25:32 tony2001 Exp $
+dnl $Id: config.m4,v 1.69.4.8 2008/10/16 16:20:53 dmitry Exp $
dnl
AC_DEFUN([IMAP_INC_CHK],[if test -r "$i$1/c-client.h"; then
@@ -229,4 +229,34 @@
AC_MSG_RESULT(no)
AC_MSG_ERROR([build test failed. Please check the config.log for
details.])
], $TST_LIBS)
+
+AC_MSG_CHECKING(whether rfc822_output_address_list function present)
+PHP_TEST_BUILD(foobar, [
+ AC_MSG_RESULT(yes)
+ AC_DEFINE(HAVE_RFC822_OUTPUT_ADDRESS_LIST, 1, [ ])
+], [
+ AC_MSG_RESULT(no)
+ ], [
+ $TST_LIBS
+], [
+ void mm_log(void){}
+ void mm_dlog(void){}
+ void mm_flags(void){}
+ void mm_fatal(void){}
+ void mm_critical(void){}
+ void mm_nocritical(void){}
+ void mm_notify(void){}
+ void mm_login(void){}
+ void mm_diskerror(void){}
+ void mm_status(void){}
+ void mm_lsub(void){}
+ void mm_list(void){}
+ void mm_exists(void){}
+ void mm_searched(void){}
+ void mm_expunged(void){}
+ void rfc822_output_address_list(void);
+ void (*f)(void);
+ char foobar () {f = rfc822_output_address_list;}
+])
+
fi
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/php_imap.c?r1=1.208.2.7.2.36&r2=1.208.2.7.2.37&diff_format=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.208.2.7.2.36
php-src/ext/imap/php_imap.c:1.208.2.7.2.37
--- php-src/ext/imap/php_imap.c:1.208.2.7.2.36 Mon Aug 4 21:16:22 2008
+++ php-src/ext/imap/php_imap.c Thu Oct 16 16:20:53 2008
@@ -26,7 +26,7 @@
| PHP 4.0 updates: Zeev Suraski <[EMAIL PROTECTED]> |
+--+
*/
-/* $Id: php_imap.c,v 1.208.2.7.2.36 2008/08/04 21:16:22 jani Exp $ */
+/* $Id: php_imap.c,v 1.208.2.7.2.37 2008/10/16 16:20:53 dmitry Exp $ */
#define IMAP41
@@ -40,6 +40,7 @@
#include "ext/standard/php_string.h"
#include "ext/standard/info.h"
#include "ext/standard/file.h"
+#include "ext/standard/php_smart_str.h"
#ifdef ERROR
#undef ERROR
@@ -66,10 +67,11 @@
#define SENDBUFLEN 16385
#endif
+
static void _php_make_header_object(zval *myzvalue, ENVELOPE *en TSRMLS_DC);
static void _php_imap_add_body(zval *arg, BODY *body TSRMLS_DC);
-static void _php_imap_parse_address(ADDRESS *addresslist, char **fulladdress,
zval *paddress TSRMLS_DC);
-static int _php_imap_address_size(ADDRESS *addresslist);
+static char* _php_imap_parse_address(ADDRESS *addresslist, zval *paddress
TSRMLS_DC);
+static char* _php_rfc822_write_address(ADDRESS *addresslist TSRMLS_DC);
/* the gets we use */
static char *php_mail_gets(readfn_t f, void *stream, unsigned long size,
GETS_DATA *md);
@@ -2112,7 +2114,7 @@
{
zval **mailbox, **host, **personal;
ADDRESS *addr;
- char string[MAILTMPLEN];
+ char *string;
if (ZEND_NUM_ARGS() != 3 || zend_get_parameters_ex(3, &mailbox, &host,
&personal) == FAILURE) {
ZEND_WRONG_PARAM_COUNT();
@@ -2140,13 +2142,12 @@
addr->error=NIL;
addr->adl=NIL;
- if (_php_imap_address_size(addr) >= MAILTMPLEN) {
+ string = _php_rfc822_write_address(addr TSRMLS_CC);
+ if (string) {
+ RETVAL_STRING(string, 0);
+ } else {
RETURN_FALSE;
}
-
- string[0]='\0';
- rfc822_write_address(string, addr);
- RETVAL_STRING(string, 1);
}
/* }}} */
@@ -2880,7 +2881,7 @@
zval **streamind, **sequence, **pflags;
pils *imap_le_struct;
zval *myoverview;
-
[PHP-CVS] cvs: php-src /ext/imap config.m4 php_imap.c
dmitry Thu Oct 16 16:21:21 2008 UTC
Modified files:
/php-src/ext/imap config.m4 php_imap.c
Log:
Fixed bug #42862 (IMAP toolkit crash: rfc822.c legacy routine buffer overflow)
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/config.m4?r1=1.77&r2=1.78&diff_format=u
Index: php-src/ext/imap/config.m4
diff -u php-src/ext/imap/config.m4:1.77 php-src/ext/imap/config.m4:1.78
--- php-src/ext/imap/config.m4:1.77 Thu Jan 31 18:48:00 2008
+++ php-src/ext/imap/config.m4 Thu Oct 16 16:21:20 2008
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.77 2008/01/31 18:48:00 nlopess Exp $
+dnl $Id: config.m4,v 1.78 2008/10/16 16:21:20 dmitry Exp $
dnl
AC_DEFUN([IMAP_INC_CHK],[if test -r "$i$1/c-client.h"; then
@@ -235,4 +235,40 @@
AC_MSG_RESULT(no)
AC_MSG_ERROR([build test failed. Please check the config.log for
details.])
], $TST_LIBS)
+
+AC_MSG_CHECKING(whether rfc822_output_address_list function present)
+PHP_TEST_BUILD(foobar, [
+ AC_MSG_RESULT(yes)
+ AC_DEFINE(HAVE_RFC822_OUTPUT_ADDRESS_LIST, 1, [ ])
+], [
+ AC_MSG_RESULT(no)
+ ], [
+ $TST_LIBS
+], [
+#if defined(__GNUC__) && __GNUC__ >= 4
+# define PHP_IMAP_EXPORT __attribute__ ((visibility("default")))
+#else
+# define PHP_IMAP_EXPORT
+#endif
+
+ PHP_IMAP_EXPORT void mm_log(void){}
+ PHP_IMAP_EXPORT void mm_dlog(void){}
+ PHP_IMAP_EXPORT void mm_flags(void){}
+ PHP_IMAP_EXPORT void mm_fatal(void){}
+ PHP_IMAP_EXPORT void mm_critical(void){}
+ PHP_IMAP_EXPORT void mm_nocritical(void){}
+ PHP_IMAP_EXPORT void mm_notify(void){}
+ PHP_IMAP_EXPORT void mm_login(void){}
+ PHP_IMAP_EXPORT void mm_diskerror(void){}
+ PHP_IMAP_EXPORT void mm_status(void){}
+ PHP_IMAP_EXPORT void mm_lsub(void){}
+ PHP_IMAP_EXPORT void mm_list(void){}
+ PHP_IMAP_EXPORT void mm_exists(void){}
+ PHP_IMAP_EXPORT void mm_searched(void){}
+ PHP_IMAP_EXPORT void mm_expunged(void){}
+ void rfc822_output_address_list(void);
+ void (*f)(void);
+ char foobar () {f = rfc822_output_address_list;}
+])
+
fi
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/php_imap.c?r1=1.259&r2=1.260&diff_format=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.259 php-src/ext/imap/php_imap.c:1.260
--- php-src/ext/imap/php_imap.c:1.259 Mon Oct 6 01:19:07 2008
+++ php-src/ext/imap/php_imap.c Thu Oct 16 16:21:20 2008
@@ -26,7 +26,7 @@
| PHP 4.0 updates: Zeev Suraski <[EMAIL PROTECTED]> |
+--+
*/
-/* $Id: php_imap.c,v 1.259 2008/10/06 01:19:07 iliaa Exp $ */
+/* $Id: php_imap.c,v 1.260 2008/10/16 16:21:20 dmitry Exp $ */
#define IMAP41
@@ -40,6 +40,7 @@
#include "ext/standard/php_string.h"
#include "ext/standard/info.h"
#include "ext/standard/file.h"
+#include "ext/standard/php_smart_str.h"
#ifdef ERROR
#undef ERROR
@@ -72,10 +73,11 @@
# define PHP_IMAP_EXPORT
#endif
+
static void _php_make_header_object(zval *myzvalue, ENVELOPE *en TSRMLS_DC);
static void _php_imap_add_body(zval *arg, BODY *body TSRMLS_DC);
-static void _php_imap_parse_address(ADDRESS *addresslist, char **fulladdress,
zval *paddress TSRMLS_DC);
-static int _php_imap_address_size(ADDRESS *addresslist);
+static char* _php_imap_parse_address(ADDRESS *addresslist, zval *paddress
TSRMLS_DC);
+static char* _php_rfc822_write_address(ADDRESS *addresslist TSRMLS_DC);
/* the gets we use */
static char *php_mail_gets(readfn_t f, void *stream, unsigned long size,
GETS_DATA *md);
@@ -2473,7 +2475,7 @@
char *mailbox, *host, *personal;
int mailbox_len, host_len, personal_len;
ADDRESS *addr;
- char string[MAILTMPLEN];
+ char *string;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sss", &mailbox,
&mailbox_len, &host, &host_len, &personal, &personal_len) == FAILURE) {
return;
@@ -2497,13 +2499,12 @@
addr->error=NIL;
addr->adl=NIL;
- if (_php_imap_address_size(addr) >= MAILTMPLEN) {
+ string = _php_rfc822_write_address(addr TSRMLS_CC);
+ if (string) {
+ RETVAL_STRING(string, 0);
+ } else {
RETURN_FALSE;
}
-
- string[0]='\0';
- rfc822_write_address(string, addr);
- RETVAL_STRING(string, 1);
}
/* }}} */
@@ -3213,7 +3214,7 @@
int sequence_len;
pils *imap_le_struct;
zval *myoverview;
- char address[MAILTMPLEN];
+ char *address;
long status, flags = 0L;
int argc = ZEND_NUM_ARGS();
@@ -3242,17 +3243,19 @@
if (env->subject) {
add_property_string(myoverview,
"subject", env->subject, 1);
}
- if (env->from &&
_php_imap_address_size(env->from) < MAILTMPLEN) {
+ i
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/imap config.m4 php_imap.c
dmitry Thu Oct 16 16:21:06 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/imap config.m4 php_imap.c
Log:
Fixed bug #42862 (IMAP toolkit crash: rfc822.c legacy routine buffer overflow)
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/config.m4?r1=1.69.4.7.2.1&r2=1.69.4.7.2.2&diff_format=u
Index: php-src/ext/imap/config.m4
diff -u php-src/ext/imap/config.m4:1.69.4.7.2.1
php-src/ext/imap/config.m4:1.69.4.7.2.2
--- php-src/ext/imap/config.m4:1.69.4.7.2.1 Thu Jan 31 18:30:42 2008
+++ php-src/ext/imap/config.m4 Thu Oct 16 16:21:06 2008
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.69.4.7.2.1 2008/01/31 18:30:42 nlopess Exp $
+dnl $Id: config.m4,v 1.69.4.7.2.2 2008/10/16 16:21:06 dmitry Exp $
dnl
AC_DEFUN([IMAP_INC_CHK],[if test -r "$i$1/c-client.h"; then
@@ -235,4 +235,40 @@
AC_MSG_RESULT(no)
AC_MSG_ERROR([build test failed. Please check the config.log for
details.])
], $TST_LIBS)
+
+AC_MSG_CHECKING(whether rfc822_output_address_list function present)
+PHP_TEST_BUILD(foobar, [
+ AC_MSG_RESULT(yes)
+ AC_DEFINE(HAVE_RFC822_OUTPUT_ADDRESS_LIST, 1, [ ])
+], [
+ AC_MSG_RESULT(no)
+ ], [
+ $TST_LIBS
+], [
+#if defined(__GNUC__) && __GNUC__ >= 4
+# define PHP_IMAP_EXPORT __attribute__ ((visibility("default")))
+#else
+# define PHP_IMAP_EXPORT
+#endif
+
+ PHP_IMAP_EXPORT void mm_log(void){}
+ PHP_IMAP_EXPORT void mm_dlog(void){}
+ PHP_IMAP_EXPORT void mm_flags(void){}
+ PHP_IMAP_EXPORT void mm_fatal(void){}
+ PHP_IMAP_EXPORT void mm_critical(void){}
+ PHP_IMAP_EXPORT void mm_nocritical(void){}
+ PHP_IMAP_EXPORT void mm_notify(void){}
+ PHP_IMAP_EXPORT void mm_login(void){}
+ PHP_IMAP_EXPORT void mm_diskerror(void){}
+ PHP_IMAP_EXPORT void mm_status(void){}
+ PHP_IMAP_EXPORT void mm_lsub(void){}
+ PHP_IMAP_EXPORT void mm_list(void){}
+ PHP_IMAP_EXPORT void mm_exists(void){}
+ PHP_IMAP_EXPORT void mm_searched(void){}
+ PHP_IMAP_EXPORT void mm_expunged(void){}
+ void rfc822_output_address_list(void);
+ void (*f)(void);
+ char foobar () {f = rfc822_output_address_list;}
+])
+
fi
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/php_imap.c?r1=1.208.2.7.2.26.2.19&r2=1.208.2.7.2.26.2.20&diff_format=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.208.2.7.2.26.2.19
php-src/ext/imap/php_imap.c:1.208.2.7.2.26.2.20
--- php-src/ext/imap/php_imap.c:1.208.2.7.2.26.2.19 Mon Oct 6 01:18:54 2008
+++ php-src/ext/imap/php_imap.c Thu Oct 16 16:21:06 2008
@@ -26,7 +26,7 @@
| PHP 4.0 updates: Zeev Suraski <[EMAIL PROTECTED]> |
+--+
*/
-/* $Id: php_imap.c,v 1.208.2.7.2.26.2.19 2008/10/06 01:18:54 iliaa Exp $ */
+/* $Id: php_imap.c,v 1.208.2.7.2.26.2.20 2008/10/16 16:21:06 dmitry Exp $ */
#define IMAP41
@@ -40,6 +40,7 @@
#include "ext/standard/php_string.h"
#include "ext/standard/info.h"
#include "ext/standard/file.h"
+#include "ext/standard/php_smart_str.h"
#ifdef ERROR
#undef ERROR
@@ -72,10 +73,11 @@
# define PHP_IMAP_EXPORT
#endif
+
static void _php_make_header_object(zval *myzvalue, ENVELOPE *en TSRMLS_DC);
static void _php_imap_add_body(zval *arg, BODY *body TSRMLS_DC);
-static void _php_imap_parse_address(ADDRESS *addresslist, char **fulladdress,
zval *paddress TSRMLS_DC);
-static int _php_imap_address_size(ADDRESS *addresslist);
+static char* _php_imap_parse_address(ADDRESS *addresslist, zval *paddress
TSRMLS_DC);
+static char* _php_rfc822_write_address(ADDRESS *addresslist TSRMLS_DC);
/* the gets we use */
static char *php_mail_gets(readfn_t f, void *stream, unsigned long size,
GETS_DATA *md);
@@ -2488,7 +2490,7 @@
char *mailbox, *host, *personal;
int mailbox_len, host_len, personal_len;
ADDRESS *addr;
- char string[MAILTMPLEN];
+ char *string;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sss", &mailbox,
&mailbox_len, &host, &host_len, &personal, &personal_len) == FAILURE) {
return;
@@ -2512,13 +2514,12 @@
addr->error=NIL;
addr->adl=NIL;
- if (_php_imap_address_size(addr) >= MAILTMPLEN) {
+ string = _php_rfc822_write_address(addr TSRMLS_CC);
+ if (string) {
+ RETVAL_STRING(string, 0);
+ } else {
RETURN_FALSE;
}
-
- string[0]='\0';
- rfc822_write_address(string, addr);
- RETVAL_STRING(string, 1);
}
/* }}} */
@@ -3228,7 +3229,7 @@
int sequence_len;
pils *imap_le_struct;
zval *myoverview;
- char address[MAILTMPLEN];
+ char *address;
long status, flags = 0L;
int argc = ZEND_NUM_ARGS();
@@ -3257,17 +3258,19 @@
if (env->subject) {
add_property_string(myoverview,
"subject", env->subje
[PHP-CVS] cvs: php-src /ext/soap php_encoding.c
dmitry Thu Oct 16 15:49:39 2008 UTC
Modified files:
/php-src/ext/soap php_encoding.c
Log:
ws
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_encoding.c?r1=1.170&r2=1.171&diff_format=u
Index: php-src/ext/soap/php_encoding.c
diff -u php-src/ext/soap/php_encoding.c:1.170
php-src/ext/soap/php_encoding.c:1.171
--- php-src/ext/soap/php_encoding.c:1.170 Thu Oct 16 15:37:11 2008
+++ php-src/ext/soap/php_encoding.c Thu Oct 16 15:49:38 2008
@@ -17,7 +17,7 @@
| Dmitry Stogov <[EMAIL PROTECTED]> |
+--+
*/
-/* $Id: php_encoding.c,v 1.170 2008/10/16 15:37:11 dmitry Exp $ */
+/* $Id: php_encoding.c,v 1.171 2008/10/16 15:49:38 dmitry Exp $ */
#include
@@ -471,27 +471,27 @@
zend_uchar utype =
zend_hash_get_current_key_ex(SOAP_GLOBAL(class_map), &type_name, &type_len,
&idx, 0, &pos);
- if (utype == HASH_KEY_IS_STRING || utype ==
HASH_KEY_IS_UNICODE) {
- encodePtr enc = NULL;
+ if (utype == HASH_KEY_IS_STRING ||
utype == HASH_KEY_IS_UNICODE) {
+ encodePtr enc = NULL;
- type_name.s =
soap_encode_string_ex(utype, type_name, type_len TSRMLS_CC);
+ type_name.s =
soap_encode_string_ex(utype, type_name, type_len TSRMLS_CC);
- /* TODO: namespace isn't stored */
- if (SOAP_GLOBAL(sdl)) {
- enc =
get_encoder(SOAP_GLOBAL(sdl), SOAP_GLOBAL(sdl)->target_ns, type_name.s);
- if (!enc) {
- enc =
find_encoder_by_type_name(SOAP_GLOBAL(sdl), type_name.s);
- }
- }
- if (enc) {
- if (encode != enc && style ==
SOAP_LITERAL) {
+ /* TODO: namespace isn't stored
*/
+ if (SOAP_GLOBAL(sdl)) {
+ enc =
get_encoder(SOAP_GLOBAL(sdl), SOAP_GLOBAL(sdl)->target_ns, type_name.s);
+ if (!enc) {
+ enc =
find_encoder_by_type_name(SOAP_GLOBAL(sdl), type_name.s);
+ }
+ }
+ if (enc) {
+ if (encode != enc &&
style == SOAP_LITERAL) {
add_type = 1;
- }
- encode = enc;
+ }
+ encode = enc;
}
efree(type_name.v);
- break;
- }
+ break;
+ }
}
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/soap php_encoding.c
dmitry Thu Oct 16 15:49:30 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/soap php_encoding.c
Log:
ws
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_encoding.c?r1=1.103.2.21.2.37.2.8&r2=1.103.2.21.2.37.2.9&diff_format=u
Index: php-src/ext/soap/php_encoding.c
diff -u php-src/ext/soap/php_encoding.c:1.103.2.21.2.37.2.8
php-src/ext/soap/php_encoding.c:1.103.2.21.2.37.2.9
--- php-src/ext/soap/php_encoding.c:1.103.2.21.2.37.2.8 Thu Oct 16 15:36:59 2008
+++ php-src/ext/soap/php_encoding.c Thu Oct 16 15:49:29 2008
@@ -17,7 +17,7 @@
| Dmitry Stogov <[EMAIL PROTECTED]> |
+--+
*/
-/* $Id: php_encoding.c,v 1.103.2.21.2.37.2.8 2008/10/16 15:36:59 dmitry Exp $
*/
+/* $Id: php_encoding.c,v 1.103.2.21.2.37.2.9 2008/10/16 15:49:29 dmitry Exp $
*/
#include
@@ -448,21 +448,21 @@
zend_binary_strncasecmp(ce->name,
ce->name_length, Z_STRVAL_PP(tmp), ce->name_length, ce->name_length) == 0 &&
zend_hash_get_current_key_ex(SOAP_GLOBAL(class_map), &type_name, &type_len,
&idx, 0, &pos) == HASH_KEY_IS_STRING) {
- /* TODO: namespace isn't stored */
- encodePtr enc = NULL;
- if (SOAP_GLOBAL(sdl)) {
- enc = get_encoder(SOAP_GLOBAL(sdl),
SOAP_GLOBAL(sdl)->target_ns, type_name);
- if (!enc) {
- enc =
find_encoder_by_type_name(SOAP_GLOBAL(sdl), type_name);
- }
- }
- if (enc) {
- if (encode != enc && style ==
SOAP_LITERAL) {
+ /* TODO: namespace isn't stored */
+ encodePtr enc = NULL;
+ if (SOAP_GLOBAL(sdl)) {
+ enc =
get_encoder(SOAP_GLOBAL(sdl), SOAP_GLOBAL(sdl)->target_ns, type_name);
+ if (!enc) {
+ enc =
find_encoder_by_type_name(SOAP_GLOBAL(sdl), type_name);
+ }
+ }
+ if (enc) {
+ if (encode != enc && style ==
SOAP_LITERAL) {
add_type = 1;
- }
- encode = enc;
- }
- break;
+ }
+ encode = enc;
+ }
+ break;
}
}
}
--
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/soap php_encoding.c
dmitry Thu Oct 16 15:49:18 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/soap php_encoding.c
Log:
ws
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_encoding.c?r1=1.103.2.21.2.41&r2=1.103.2.21.2.42&diff_format=u
Index: php-src/ext/soap/php_encoding.c
diff -u php-src/ext/soap/php_encoding.c:1.103.2.21.2.41
php-src/ext/soap/php_encoding.c:1.103.2.21.2.42
--- php-src/ext/soap/php_encoding.c:1.103.2.21.2.41 Thu Oct 16 15:36:46 2008
+++ php-src/ext/soap/php_encoding.c Thu Oct 16 15:49:18 2008
@@ -17,7 +17,7 @@
| Dmitry Stogov <[EMAIL PROTECTED]> |
+--+
*/
-/* $Id: php_encoding.c,v 1.103.2.21.2.41 2008/10/16 15:36:46 dmitry Exp $ */
+/* $Id: php_encoding.c,v 1.103.2.21.2.42 2008/10/16 15:49:18 dmitry Exp $ */
#include
@@ -447,21 +447,21 @@
zend_binary_strncasecmp(ce->name,
ce->name_length, Z_STRVAL_PP(tmp), ce->name_length, ce->name_length) == 0 &&
zend_hash_get_current_key_ex(SOAP_GLOBAL(class_map), &type_name, &type_len,
&idx, 0, &pos) == HASH_KEY_IS_STRING) {
- /* TODO: namespace isn't stored */
- encodePtr enc = NULL;
- if (SOAP_GLOBAL(sdl)) {
- enc = get_encoder(SOAP_GLOBAL(sdl),
SOAP_GLOBAL(sdl)->target_ns, type_name);
- if (!enc) {
- enc =
find_encoder_by_type_name(SOAP_GLOBAL(sdl), type_name);
- }
- }
- if (enc) {
- if (encode != enc && style ==
SOAP_LITERAL) {
+ /* TODO: namespace isn't stored */
+ encodePtr enc = NULL;
+ if (SOAP_GLOBAL(sdl)) {
+ enc =
get_encoder(SOAP_GLOBAL(sdl), SOAP_GLOBAL(sdl)->target_ns, type_name);
+ if (!enc) {
+ enc =
find_encoder_by_type_name(SOAP_GLOBAL(sdl), type_name);
+ }
+ }
+ if (enc) {
+ if (encode != enc && style ==
SOAP_LITERAL) {
add_type = 1;
- }
- encode = enc;
- }
- break;
+ }
+ encode = enc;
+ }
+ break;
}
}
}
--
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 Thu Oct 16 15:37:11 2008 UTC
Modified files:
/php-src/ext/soap php_encoding.c
Log:
Fixed bug #43723 (SOAP not sent properly from client for )
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_encoding.c?r1=1.169&r2=1.170&diff_format=u
Index: php-src/ext/soap/php_encoding.c
diff -u php-src/ext/soap/php_encoding.c:1.169
php-src/ext/soap/php_encoding.c:1.170
--- php-src/ext/soap/php_encoding.c:1.169 Wed Oct 1 08:43:21 2008
+++ php-src/ext/soap/php_encoding.c Thu Oct 16 15:37:11 2008
@@ -17,7 +17,7 @@
| Dmitry Stogov <[EMAIL PROTECTED]> |
+--+
*/
-/* $Id: php_encoding.c,v 1.169 2008/10/01 08:43:21 dmitry Exp $ */
+/* $Id: php_encoding.c,v 1.170 2008/10/16 15:37:11 dmitry Exp $ */
#include
@@ -362,6 +362,7 @@
static xmlNodePtr master_to_xml_int(encodePtr encode, zval *data, int style,
xmlNodePtr parent, int use_class_map)
{
xmlNodePtr node = NULL;
+ int add_type = 0;
TSRMLS_FETCH();
/* Special handling of class SoapVar */
@@ -478,14 +479,15 @@
/* TODO: namespace isn't stored */
if (SOAP_GLOBAL(sdl)) {
enc =
get_encoder(SOAP_GLOBAL(sdl), SOAP_GLOBAL(sdl)->target_ns, type_name.s);
+ if (!enc) {
+ enc =
find_encoder_by_type_name(SOAP_GLOBAL(sdl), type_name.s);
+ }
}
if (enc) {
+ if (encode != enc && style ==
SOAP_LITERAL) {
+ add_type = 1;
+ }
encode = enc;
- } else if (SOAP_GLOBAL(sdl)) {
- enc =
find_encoder_by_type_name(SOAP_GLOBAL(sdl), type_name.s);
- if (enc) {
- encode = enc;
- }
}
efree(type_name.v);
break;
@@ -514,6 +516,9 @@
}
if (encode->to_xml) {
node = encode->to_xml(&encode->details, data, style,
parent);
+ if (add_type) {
+ set_ns_and_type(node, &encode->details);
+ }
}
}
return node;
@@ -1594,6 +1599,13 @@
encodePtr enc;
data = get_zval_property(object, model->u.element->name
TSRMLS_CC);
+ if (data &&
+ Z_TYPE_P(data) == IS_NULL &&
+ !model->u.element->nillable &&
+ model->min_occurs > 0 &&
+ !strict) {
+ return 0;
+ }
if (data) {
enc = model->u.element->encode;
if ((model->max_occurs == -1 ||
model->max_occurs > 1) &&
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/soap php_encoding.c
dmitry Thu Oct 16 15:36:59 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/soap php_encoding.c
Log:
Fixed bug #43723 (SOAP not sent properly from client for )
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_encoding.c?r1=1.103.2.21.2.37.2.7&r2=1.103.2.21.2.37.2.8&diff_format=u
Index: php-src/ext/soap/php_encoding.c
diff -u php-src/ext/soap/php_encoding.c:1.103.2.21.2.37.2.7
php-src/ext/soap/php_encoding.c:1.103.2.21.2.37.2.8
--- php-src/ext/soap/php_encoding.c:1.103.2.21.2.37.2.7 Wed Oct 1 08:42:48 2008
+++ php-src/ext/soap/php_encoding.c Thu Oct 16 15:36:59 2008
@@ -17,7 +17,7 @@
| Dmitry Stogov <[EMAIL PROTECTED]> |
+--+
*/
-/* $Id: php_encoding.c,v 1.103.2.21.2.37.2.7 2008/10/01 08:42:48 dmitry Exp $
*/
+/* $Id: php_encoding.c,v 1.103.2.21.2.37.2.8 2008/10/16 15:36:59 dmitry Exp $
*/
#include
@@ -361,6 +361,7 @@
static xmlNodePtr master_to_xml_int(encodePtr encode, zval *data, int style,
xmlNodePtr parent, int check_class_map)
{
xmlNodePtr node = NULL;
+ int add_type = 0;
TSRMLS_FETCH();
/* Special handling of class SoapVar */
@@ -451,14 +452,15 @@
encodePtr enc = NULL;
if (SOAP_GLOBAL(sdl)) {
enc = get_encoder(SOAP_GLOBAL(sdl),
SOAP_GLOBAL(sdl)->target_ns, type_name);
+ if (!enc) {
+ enc =
find_encoder_by_type_name(SOAP_GLOBAL(sdl), type_name);
+ }
}
if (enc) {
+ if (encode != enc && style ==
SOAP_LITERAL) {
+ add_type = 1;
+ }
encode = enc;
- } else if (SOAP_GLOBAL(sdl)) {
- enc =
find_encoder_by_type_name(SOAP_GLOBAL(sdl), type_name);
- if (enc) {
- encode = enc;
- }
}
break;
}
@@ -485,6 +487,9 @@
}
if (encode->to_xml) {
node = encode->to_xml(&encode->details, data, style,
parent);
+ if (add_type) {
+ set_ns_and_type(node, &encode->details);
+ }
}
}
return node;
@@ -1662,6 +1667,13 @@
encodePtr enc;
data = get_zval_property(object, model->u.element->name
TSRMLS_CC);
+ if (data &&
+ Z_TYPE_P(data) == IS_NULL &&
+ !model->u.element->nillable &&
+ model->min_occurs > 0 &&
+ !strict) {
+ return 0;
+ }
if (data) {
enc = model->u.element->encode;
if ((model->max_occurs == -1 ||
model->max_occurs > 1) &&
--
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/soap php_encoding.c
dmitry Thu Oct 16 15:36:46 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-srcNEWS
/php-src/ext/soap php_encoding.c
Log:
Fixed bug #43723 (SOAP not sent properly from client for )
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1259&r2=1.2027.2.547.2.1260&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1259 php-src/NEWS:1.2027.2.547.2.1260
--- php-src/NEWS:1.2027.2.547.2.1259Thu Oct 16 01:02:39 2008
+++ php-src/NEWSThu Oct 16 15:36:45 2008
@@ -15,6 +15,7 @@
- Fixed buf #45722 (mb_check_encoding() crashes). (Moriyoshi)
- Fixed bug #44251, #41125 (PDO + quote() + prepare() can result in segfault).
(tsteiner at nerdclub dot net)
+- Fixed bug #43723 (SOAP not sent properly from client for ). (Dmitry)
- Fixed bug #42078 (pg_meta_data mix tables metadata from different schemas).
(Felipe)
- Fixed bug #37100 (data is returned truncated with BINARY CURSOR). (Tony)
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_encoding.c?r1=1.103.2.21.2.40&r2=1.103.2.21.2.41&diff_format=u
Index: php-src/ext/soap/php_encoding.c
diff -u php-src/ext/soap/php_encoding.c:1.103.2.21.2.40
php-src/ext/soap/php_encoding.c:1.103.2.21.2.41
--- php-src/ext/soap/php_encoding.c:1.103.2.21.2.40 Wed Oct 1 08:39:49 2008
+++ php-src/ext/soap/php_encoding.c Thu Oct 16 15:36:46 2008
@@ -17,7 +17,7 @@
| Dmitry Stogov <[EMAIL PROTECTED]> |
+--+
*/
-/* $Id: php_encoding.c,v 1.103.2.21.2.40 2008/10/01 08:39:49 dmitry Exp $ */
+/* $Id: php_encoding.c,v 1.103.2.21.2.41 2008/10/16 15:36:46 dmitry Exp $ */
#include
@@ -360,6 +360,7 @@
static xmlNodePtr master_to_xml_int(encodePtr encode, zval *data, int style,
xmlNodePtr parent, int check_class_map)
{
xmlNodePtr node = NULL;
+ int add_type = 0;
TSRMLS_FETCH();
/* Special handling of class SoapVar */
@@ -450,14 +451,15 @@
encodePtr enc = NULL;
if (SOAP_GLOBAL(sdl)) {
enc = get_encoder(SOAP_GLOBAL(sdl),
SOAP_GLOBAL(sdl)->target_ns, type_name);
+ if (!enc) {
+ enc =
find_encoder_by_type_name(SOAP_GLOBAL(sdl), type_name);
+ }
}
if (enc) {
+ if (encode != enc && style ==
SOAP_LITERAL) {
+ add_type = 1;
+ }
encode = enc;
- } else if (SOAP_GLOBAL(sdl)) {
- enc =
find_encoder_by_type_name(SOAP_GLOBAL(sdl), type_name);
- if (enc) {
- encode = enc;
- }
}
break;
}
@@ -484,6 +486,9 @@
}
if (encode->to_xml) {
node = encode->to_xml(&encode->details, data, style,
parent);
+ if (add_type) {
+ set_ns_and_type(node, &encode->details);
+ }
}
}
return node;
@@ -1623,6 +1628,13 @@
encodePtr enc;
data = get_zval_property(object, model->u.element->name
TSRMLS_CC);
+ if (data &&
+ Z_TYPE_P(data) == IS_NULL &&
+ !model->u.element->nillable &&
+ model->min_occurs > 0 &&
+ !strict) {
+ return 0;
+ }
if (data) {
enc = model->u.element->encode;
if ((model->max_occurs == -1 ||
model->max_occurs > 1) &&
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard exec.c
felipe Thu Oct 16 13:04:30 2008 UTC
Modified files:
/php-src/ext/standard exec.c
Log:
- Revert
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/exec.c?r1=1.137&r2=1.138&diff_format=u
Index: php-src/ext/standard/exec.c
diff -u php-src/ext/standard/exec.c:1.137 php-src/ext/standard/exec.c:1.138
--- php-src/ext/standard/exec.c:1.137 Thu Oct 16 12:21:27 2008
+++ php-src/ext/standard/exec.c Thu Oct 16 13:04:30 2008
@@ -16,7 +16,7 @@
| Ilia Alshanetsky <[EMAIL PROTECTED]> |
+--+
*/
-/* $Id: exec.c,v 1.137 2008/10/16 12:21:27 indeyets Exp $ */
+/* $Id: exec.c,v 1.138 2008/10/16 13:04:30 felipe Exp $ */
#include
#include "php.h"
@@ -254,6 +254,8 @@
char *p = NULL;
size_t estimate = (2 * l) + 1;
+ TSRMLS_FETCH();
+
cmd = safe_emalloc(2, l, 1);
for (x = 0, y = 0; x < l; x++) {
@@ -342,6 +344,8 @@
char *cmd;
size_t estimate = (4 * l) + 3;
+ TSRMLS_FETCH();
+
cmd = safe_emalloc(4, l, 3); /* worst case */
#ifdef PHP_WIN32
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/standard exec.c
Hi Alexey, Em Qui, 2008-10-16 às 12:21 +, Alexey Zakhlestin escreveu: > indeyets Thu Oct 16 12:21:27 2008 UTC > > Modified files: > /php-src/ext/standard exec.c > Log: > MFB: Fixed compilation warnings: tsrm_ls is not used here (anymore?) > It is used in somes cases. The php_escape_shell_arg and php_escape_shell_cmd uses php_mblen(): #ifndef HAVE_MBLEN # define php_mblen(ptr, len) 1 #else # if defined(_REENTRANT) && defined(HAVE_MBRLEN) && defined(HAVE_MBSTATE_T) # define php_mblen(ptr, len) ((ptr) == NULL ? mbsinit(&BG(mblen_state)): (int)mbrlen(ptr, len, &BG(mblen_state))) # else # define php_mblen(ptr, len) mblen(ptr, len) # endif #endif > http://cvs.php.net/viewvc.cgi/php-src/ext/standard/exec.c?r1=1.136&r2=1.137&diff_format=u > Index: php-src/ext/standard/exec.c > diff -u php-src/ext/standard/exec.c:1.136 php-src/ext/standard/exec.c:1.137 > --- php-src/ext/standard/exec.c:1.136 Sun Aug 17 15:23:22 2008 > +++ php-src/ext/standard/exec.c Thu Oct 16 12:21:27 2008 > @@ -16,7 +16,7 @@ > | Ilia Alshanetsky <[EMAIL PROTECTED]> > | > +--+ > */ > -/* $Id: exec.c,v 1.136 2008/08/17 15:23:22 pajoye Exp $ */ > +/* $Id: exec.c,v 1.137 2008/10/16 12:21:27 indeyets Exp $ */ > > #include > #include "php.h" > @@ -253,8 +253,6 @@ > char *cmd; > char *p = NULL; > size_t estimate = (2 * l) + 1; > - > - TSRMLS_FETCH(); > > cmd = safe_emalloc(2, l, 1); > > @@ -343,7 +341,6 @@ > int x, y = 0, l = strlen(str); > char *cmd; > size_t estimate = (4 * l) + 3; > - TSRMLS_FETCH(); > > cmd = safe_emalloc(4, l, 3); /* worst case */ > > > > -- Regards, Felipe Pena -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard exec.c
felipe Thu Oct 16 13:00:27 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard exec.c
Log:
- Revert
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/exec.c?r1=1.113.2.3.2.1.2.13&r2=1.113.2.3.2.1.2.14&diff_format=u
Index: php-src/ext/standard/exec.c
diff -u php-src/ext/standard/exec.c:1.113.2.3.2.1.2.13
php-src/ext/standard/exec.c:1.113.2.3.2.1.2.14
--- php-src/ext/standard/exec.c:1.113.2.3.2.1.2.13 Thu Oct 16 11:59:37 2008
+++ php-src/ext/standard/exec.c Thu Oct 16 13:00:27 2008
@@ -16,7 +16,7 @@
| Ilia Alshanetsky <[EMAIL PROTECTED]> |
+--+
*/
-/* $Id: exec.c,v 1.113.2.3.2.1.2.13 2008/10/16 11:59:37 indeyets Exp $ */
+/* $Id: exec.c,v 1.113.2.3.2.1.2.14 2008/10/16 13:00:27 felipe Exp $ */
#include
#include "php.h"
@@ -269,6 +269,8 @@
char *p = NULL;
size_t estimate = (2 * l) + 1;
+ TSRMLS_FETCH();
+
cmd = safe_emalloc(2, l, 1);
for (x = 0, y = 0; x < l; x++) {
@@ -357,6 +359,8 @@
char *cmd;
size_t estimate = (4 * l) + 3;
+ TSRMLS_FETCH();
+
cmd = safe_emalloc(4, l, 3); /* worst case */
#ifdef PHP_WIN32
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/sqlite sqlite.c
indeyetsThu Oct 16 12:52:39 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/sqlite sqlite.c
Log:
Updated functions-signatures (const)
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite/sqlite.c?r1=1.166.2.13.2.9.2.11&r2=1.166.2.13.2.9.2.12&diff_format=u
Index: php-src/ext/sqlite/sqlite.c
diff -u php-src/ext/sqlite/sqlite.c:1.166.2.13.2.9.2.11
php-src/ext/sqlite/sqlite.c:1.166.2.13.2.9.2.12
--- php-src/ext/sqlite/sqlite.c:1.166.2.13.2.9.2.11 Fri Aug 8 22:07:06 2008
+++ php-src/ext/sqlite/sqlite.c Thu Oct 16 12:52:38 2008
@@ -17,7 +17,7 @@
| Marcus Boerger <[EMAIL PROTECTED]> |
+--+
- $Id: sqlite.c,v 1.166.2.13.2.9.2.11 2008/08/08 22:07:06 colder Exp $
+ $Id: sqlite.c,v 1.166.2.13.2.9.2.12 2008/10/16 12:52:38 indeyets Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1274,12 +1274,12 @@
obj->u._type = _ptr; \
}
-static zend_class_entry *sqlite_get_ce_query(zval *object TSRMLS_DC)
+static zend_class_entry *sqlite_get_ce_query(const zval *object TSRMLS_DC)
{
return sqlite_ce_query;
}
-static zend_class_entry *sqlite_get_ce_ub_query(zval *object TSRMLS_DC)
+static zend_class_entry *sqlite_get_ce_ub_query(const zval *object TSRMLS_DC)
{
return sqlite_ce_ub_query;
}
@@ -1520,7 +1520,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, "SQLite support", "enabled");
- php_info_print_table_row(2, "PECL Module version",
PHP_SQLITE_MODULE_VERSION " $Id: sqlite.c,v 1.166.2.13.2.9.2.11 2008/08/08
22:07:06 colder Exp $");
+ php_info_print_table_row(2, "PECL Module version",
PHP_SQLITE_MODULE_VERSION " $Id: sqlite.c,v 1.166.2.13.2.9.2.12 2008/10/16
12:52:38 indeyets Exp $");
php_info_print_table_row(2, "SQLite Library", sqlite_libversion());
php_info_print_table_row(2, "SQLite Encoding", sqlite_libencoding());
php_info_print_table_end();
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard exec.c
indeyetsThu Oct 16 12:21:27 2008 UTC Modified files: /php-src/ext/standard exec.c Log: MFB: Fixed compilation warnings: tsrm_ls is not used here (anymore?) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/exec.c?r1=1.136&r2=1.137&diff_format=u Index: php-src/ext/standard/exec.c diff -u php-src/ext/standard/exec.c:1.136 php-src/ext/standard/exec.c:1.137 --- php-src/ext/standard/exec.c:1.136 Sun Aug 17 15:23:22 2008 +++ php-src/ext/standard/exec.c Thu Oct 16 12:21:27 2008 @@ -16,7 +16,7 @@ | Ilia Alshanetsky <[EMAIL PROTECTED]> | +--+ */ -/* $Id: exec.c,v 1.136 2008/08/17 15:23:22 pajoye Exp $ */ +/* $Id: exec.c,v 1.137 2008/10/16 12:21:27 indeyets Exp $ */ #include #include "php.h" @@ -253,8 +253,6 @@ char *cmd; char *p = NULL; size_t estimate = (2 * l) + 1; - - TSRMLS_FETCH(); cmd = safe_emalloc(2, l, 1); @@ -343,7 +341,6 @@ int x, y = 0, l = strlen(str); char *cmd; size_t estimate = (4 * l) + 3; - TSRMLS_FETCH(); cmd = safe_emalloc(4, l, 3); /* worst case */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard exec.c
indeyetsThu Oct 16 11:59:37 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/standard exec.c Log: Fixed compilation warnings: tsrm_ls is not used here (anymore?) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/exec.c?r1=1.113.2.3.2.1.2.12&r2=1.113.2.3.2.1.2.13&diff_format=u Index: php-src/ext/standard/exec.c diff -u php-src/ext/standard/exec.c:1.113.2.3.2.1.2.12 php-src/ext/standard/exec.c:1.113.2.3.2.1.2.13 --- php-src/ext/standard/exec.c:1.113.2.3.2.1.2.12 Sun Aug 17 15:23:45 2008 +++ php-src/ext/standard/exec.c Thu Oct 16 11:59:37 2008 @@ -16,7 +16,7 @@ | Ilia Alshanetsky <[EMAIL PROTECTED]> | +--+ */ -/* $Id: exec.c,v 1.113.2.3.2.1.2.12 2008/08/17 15:23:45 pajoye Exp $ */ +/* $Id: exec.c,v 1.113.2.3.2.1.2.13 2008/10/16 11:59:37 indeyets Exp $ */ #include #include "php.h" @@ -268,8 +268,6 @@ char *cmd; char *p = NULL; size_t estimate = (2 * l) + 1; - - TSRMLS_FETCH(); cmd = safe_emalloc(2, l, 1); @@ -358,7 +356,6 @@ int x, y = 0, l = strlen(str); char *cmd; size_t estimate = (4 * l) + 3; - TSRMLS_FETCH(); cmd = safe_emalloc(4, l, 3); /* worst case */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/ereg/regex regcomp.c regcomp.ih /ext/simplexml simplexml.c
indeyetsThu Oct 16 11:42:20 2008 UTC
Modified files:
/php-src/ext/ereg/regex regcomp.c regcomp.ih
/php-src/ext/simplexml simplexml.c
Log:
MFB: propagated const, to avoid "discards qualifiers from pointer target
type" errors
http://cvs.php.net/viewvc.cgi/php-src/ext/ereg/regex/regcomp.c?r1=1.7&r2=1.8&diff_format=u
Index: php-src/ext/ereg/regex/regcomp.c
diff -u php-src/ext/ereg/regex/regcomp.c:1.7
php-src/ext/ereg/regex/regcomp.c:1.8
--- php-src/ext/ereg/regex/regcomp.c:1.7Thu Oct 12 01:05:25 2006
+++ php-src/ext/ereg/regex/regcomp.cThu Oct 16 11:42:20 2008
@@ -724,9 +724,9 @@
register cset *cs;
{
register unsigned char *sp = p->next;
- register struct cclass *cp;
+ register const struct cclass *cp;
register size_t len;
- register unsigned char *u;
+ register const unsigned char *u;
register unsigned char c;
while (MORE() && isalpha(PEEK()))
@@ -795,7 +795,7 @@
int endc; /* name ended by endc,']' */
{
register unsigned char *sp = p->next;
- register struct cname *cp;
+ register const struct cname *cp;
register int len;
while (MORE() && !SEETWO(endc, ']'))
@@ -1153,7 +1153,7 @@
mcadd(p, cs, cp)
register struct parse *p;
register cset *cs;
-register unsigned char *cp;
+register const unsigned char *cp;
{
register size_t oldend = cs->smultis;
http://cvs.php.net/viewvc.cgi/php-src/ext/ereg/regex/regcomp.ih?r1=1.5&r2=1.6&diff_format=u
Index: php-src/ext/ereg/regex/regcomp.ih
diff -u php-src/ext/ereg/regex/regcomp.ih:1.5
php-src/ext/ereg/regex/regcomp.ih:1.6
--- php-src/ext/ereg/regex/regcomp.ih:1.5 Tue Sep 30 00:26:03 2003
+++ php-src/ext/ereg/regex/regcomp.ih Thu Oct 16 11:42:20 2008
@@ -27,7 +27,7 @@
static int freezeset(register struct parse *p, register cset *cs);
static int firstch(register struct parse *p, register cset *cs);
static int nch(register struct parse *p, register cset *cs);
-static void mcadd(register struct parse *p, register cset *cs, register
unsigned char *cp);
+static void mcadd(register struct parse *p, register cset *cs, register const
unsigned char *cp);
#if 0
static void mcsub(register cset *cs, register unsigned char *cp);
static int mcin(register cset *cs, register unsigned char *cp);
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/simplexml.c?r1=1.261&r2=1.262&diff_format=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.261
php-src/ext/simplexml/simplexml.c:1.262
--- php-src/ext/simplexml/simplexml.c:1.261 Thu Sep 11 14:20:30 2008
+++ php-src/ext/simplexml/simplexml.c Thu Oct 16 11:42:20 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: simplexml.c,v 1.261 2008/09/11 14:20:30 rrichards Exp $ */
+/* $Id: simplexml.c,v 1.262 2008/10/16 11:42:20 indeyets Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -69,7 +69,7 @@
/* {{{ _node_as_zval()
*/
-static void _node_as_zval(php_sxe_object *sxe, xmlNodePtr node, zval *value,
SXE_ITER itertype, char *name, xmlChar *nsprefix, int isprefix TSRMLS_DC)
+static void _node_as_zval(php_sxe_object *sxe, xmlNodePtr node, zval *value,
SXE_ITER itertype, char *name, const xmlChar *nsprefix, int isprefix TSRMLS_DC)
{
php_sxe_object *subnode;
@@ -81,7 +81,7 @@
subnode->iter.name = xmlStrdup((xmlChar *)name);
}
if (nsprefix && *nsprefix) {
- subnode->iter.nsprefix = xmlStrdup((xmlChar *)nsprefix);
+ subnode->iter.nsprefix = xmlStrdup(nsprefix);
subnode->iter.isprefix = isprefix;
}
@@ -2644,7 +2644,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, "Simplexml support", "enabled");
- php_info_print_table_row(2, "Revision", "$Revision: 1.261 $");
+ php_info_print_table_row(2, "Revision", "$Revision: 1.262 $");
php_info_print_table_row(2, "Schema support",
#ifdef LIBXML_SCHEMAS_ENABLED
"enabled");
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/ereg/regex regcomp.c regcomp.ih /ext/simplexml simplexml.c
indeyetsThu Oct 16 11:38:25 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/ereg/regex regcomp.c regcomp.ih
/php-src/ext/simplexml simplexml.c
Log:
propagated const, to avoid "discards qualifiers from pointer target type"
errors
http://cvs.php.net/viewvc.cgi/php-src/ext/ereg/regex/regcomp.c?r1=1.7.2.2&r2=1.7.2.3&diff_format=u
Index: php-src/ext/ereg/regex/regcomp.c
diff -u php-src/ext/ereg/regex/regcomp.c:1.7.2.2
php-src/ext/ereg/regex/regcomp.c:1.7.2.3
--- php-src/ext/ereg/regex/regcomp.c:1.7.2.2Fri Oct 5 15:00:06 2007
+++ php-src/ext/ereg/regex/regcomp.cThu Oct 16 11:38:25 2008
@@ -724,9 +724,9 @@
register cset *cs;
{
register unsigned char *sp = p->next;
- register struct cclass *cp;
+ register const struct cclass *cp;
register size_t len;
- register unsigned char *u;
+ register const unsigned char *u;
register unsigned char c;
while (MORE() && isalpha(PEEK()))
@@ -795,7 +795,7 @@
int endc; /* name ended by endc,']' */
{
register unsigned char *sp = p->next;
- register struct cname *cp;
+ register const struct cname *cp;
register int len;
while (MORE() && !SEETWO(endc, ']'))
@@ -1153,7 +1153,7 @@
mcadd(p, cs, cp)
register struct parse *p;
register cset *cs;
-register unsigned char *cp;
+register const unsigned char *cp;
{
register size_t oldend = cs->smultis;
http://cvs.php.net/viewvc.cgi/php-src/ext/ereg/regex/regcomp.ih?r1=1.5.8.2&r2=1.5.8.3&diff_format=u
Index: php-src/ext/ereg/regex/regcomp.ih
diff -u php-src/ext/ereg/regex/regcomp.ih:1.5.8.2
php-src/ext/ereg/regex/regcomp.ih:1.5.8.3
--- php-src/ext/ereg/regex/regcomp.ih:1.5.8.2 Fri Oct 5 15:00:06 2007
+++ php-src/ext/ereg/regex/regcomp.ih Thu Oct 16 11:38:25 2008
@@ -27,7 +27,7 @@
static int freezeset(register struct parse *p, register cset *cs);
static int firstch(register struct parse *p, register cset *cs);
static int nch(register struct parse *p, register cset *cs);
-static void mcadd(register struct parse *p, register cset *cs, register
unsigned char *cp);
+static void mcadd(register struct parse *p, register cset *cs, register const
unsigned char *cp);
#if 0
static void mcsub(register cset *cs, register unsigned char *cp);
static int mcin(register cset *cs, register unsigned char *cp);
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/simplexml.c?r1=1.151.2.22.2.35.2.20&r2=1.151.2.22.2.35.2.21&diff_format=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.151.2.22.2.35.2.20
php-src/ext/simplexml/simplexml.c:1.151.2.22.2.35.2.21
--- php-src/ext/simplexml/simplexml.c:1.151.2.22.2.35.2.20 Thu Sep 11
14:21:33 2008
+++ php-src/ext/simplexml/simplexml.c Thu Oct 16 11:38:25 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: simplexml.c,v 1.151.2.22.2.35.2.20 2008/09/11 14:21:33 rrichards Exp $
*/
+/* $Id: simplexml.c,v 1.151.2.22.2.35.2.21 2008/10/16 11:38:25 indeyets Exp $
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -67,7 +67,7 @@
/* {{{ _node_as_zval()
*/
-static void _node_as_zval(php_sxe_object *sxe, xmlNodePtr node, zval *value,
SXE_ITER itertype, char *name, xmlChar *nsprefix, int isprefix TSRMLS_DC)
+static void _node_as_zval(php_sxe_object *sxe, xmlNodePtr node, zval *value,
SXE_ITER itertype, char *name, const xmlChar *nsprefix, int isprefix TSRMLS_DC)
{
php_sxe_object *subnode;
@@ -79,7 +79,7 @@
subnode->iter.name = xmlStrdup((xmlChar *)name);
}
if (nsprefix && *nsprefix) {
- subnode->iter.nsprefix = xmlStrdup((xmlChar *)nsprefix);
+ subnode->iter.nsprefix = xmlStrdup(nsprefix);
subnode->iter.isprefix = isprefix;
}
@@ -2562,7 +2562,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, "Simplexml support", "enabled");
- php_info_print_table_row(2, "Revision", "$Revision:
1.151.2.22.2.35.2.20 $");
+ php_info_print_table_row(2, "Revision", "$Revision:
1.151.2.22.2.35.2.21 $");
php_info_print_table_row(2, "Schema support",
#ifdef LIBXML_SCHEMAS_ENABLED
"enabled");
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
