[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/main/streams/streams.c branches/PHP_5_4/main/streams/streams.c trunk/main/streams/streams.c
cataphract Tue, 05 Jul 2011 16:09:06 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=312937
Log:
- Fixed bug #52935 (call exit in user_error_handler cause stream relate core).
Bug: https://bugs.php.net/52935 (Assigned) call exit in user_error_handler
cause stream relate core
Changed paths:
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/main/streams/streams.c
U php/php-src/branches/PHP_5_4/main/streams/streams.c
U php/php-src/trunk/main/streams/streams.c
Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS 2011-07-05 14:12:01 UTC (rev 312936)
+++ php/php-src/branches/PHP_5_3/NEWS 2011-07-05 16:09:06 UTC (rev 312937)
@@ -5,6 +5,8 @@
. Fixed bug #53727 (Inconsistent behavior of is_subclass_of with interfaces)
(Ralph Schindler, Dmitry)
. Fixed buffer overflow on overlog salt in crypt(). (Clément LECIGNE, Stas)
+ . Fixed bug #52935 (call exit in user_error_handler cause stream relate
+core). (Gustavo)
- PDO DBlib:
. Fixed bug #54329 (MSSql extension memory leak).
Modified: php/php-src/branches/PHP_5_3/main/streams/streams.c
===
--- php/php-src/branches/PHP_5_3/main/streams/streams.c 2011-07-05 14:12:01 UTC
(rev 312936)
+++ php/php-src/branches/PHP_5_3/main/streams/streams.c 2011-07-05 16:09:06 UTC
(rev 312937)
@@ -154,6 +154,7 @@
char *tmp = estrdup(path);
char *msg;
int free_msg = 0;
+ php_stream_wrapper orig_wrapper;
if (wrapper) {
if (wrapper-err_count 0) {
@@ -198,7 +199,16 @@
}
php_strip_url_passwd(tmp);
+ if (wrapper) {
+ /* see bug #52935 */
+ orig_wrapper = *wrapper;
+ wrapper-err_stack = NULL;
+ wrapper-err_count = 0;
+ }
php_error_docref1(NULL TSRMLS_CC, tmp, E_WARNING, %s: %s, caption,
msg);
+ if (wrapper) {
+ *wrapper = orig_wrapper;
+ }
efree(tmp);
if (free_msg) {
efree(msg);
Modified: php/php-src/branches/PHP_5_4/main/streams/streams.c
===
--- php/php-src/branches/PHP_5_4/main/streams/streams.c 2011-07-05 14:12:01 UTC
(rev 312936)
+++ php/php-src/branches/PHP_5_4/main/streams/streams.c 2011-07-05 16:09:06 UTC
(rev 312937)
@@ -163,6 +163,7 @@
char *tmp = estrdup(path);
char *msg;
int free_msg = 0;
+ php_stream_wrapper orig_wrapper;
if (wrapper) {
if (wrapper-err_count 0) {
@@ -207,7 +208,16 @@
}
php_strip_url_passwd(tmp);
+ if (wrapper) {
+ /* see bug #52935 */
+ orig_wrapper = *wrapper;
+ wrapper-err_stack = NULL;
+ wrapper-err_count = 0;
+ }
php_error_docref1(NULL TSRMLS_CC, tmp, E_WARNING, %s: %s, caption,
msg);
+ if (wrapper) {
+ *wrapper = orig_wrapper;
+ }
efree(tmp);
if (free_msg) {
efree(msg);
Modified: php/php-src/trunk/main/streams/streams.c
===
--- php/php-src/trunk/main/streams/streams.c2011-07-05 14:12:01 UTC (rev
312936)
+++ php/php-src/trunk/main/streams/streams.c2011-07-05 16:09:06 UTC (rev
312937)
@@ -163,6 +163,7 @@
char *tmp = estrdup(path);
char *msg;
int free_msg = 0;
+ php_stream_wrapper orig_wrapper;
if (wrapper) {
if (wrapper-err_count 0) {
@@ -207,7 +208,16 @@
}
php_strip_url_passwd(tmp);
+ if (wrapper) {
+ /* see bug #52935 */
+ orig_wrapper = *wrapper;
+ wrapper-err_stack = NULL;
+ wrapper-err_count = 0;
+ }
php_error_docref1(NULL TSRMLS_CC, tmp, E_WARNING, %s: %s, caption,
msg);
+ if (wrapper) {
+ *wrapper = orig_wrapper;
+ }
efree(tmp);
if (free_msg) {
efree(msg);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/sapi/fpm/fpm/fpm_conf.c branches/PHP_5_3/sapi/fpm/fpm/zlog.c branches/PHP_5_3/sapi/fpm/fpm/zlog.h branches/PHP_5_4/sapi/fpm/fpm/fpm_
fat Tue, 05 Jul 2011 18:09:07 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=312943
Log:
- Fixed wrong value of log_level when invoking fpm with -tt
Changed paths:
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_conf.c
U php/php-src/branches/PHP_5_3/sapi/fpm/fpm/zlog.c
U php/php-src/branches/PHP_5_3/sapi/fpm/fpm/zlog.h
U php/php-src/branches/PHP_5_4/sapi/fpm/fpm/fpm_conf.c
U php/php-src/branches/PHP_5_4/sapi/fpm/fpm/zlog.c
U php/php-src/branches/PHP_5_4/sapi/fpm/fpm/zlog.h
U php/php-src/trunk/sapi/fpm/fpm/fpm_conf.c
U php/php-src/trunk/sapi/fpm/fpm/zlog.c
U php/php-src/trunk/sapi/fpm/fpm/zlog.h
Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS 2011-07-05 17:36:36 UTC (rev 312942)
+++ php/php-src/branches/PHP_5_3/NEWS 2011-07-05 18:09:07 UTC (rev 312943)
@@ -34,6 +34,7 @@
. Fixed missing Expires and Cache-Control headers for ping and status pages.
(fat)
. Fixed memory leak. (fat) Reported and fixed by Giovanni Giacobbi.
+ . Fixed wrong value of log_level when invoking fpm with -tt. (fat)
- SPL extension:
. Fixed bug #54971 (Wrong result when using iterator_to_array with use_keys
Modified: php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_conf.c
===
--- php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_conf.c2011-07-05
17:36:36 UTC (rev 312942)
+++ php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_conf.c2011-07-05
18:09:07 UTC (rev 312943)
@@ -1151,7 +1151,7 @@
zlog(ZLOG_NOTICE, \tpid = %s,
STR2STR(fpm_global_config.pid_file));
zlog(ZLOG_NOTICE, \tdaemonize = %s,
BOOL2STR(fpm_global_config.daemonize));
zlog(ZLOG_NOTICE, \terror_log = %s,
STR2STR(fpm_global_config.error_log));
- zlog(ZLOG_NOTICE, \tlog_level = %s,
zlog_get_level_name());
+ zlog(ZLOG_NOTICE, \tlog_level = %s,
zlog_get_level_name(fpm_globals.log_level));
zlog(ZLOG_NOTICE, \tprocess_control_timeout = %ds,
fpm_global_config.process_control_timeout);
zlog(ZLOG_NOTICE, \temergency_restart_interval = %ds,
fpm_global_config.emergency_restart_interval);
zlog(ZLOG_NOTICE, \temergency_restart_threshold = %d,
fpm_global_config.emergency_restart_threshold);
Modified: php/php-src/branches/PHP_5_3/sapi/fpm/fpm/zlog.c
===
--- php/php-src/branches/PHP_5_3/sapi/fpm/fpm/zlog.c2011-07-05 17:36:36 UTC
(rev 312942)
+++ php/php-src/branches/PHP_5_3/sapi/fpm/fpm/zlog.c2011-07-05 18:09:07 UTC
(rev 312943)
@@ -29,9 +29,15 @@
[ZLOG_ALERT]= ALERT,
};
-const char *zlog_get_level_name() /* {{{ */
+const char *zlog_get_level_name(int log_level) /* {{{ */
{
- return level_names[zlog_level];
+ if (log_level 0) {
+ log_level = zlog_level;
+ } else if (log_level ZLOG_DEBUG || log_level ZLOG_ALERT) {
+ return unknown value;
+ }
+
+ return level_names[log_level];
}
/* }}} */
Modified: php/php-src/branches/PHP_5_3/sapi/fpm/fpm/zlog.h
===
--- php/php-src/branches/PHP_5_3/sapi/fpm/fpm/zlog.h2011-07-05 17:36:36 UTC
(rev 312942)
+++ php/php-src/branches/PHP_5_3/sapi/fpm/fpm/zlog.h2011-07-05 18:09:07 UTC
(rev 312943)
@@ -11,7 +11,7 @@
int zlog_set_fd(int new_fd);
int zlog_set_level(int new_value);
-const char *zlog_get_level_name();
+const char *zlog_get_level_name(int log_level);
void zlog_set_launched(void);
size_t zlog_print_time(struct timeval *tv, char *timebuf, size_t timebuf_len);
Modified: php/php-src/branches/PHP_5_4/sapi/fpm/fpm/fpm_conf.c
===
--- php/php-src/branches/PHP_5_4/sapi/fpm/fpm/fpm_conf.c2011-07-05
17:36:36 UTC (rev 312942)
+++ php/php-src/branches/PHP_5_4/sapi/fpm/fpm/fpm_conf.c2011-07-05
18:09:07 UTC (rev 312943)
@@ -1151,7 +1151,7 @@
zlog(ZLOG_NOTICE, \tpid = %s,
STR2STR(fpm_global_config.pid_file));
zlog(ZLOG_NOTICE, \tdaemonize = %s,
BOOL2STR(fpm_global_config.daemonize));
zlog(ZLOG_NOTICE, \terror_log = %s,
STR2STR(fpm_global_config.error_log));
- zlog(ZLOG_NOTICE, \tlog_level = %s,
zlog_get_level_name());
+ zlog(ZLOG_NOTICE, \tlog_level = %s,
zlog_get_level_name(fpm_globals.log_level));
zlog(ZLOG_NOTICE, \tprocess_control_timeout = %ds,
fpm_global_config.process_control_timeout);
zlog(ZLOG_NOTICE, \temergency_restart_interval = %ds,
fpm_global_config.emergency_restart_interval);
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/NEWS branches/PHP_5_4/sapi/fpm/fpm/fpm_conf.c branches/PHP_5_4/sapi/fpm/fpm/fpm_conf.h branches/PHP_5_4/sapi/fpm/fpm/fpm_stdio.c branches/PHP_5_4/sapi/fpm
fat Tue, 05 Jul 2011 19:22:45 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=312950
Log:
- FR #52052: Added partial syslog support (on error_log only)
Bug: https://bugs.php.net/52052 (Assigned) add syslog support to FPM
Changed paths:
U php/php-src/branches/PHP_5_4/NEWS
U php/php-src/branches/PHP_5_4/sapi/fpm/fpm/fpm_conf.c
U php/php-src/branches/PHP_5_4/sapi/fpm/fpm/fpm_conf.h
U php/php-src/branches/PHP_5_4/sapi/fpm/fpm/fpm_stdio.c
U php/php-src/branches/PHP_5_4/sapi/fpm/fpm/zlog.c
U php/php-src/branches/PHP_5_4/sapi/fpm/fpm/zlog.h
U php/php-src/branches/PHP_5_4/sapi/fpm/php-fpm.conf.in
U php/php-src/trunk/sapi/fpm/fpm/fpm_conf.c
U php/php-src/trunk/sapi/fpm/fpm/fpm_conf.h
U php/php-src/trunk/sapi/fpm/fpm/fpm_stdio.c
U php/php-src/trunk/sapi/fpm/fpm/zlog.c
U php/php-src/trunk/sapi/fpm/fpm/zlog.h
U php/php-src/trunk/sapi/fpm/php-fpm.conf.in
Modified: php/php-src/branches/PHP_5_4/NEWS
===
--- php/php-src/branches/PHP_5_4/NEWS 2011-07-05 19:13:19 UTC (rev 312949)
+++ php/php-src/branches/PHP_5_4/NEWS 2011-07-05 19:22:45 UTC (rev 312950)
@@ -132,6 +132,9 @@
getallheaders(), apache_request_headers() and apache_response_headers()
. Improved performance of FastCGI request parsing.
+- Improved PHP-FPM SAPI:
+ . Added partial syslog support (on error_log only). FR #52052. (fat)
+
- Improved core functions:
. number_format() no longer truncates multibyte decimal points and thousand
separators to the first byte. FR #53457. (Adam)
Modified: php/php-src/branches/PHP_5_4/sapi/fpm/fpm/fpm_conf.c
===
--- php/php-src/branches/PHP_5_4/sapi/fpm/fpm/fpm_conf.c 2011-07-05 19:13:19 UTC (rev 312949)
+++ php/php-src/branches/PHP_5_4/sapi/fpm/fpm/fpm_conf.c 2011-07-05 19:22:45 UTC (rev 312950)
@@ -31,6 +31,7 @@
#include zend_ini_scanner.h
#include zend_globals.h
#include zend_stream.h
+#include php_syslog.h
#include fpm.h
#include fpm_conf.h
@@ -58,8 +59,16 @@
static char *fpm_conf_set_log_level(zval *value, void **config, intptr_t offset);
static char *fpm_conf_set_rlimit_core(zval *value, void **config, intptr_t offset);
static char *fpm_conf_set_pm(zval *value, void **config, intptr_t offset);
+#ifdef HAVE_SYSLOG_H
+static char *fpm_conf_set_syslog_facility(zval *value, void **config, intptr_t offset);
+#endif
-struct fpm_global_config_s fpm_global_config = { .daemonize = 1 };
+struct fpm_global_config_s fpm_global_config = {
+ .daemonize = 1,
+#ifdef HAVE_SYSLOG_H
+ .syslog_facility = -1
+#endif
+};
static struct fpm_worker_pool_s *current_wp = NULL;
static int ini_recursion = 0;
static char *ini_filename = NULL;
@@ -67,15 +76,19 @@
static char *ini_include = NULL;
static struct ini_value_parser_s ini_fpm_global_options[] = {
- { emergency_restart_threshold, fpm_conf_set_integer, GO(emergency_restart_threshold) },
- { emergency_restart_interval, fpm_conf_set_time,GO(emergency_restart_interval) },
- { process_control_timeout, fpm_conf_set_time,GO(process_control_timeout) },
- { daemonize, fpm_conf_set_boolean, GO(daemonize) },
- { pid, fpm_conf_set_string, GO(pid_file) },
- { error_log, fpm_conf_set_string, GO(error_log) },
- { log_level, fpm_conf_set_log_level, 0 },
- { rlimit_files,fpm_conf_set_integer, GO(rlimit_files) },
- { rlimit_core, fpm_conf_set_rlimit_core, GO(rlimit_core) },
+ { emergency_restart_threshold, fpm_conf_set_integer, GO(emergency_restart_threshold) },
+ { emergency_restart_interval, fpm_conf_set_time,GO(emergency_restart_interval) },
+ { process_control_timeout, fpm_conf_set_time,GO(process_control_timeout) },
+ { daemonize, fpm_conf_set_boolean, GO(daemonize) },
+ { pid, fpm_conf_set_string, GO(pid_file) },
+ { error_log, fpm_conf_set_string, GO(error_log) },
+ { log_level, fpm_conf_set_log_level, GO(log_level) },
+#ifdef HAVE_SYSLOG_H
+ { syslog.ident,fpm_conf_set_string, GO(syslog_ident) },
+ { syslog.facility, fpm_conf_set_syslog_facility, GO(syslog_facility) },
+#endif
+ { rlimit_files,fpm_conf_set_integer, GO(rlimit_files) },
+ { rlimit_core, fpm_conf_set_rlimit_core, GO(rlimit_core) },
{ 0, 0, 0 }
};
@@ -252,25 +265,178 @@
static char *fpm_conf_set_log_level(zval *value, void **config, intptr_t offset) /* {{{ */
{
char *val = Z_STRVAL_P(value);
+ int log_level;
if (!strcasecmp(val, debug)) {
- fpm_globals.log_level = ZLOG_DEBUG;
+ log_level = ZLOG_DEBUG;
} else if (!strcasecmp(val, notice)) {
-
[PHP-CVS] svn: /SVNROOT/ global_avail
bjoriTue, 05 Jul 2011 19:24:18 + Revision: http://svn.php.net/viewvc?view=revisionrevision=312951 Log: Let Alexey Borzov fix his own reports Changed paths: U SVNROOT/global_avail Modified: SVNROOT/global_avail === --- SVNROOT/global_avail 2011-07-05 19:22:45 UTC (rev 312950) +++ SVNROOT/global_avail 2011-07-05 19:24:18 UTC (rev 312951) @@ -47,7 +47,7 @@ # The PHP Documentation Group maintains the documentation and its # translations. -avail|lucas,jmertic,bobby,takagi,gcc,cem,mfp,ansriniv,jsgoupil,mazzanet,frogger,coldocean,fleaslob,torben,lynch,kk,ted,paul,mbritton,bibi,mrobinso,perugini,tzwenny,drews,paulsen,hartmann,leon,jonen,tschuer,tfromm,manuel,danbeck,sli,jmcastagnetto,mohrt,samesch,soneca,ronabop,glace,latoserver,rafael,jcmeloni,chrullrich,mk,troels,mathieu,phaethon,mj,corean,pandach,cycle98,vizvil,regina,cynic,jpm,dams,karoora,pcraft,suvia,zimt,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,alindeman,thyla,cucinato,zyprexia,tpug,mitja,conni,sts,nmav,subbie,leszek,spheroid,slawek,alan_dangelo,ae,nohn,kaser01,visualmind,kurtz,luk,tronic,moh,gerzson,webler,spooky,cece,daniel,boo,nhoizey,joerg,hakan,chief977,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,matroz,ave,adu,mmeier,wentzel,scaro,aspinei,lmaxcar,manuzhai,darvina,peter,maxim,romakhin,n0nick,attila,sagi,kai,microbrain,rhheo,shimi,djworld,emil,lboshell,netholic,dmitry83,progcom,verdana,yincheng,surfmax,nicos,bbd,cyril,gregory,hudzilla,klean,mignoni,wiesemann,xqi,mersal,zruya,sean,staybyte,aber_sabeel,alzahrani,thomaslio,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,hwin,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,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,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,tessus,gavinfo,rant,ramsey,arkadius,erinet,omar,oliver,rquadling,timo,shadda,joeaccord,ezyang,ljbuesch,knut,asonge,ron,nicobn,jacques,void,mcbrown,simionea,preinheimer,stanprog,msaraujo,asbjornit,philippe,sezer,rmlr,hradtke,alan,danielc,danbrown,alexxed,psalehpoor,loudi,abedford,morgue,nilgun,saltybeagle,dedemorton,eniac2008,jawed,ch,mgdm,ericstewart,mager,keito,juxecl,chx,vito,beverloo,joris,mumumu,brandon,santiago,ajcollison,rbowen,ruslany,satoruyoshida,seld,degeberg,yago,seros,dtajchreber,jwage,ambrish,shein,frozenfire,x1v4nx,carlos,nikola,baijh,nullw0rm,danielb,thijs,orientalcoder,sh_mashaqi,dominis,irfan,dre,marionunes,ditto,mirry,superb,moacir,itanea,vitali,duodraco,craigkitterman,mfonda,nbpoole,ircmaxell,nikic,kassner,lyma,gmsecrieru,cyberline|phpdoc,phd,web/doc,web/doc-editor
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/standard/crypt_sha256.c branches/PHP_5_3/ext/standard/crypt_sha512.c branches/PHP_5_4/ext/standard/crypt_sha256.c branches/PHP_5_4/ext/standard/crypt_
iliaaTue, 05 Jul 2011 20:10:45 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=312952
Log:
Fixed bug relating to un-initialized memory access
Changed paths:
U php/php-src/branches/PHP_5_3/ext/standard/crypt_sha256.c
U php/php-src/branches/PHP_5_3/ext/standard/crypt_sha512.c
U php/php-src/branches/PHP_5_4/ext/standard/crypt_sha256.c
U php/php-src/branches/PHP_5_4/ext/standard/crypt_sha512.c
U php/php-src/trunk/ext/standard/crypt_sha256.c
U php/php-src/trunk/ext/standard/crypt_sha512.c
Modified: php/php-src/branches/PHP_5_3/ext/standard/crypt_sha256.c
===
--- php/php-src/branches/PHP_5_3/ext/standard/crypt_sha256.c2011-07-05
19:24:18 UTC (rev 312951)
+++ php/php-src/branches/PHP_5_3/ext/standard/crypt_sha256.c2011-07-05
20:10:45 UTC (rev 312952)
@@ -395,9 +395,10 @@
}
if ((salt - (char *) 0) % __alignof__(uint32_t) != 0) {
- char *tmp = (char *) alloca(salt_len + __alignof__(uint32_t));
+ char *tmp = (char *) alloca(salt_len + 1 +
__alignof__(uint32_t));
salt = copied_salt =
memcpy(tmp + __alignof__(uint32_t) - (tmp - (char *) 0) %
__alignof__ (uint32_t), salt, salt_len);
+ tmp[salt_len] = 0;
}
/* Prepare for the real work. */
Modified: php/php-src/branches/PHP_5_3/ext/standard/crypt_sha512.c
===
--- php/php-src/branches/PHP_5_3/ext/standard/crypt_sha512.c2011-07-05
19:24:18 UTC (rev 312951)
+++ php/php-src/branches/PHP_5_3/ext/standard/crypt_sha512.c2011-07-05
20:10:45 UTC (rev 312952)
@@ -430,8 +430,8 @@
}
if ((salt - (char *) 0) % __alignof__ (uint64_t) != 0) {
- char *tmp = (char *) alloca(salt_len + __alignof__(uint64_t));
-
+ char *tmp = (char *) alloca(salt_len + 1 +
__alignof__(uint64_t));
+ tmp[salt_len] = 0;
salt = copied_salt = memcpy(tmp + __alignof__(uint64_t) - (tmp
- (char *) 0) % __alignof__(uint64_t), salt, salt_len);
}
Modified: php/php-src/branches/PHP_5_4/ext/standard/crypt_sha256.c
===
--- php/php-src/branches/PHP_5_4/ext/standard/crypt_sha256.c2011-07-05
19:24:18 UTC (rev 312951)
+++ php/php-src/branches/PHP_5_4/ext/standard/crypt_sha256.c2011-07-05
20:10:45 UTC (rev 312952)
@@ -395,9 +395,10 @@
}
if ((salt - (char *) 0) % __alignof__(uint32_t) != 0) {
- char *tmp = (char *) alloca(salt_len + __alignof__(uint32_t));
+ char *tmp = (char *) alloca(salt_len + 1 +
__alignof__(uint32_t));
salt = copied_salt =
memcpy(tmp + __alignof__(uint32_t) - (tmp - (char *) 0) %
__alignof__ (uint32_t), salt, salt_len);
+ tmp[salt_len] = 0;
}
/* Prepare for the real work. */
Modified: php/php-src/branches/PHP_5_4/ext/standard/crypt_sha512.c
===
--- php/php-src/branches/PHP_5_4/ext/standard/crypt_sha512.c2011-07-05
19:24:18 UTC (rev 312951)
+++ php/php-src/branches/PHP_5_4/ext/standard/crypt_sha512.c2011-07-05
20:10:45 UTC (rev 312952)
@@ -430,8 +430,8 @@
}
if ((salt - (char *) 0) % __alignof__ (uint64_t) != 0) {
- char *tmp = (char *) alloca(salt_len + __alignof__(uint64_t));
-
+ char *tmp = (char *) alloca(salt_len + 1 +
__alignof__(uint64_t));
+ tmp[salt_len] = 0;
salt = copied_salt = memcpy(tmp + __alignof__(uint64_t) - (tmp
- (char *) 0) % __alignof__(uint64_t), salt, salt_len);
}
Modified: php/php-src/trunk/ext/standard/crypt_sha256.c
===
--- php/php-src/trunk/ext/standard/crypt_sha256.c 2011-07-05 19:24:18 UTC
(rev 312951)
+++ php/php-src/trunk/ext/standard/crypt_sha256.c 2011-07-05 20:10:45 UTC
(rev 312952)
@@ -395,9 +395,10 @@
}
if ((salt - (char *) 0) % __alignof__(uint32_t) != 0) {
- char *tmp = (char *) alloca(salt_len + __alignof__(uint32_t));
+ char *tmp = (char *) alloca(salt_len + 1 +
__alignof__(uint32_t));
salt = copied_salt =
memcpy(tmp + __alignof__(uint32_t) - (tmp - (char *) 0) %
__alignof__ (uint32_t), salt, salt_len);
+ tmp[salt_len] = 0;
}
/* Prepare for the real work. */
Modified: php/php-src/trunk/ext/standard/crypt_sha512.c
===
--- php/php-src/trunk/ext/standard/crypt_sha512.c 2011-07-05 19:24:18 UTC
(rev 312951)
+++ php/php-src/trunk/ext/standard/crypt_sha512.c 2011-07-05 20:10:45 UTC
(rev 312952)
@@ -430,8 +430,8 @@
}
if
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqlnd/mysqlnd.c branches/PHP_5_4/ext/mysqlnd/mysqlnd.c trunk/ext/mysqlnd/mysqlnd.c
andrey Tue, 05 Jul 2011 20:31:53 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=312953
Log:
free data in case of failure in the callee not in the caller
Changed paths:
U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c
U php/php-src/branches/PHP_5_4/ext/mysqlnd/mysqlnd.c
U php/php-src/trunk/ext/mysqlnd/mysqlnd.c
Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c 2011-07-05 20:10:45 UTC
(rev 312952)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c 2011-07-05 20:31:53 UTC
(rev 312953)
@@ -156,6 +156,7 @@
mnd_pefree(conn-unix_socket, pers);
conn-unix_socket = NULL;
}
+ DBG_INF_FMT(scheme=%s, conn-scheme);
if (conn-scheme) {
DBG_INF(Freeing scheme);
mnd_pefree(conn-scheme, pers);
@@ -635,7 +636,7 @@
SET_OOM_ERROR(conn-error_info);
goto err; /* OOM */
}
- DBG_INF_FMT(transport=%s, transport);
+ DBG_INF_FMT(transport=%s conn-scheme=%s, transport,
conn-scheme);
conn-scheme = mnd_pestrndup(transport, transport_len,
conn-persistent);
conn-scheme_len = transport_len;
efree(transport); /* allocated by spprintf */
@@ -836,7 +837,7 @@
/* no mnd_ since we don't allocate it */
efree(errstr);
}
-
+ conn-m-free_contents(conn TSRMLS_CC);
MYSQLND_INC_CONN_STATISTIC(conn-stats, STAT_CONNECT_FAILURE);
DBG_RETURN(FAIL);
@@ -877,9 +878,6 @@
object - we are free to kill it!
*/
conn-m-dtor(conn TSRMLS_CC);
- } else {
- /* This will also close conn-net-stream if it has
been opened */
- conn-m-free_contents(conn TSRMLS_CC);
}
DBG_RETURN(NULL);
}
Modified: php/php-src/branches/PHP_5_4/ext/mysqlnd/mysqlnd.c
===
--- php/php-src/branches/PHP_5_4/ext/mysqlnd/mysqlnd.c 2011-07-05 20:10:45 UTC
(rev 312952)
+++ php/php-src/branches/PHP_5_4/ext/mysqlnd/mysqlnd.c 2011-07-05 20:31:53 UTC
(rev 312953)
@@ -157,6 +157,7 @@
mnd_pefree(conn-unix_socket, pers);
conn-unix_socket = NULL;
}
+ DBG_INF_FMT(scheme=%s, conn-scheme);
if (conn-scheme) {
mnd_pefree(conn-scheme, pers);
conn-scheme = NULL;
@@ -717,7 +718,7 @@
SET_OOM_ERROR(conn-error_info);
goto err; /* OOM */
}
- DBG_INF_FMT(transport=%s, transport);
+ DBG_INF_FMT(transport=%s conn-scheme=%s, transport,
conn-scheme);
conn-scheme = mnd_pestrndup(transport, transport_len,
conn-persistent);
conn-scheme_len = transport_len;
mnd_sprintf_free(transport);
@@ -936,7 +937,7 @@
/* no mnd_ since we don't allocate it */
efree(errstr);
}
-
+ conn-m-free_contents(conn TSRMLS_CC);
MYSQLND_INC_CONN_STATISTIC(conn-stats, STAT_CONNECT_FAILURE);
DBG_RETURN(FAIL);
@@ -977,9 +978,6 @@
object - we are free to kill it!
*/
conn-m-dtor(conn TSRMLS_CC);
- } else {
- /* This will also close conn-net-stream if it has
been opened */
- conn-m-free_contents(conn TSRMLS_CC);
}
DBG_RETURN(NULL);
}
Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd.c
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd.c 2011-07-05 20:10:45 UTC (rev
312952)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd.c 2011-07-05 20:31:53 UTC (rev
312953)
@@ -157,6 +157,7 @@
mnd_pefree(conn-unix_socket, pers);
conn-unix_socket = NULL;
}
+ DBG_INF_FMT(scheme=%s, conn-scheme);
if (conn-scheme) {
mnd_pefree(conn-scheme, pers);
conn-scheme = NULL;
@@ -717,7 +718,7 @@
SET_OOM_ERROR(conn-error_info);
goto err; /* OOM */
}
- DBG_INF_FMT(transport=%s, transport);
+ DBG_INF_FMT(transport=%s conn-scheme=%s, transport,
conn-scheme);
conn-scheme = mnd_pestrndup(transport, transport_len,
conn-persistent);
conn-scheme_len = transport_len;
mnd_sprintf_free(transport);
@@ -936,7 +937,7 @@
/* no mnd_ since we don't allocate it */
efree(errstr);
}
-
+
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/NEWS branches/PHP_5_4/sapi/fpm/php-fpm.conf.in trunk/sapi/fpm/php-fpm.conf.in
fat Tue, 05 Jul 2011 21:03:26 + Revision: http://svn.php.net/viewvc?view=revisionrevision=312957 Log: - Implemented FR #54098 (Lowered default value for Process Manager) Bug: https://bugs.php.net/54098 (Assigned) Overly high defaults in config Changed paths: U php/php-src/branches/PHP_5_4/NEWS U php/php-src/branches/PHP_5_4/sapi/fpm/php-fpm.conf.in U php/php-src/trunk/sapi/fpm/php-fpm.conf.in Modified: php/php-src/branches/PHP_5_4/NEWS === --- php/php-src/branches/PHP_5_4/NEWS 2011-07-05 20:42:29 UTC (rev 312956) +++ php/php-src/branches/PHP_5_4/NEWS 2011-07-05 21:03:26 UTC (rev 312957) @@ -134,6 +134,7 @@ - Improved PHP-FPM SAPI: . Added partial syslog support (on error_log only). FR #52052. (fat) + . Lowered default value for Process Manager. FR #54098. (fat) - Improved core functions: . number_format() no longer truncates multibyte decimal points and thousand Modified: php/php-src/branches/PHP_5_4/sapi/fpm/php-fpm.conf.in === --- php/php-src/branches/PHP_5_4/sapi/fpm/php-fpm.conf.in 2011-07-05 20:42:29 UTC (rev 312956) +++ php/php-src/branches/PHP_5_4/sapi/fpm/php-fpm.conf.in 2011-07-05 21:03:26 UTC (rev 312957) @@ -170,25 +170,26 @@ ; This value sets the limit on the number of simultaneous requests that will be ; served. Equivalent to the ApacheMaxClients directive with mpm_prefork. ; Equivalent to the PHP_FCGI_CHILDREN environment variable in the original PHP -; CGI. +; CGI. The below defaults are based on a server without much resources. Don't +; forget to tweak pm.* to fit your needs. ; Note: Used when pm is set to either 'static' or 'dynamic' ; Note: This value is mandatory. -pm.max_children = 50 +pm.max_children = 5 ; The number of child processes created on startup. ; Note: Used only when pm is set to 'dynamic' ; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2 -;pm.start_servers = 20 +pm.start_servers = 2 ; The desired minimum number of idle server processes. ; Note: Used only when pm is set to 'dynamic' ; Note: Mandatory when pm is set to 'dynamic' -;pm.min_spare_servers = 5 +pm.min_spare_servers = 1 ; The desired maximum number of idle server processes. ; Note: Used only when pm is set to 'dynamic' ; Note: Mandatory when pm is set to 'dynamic' -;pm.max_spare_servers = 35 +pm.max_spare_servers = 3 ; The number of requests each child process should execute before respawning. ; This can be useful to work around memory leaks in 3rd party libraries. For Modified: php/php-src/trunk/sapi/fpm/php-fpm.conf.in === --- php/php-src/trunk/sapi/fpm/php-fpm.conf.in 2011-07-05 20:42:29 UTC (rev 312956) +++ php/php-src/trunk/sapi/fpm/php-fpm.conf.in 2011-07-05 21:03:26 UTC (rev 312957) @@ -170,25 +170,26 @@ ; This value sets the limit on the number of simultaneous requests that will be ; served. Equivalent to the ApacheMaxClients directive with mpm_prefork. ; Equivalent to the PHP_FCGI_CHILDREN environment variable in the original PHP -; CGI. +; CGI. The below defaults are based on a server without much resources. Don't +; forget to tweak pm.* to fit your needs. ; Note: Used when pm is set to either 'static' or 'dynamic' ; Note: This value is mandatory. -pm.max_children = 50 +pm.max_children = 5 ; The number of child processes created on startup. ; Note: Used only when pm is set to 'dynamic' ; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2 -;pm.start_servers = 20 +pm.start_servers = 2 ; The desired minimum number of idle server processes. ; Note: Used only when pm is set to 'dynamic' ; Note: Mandatory when pm is set to 'dynamic' -;pm.min_spare_servers = 5 +pm.min_spare_servers = 1 ; The desired maximum number of idle server processes. ; Note: Used only when pm is set to 'dynamic' ; Note: Mandatory when pm is set to 'dynamic' -;pm.max_spare_servers = 35 +pm.max_spare_servers = 3 ; The number of requests each child process should execute before respawning. ; This can be useful to work around memory leaks in 3rd party libraries. For -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/Zend/tests/bug55137.phpt branches/PHP_5_4/Zend/zend_compile.c trunk/Zend/tests/traits/bug55137.phpt trunk/Zend/zend_compile.c
felipe Wed, 06 Jul 2011 00:33:38 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=312972
Log:
- Fixed bug #55137 (Changing trait static method visibility)
Bug: https://bugs.php.net/55137 (Assigned) Changing trait static method
visibility
Changed paths:
A php/php-src/branches/PHP_5_4/Zend/tests/bug55137.phpt
U php/php-src/branches/PHP_5_4/Zend/zend_compile.c
A php/php-src/trunk/Zend/tests/traits/bug55137.phpt
U php/php-src/trunk/Zend/zend_compile.c
Added: php/php-src/branches/PHP_5_4/Zend/tests/bug55137.phpt
===
--- php/php-src/branches/PHP_5_4/Zend/tests/bug55137.phpt
(rev 0)
+++ php/php-src/branches/PHP_5_4/Zend/tests/bug55137.phpt 2011-07-06
00:33:38 UTC (rev 312972)
@@ -0,0 +1,26 @@
+--TEST--
+Bug #55137 (Changing trait static method visibility)
+--FILE--
+?php
+
+trait A {
+ protected static function foo() { echo abc\n; }
+ private static function bar() { echo def\n; }
+}
+
+
+class B {
+ use A {
+ A::foo as public;
+ A::bar as public baz;
+ }
+}
+
+B::foo();
+B::baz();
+
+
+?
+--EXPECT--
+abc
+def
Modified: php/php-src/branches/PHP_5_4/Zend/zend_compile.c
===
--- php/php-src/branches/PHP_5_4/Zend/zend_compile.c2011-07-06 00:16:24 UTC
(rev 312971)
+++ php/php-src/branches/PHP_5_4/Zend/zend_compile.c2011-07-06 00:33:38 UTC
(rev 312972)
@@ -3661,6 +3661,7 @@
if (!(aliases[i]-modifiers
ZEND_ACC_PPP_MASK)) {
fn_copy.common.fn_flags
|= ZEND_ACC_PUBLIC;
}
+ fn_copy.common.fn_flags |=
fn-common.fn_flags ^ (fn-common.fn_flags ZEND_ACC_PPP_MASK);
}
lcname_len = aliases[i]-alias_len;
@@ -3700,6 +3701,7 @@
if (!(aliases[i]-modifiers
ZEND_ACC_PPP_MASK)) {
fn_copy.common.fn_flags
|= ZEND_ACC_PUBLIC;
}
+ fn_copy.common.fn_flags |=
fn-common.fn_flags ^ (fn-common.fn_flags ZEND_ACC_PPP_MASK);
}
}
i++;
Added: php/php-src/trunk/Zend/tests/traits/bug55137.phpt
===
--- php/php-src/trunk/Zend/tests/traits/bug55137.phpt
(rev 0)
+++ php/php-src/trunk/Zend/tests/traits/bug55137.phpt 2011-07-06 00:33:38 UTC
(rev 312972)
@@ -0,0 +1,26 @@
+--TEST--
+Bug #55137 (Changing trait static method visibility)
+--FILE--
+?php
+
+trait A {
+ protected static function foo() { echo abc\n; }
+ private static function bar() { echo def\n; }
+}
+
+
+class B {
+ use A {
+ A::foo as public;
+ A::bar as public baz;
+ }
+}
+
+B::foo();
+B::baz();
+
+
+?
+--EXPECT--
+abc
+def
Modified: php/php-src/trunk/Zend/zend_compile.c
===
--- php/php-src/trunk/Zend/zend_compile.c 2011-07-06 00:16:24 UTC (rev
312971)
+++ php/php-src/trunk/Zend/zend_compile.c 2011-07-06 00:33:38 UTC (rev
312972)
@@ -3661,6 +3661,7 @@
if (!(aliases[i]-modifiers
ZEND_ACC_PPP_MASK)) {
fn_copy.common.fn_flags
|= ZEND_ACC_PUBLIC;
}
+ fn_copy.common.fn_flags |=
fn-common.fn_flags ^ (fn-common.fn_flags ZEND_ACC_PPP_MASK);
}
lcname_len = aliases[i]-alias_len;
@@ -3700,6 +3701,7 @@
if (!(aliases[i]-modifiers
ZEND_ACC_PPP_MASK)) {
fn_copy.common.fn_flags
|= ZEND_ACC_PUBLIC;
}
+ fn_copy.common.fn_flags |=
fn-common.fn_flags ^ (fn-common.fn_flags ZEND_ACC_PPP_MASK);
}
}
i++;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /SVNROOT/ global_avail
philip Wed, 06 Jul 2011 00:53:43 + Revision: http://svn.php.net/viewvc?view=revisionrevision=312973 Log: phpdoc karma for Chunsong Tang (chunsong) Changed paths: U SVNROOT/global_avail Modified: SVNROOT/global_avail === --- SVNROOT/global_avail 2011-07-06 00:33:38 UTC (rev 312972) +++ SVNROOT/global_avail 2011-07-06 00:53:43 UTC (rev 312973) @@ -47,7 +47,7 @@ # The PHP Documentation Group maintains the documentation and its # translations. -avail|lucas,jmertic,bobby,takagi,gcc,cem,mfp,ansriniv,jsgoupil,mazzanet,frogger,coldocean,fleaslob,torben,lynch,kk,ted,paul,mbritton,bibi,mrobinso,perugini,tzwenny,drews,paulsen,hartmann,leon,jonen,tschuer,tfromm,manuel,danbeck,sli,jmcastagnetto,mohrt,samesch,soneca,ronabop,glace,latoserver,rafael,jcmeloni,chrullrich,mk,troels,mathieu,phaethon,mj,corean,pandach,cycle98,vizvil,regina,cynic,jpm,dams,karoora,pcraft,suvia,zimt,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,alindeman,thyla,cucinato,zyprexia,tpug,mitja,conni,sts,nmav,subbie,leszek,spheroid,slawek,alan_dangelo,ae,nohn,kaser01,visualmind,kurtz,luk,tronic,moh,gerzson,webler,spooky,cece,daniel,boo,nhoizey,joerg,hakan,chief977,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,matroz,ave,adu,mmeier,wentzel,scaro,aspinei,lmaxcar,manuzhai,darvina,peter,maxim,romakhin,n0nick,attila,sagi,kai,microbrain,rhheo,shimi,djworld,emil,lboshell,netholic,dmitry83,progcom,verdana,yincheng,surfmax,nicos,bbd,cyril,gregory,hudzilla,klean,mignoni,wiesemann,xqi,mersal,zruya,sean,staybyte,aber_sabeel,alzahrani,thomaslio,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,hwin,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,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,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,tessus,gavinfo,rant,ramsey,arkadius,erinet,omar,oliver,rquadling,timo,shadda,joeaccord,ezyang,ljbuesch,knut,asonge,ron,nicobn,jacques,void,mcbrown,simionea,preinheimer,stanprog,msaraujo,asbjornit,philippe,sezer,rmlr,hradtke,alan,danielc,danbrown,alexxed,psalehpoor,loudi,abedford,morgue,nilgun,saltybeagle,dedemorton,eniac2008,jawed,ch,mgdm,ericstewart,mager,keito,juxecl,chx,vito,beverloo,joris,mumumu,brandon,santiago,ajcollison,rbowen,ruslany,satoruyoshida,seld,degeberg,yago,seros,dtajchreber,jwage,ambrish,shein,frozenfire,x1v4nx,carlos,nikola,baijh,nullw0rm,danielb,thijs,orientalcoder,sh_mashaqi,dominis,irfan,dre,marionunes,ditto,mirry,superb,moacir,itanea,vitali,duodraco,craigkitterman,mfonda,nbpoole,ircmaxell,nikic,kassner,lyma,gmsecrieru,cyberline,avb|phpdoc,phd,web/doc,web/doc-editor
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/sapi/cli/php_cli_server.c trunk/sapi/cli/php_cli_server.c
felipe Wed, 06 Jul 2011 01:54:54 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=312974
Log:
- Fixed bug #55076 (requires() fails in a subdirectory with the in-built
webserver)
Bug: https://bugs.php.net/55076 (Re-Opened) requires() fails in a subdirectory
with the in-built webserver
Changed paths:
U php/php-src/branches/PHP_5_4/sapi/cli/php_cli_server.c
U php/php-src/trunk/sapi/cli/php_cli_server.c
Modified: php/php-src/branches/PHP_5_4/sapi/cli/php_cli_server.c
===
--- php/php-src/branches/PHP_5_4/sapi/cli/php_cli_server.c 2011-07-06
00:53:43 UTC (rev 312973)
+++ php/php-src/branches/PHP_5_4/sapi/cli/php_cli_server.c 2011-07-06
01:54:54 UTC (rev 312974)
@@ -2060,6 +2060,8 @@
if (document_root) {
struct stat sb;
+ char resolved_path[MAXPATHLEN];
+
if (stat(document_root, sb)) {
fprintf(stderr, Directory %s does not exist.\n,
document_root);
return 1;
@@ -2068,6 +2070,9 @@
fprintf(stderr, %s is not a directory.\n,
document_root);
return 1;
}
+ if (VCWD_REALPATH(document_root, resolved_path)) {
+ document_root = resolved_path;
+ }
} else {
char path[MAXPATHLEN];
char *ret = NULL;
Modified: php/php-src/trunk/sapi/cli/php_cli_server.c
===
--- php/php-src/trunk/sapi/cli/php_cli_server.c 2011-07-06 00:53:43 UTC (rev
312973)
+++ php/php-src/trunk/sapi/cli/php_cli_server.c 2011-07-06 01:54:54 UTC (rev
312974)
@@ -2060,6 +2060,8 @@
if (document_root) {
struct stat sb;
+ char resolved_path[MAXPATHLEN];
+
if (stat(document_root, sb)) {
fprintf(stderr, Directory %s does not exist.\n,
document_root);
return 1;
@@ -2068,6 +2070,9 @@
fprintf(stderr, %s is not a directory.\n,
document_root);
return 1;
}
+ if (VCWD_REALPATH(document_root, resolved_path)) {
+ document_root = resolved_path;
+ }
} else {
char path[MAXPATHLEN];
char *ret = NULL;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
