laurence: I know, sorry, but merging never works gently. Each time, I'm in a situation from which I can never exit cleanly. I spend more time dealing with git than working on the patch ... you can easly understand I'm not continuing this way :(
for me, it's a pain in the ass since php sources have been migrated to git. if you have a clean and simple solution: I'm all ears :) ++ fat 2012/9/28 Laruence <larue...@php.net> > fat: > > you don't need to push to three branches individually, you > should push to the 5.3, then merge them to 5.4 > > otherwise, we will got unmerged branches: > https://github.com/php/php-src/network :) > > thanks > On Fri, Sep 28, 2012 at 7:26 AM, Jérôme Loyet <f...@php.net> wrote: > > Commit: 68eb608f3c639b2f03304e5794cd99f1074b67c0 > > Author: Jerome Loyet <f...@php.net> Fri, 28 Sep 2012 01:26:20 > +0200 > > Parents: 9ed421e3d7333bf68c0252000b98400cc6bc0cbf > > Branches: master > > > > Link: > http://git.php.net/?p=php-src.git;a=commitdiff;h=68eb608f3c639b2f03304e5794cd99f1074b67c0 > > > > Log: > > - Fixed bug #62887 (Only /status?plain&full gives "last request cpu") > > > > Bugs: > > https://bugs.php.net/62887 > > > > Changed paths: > > M sapi/fpm/fpm/fpm_status.c > > > > > > Diff: > > diff --git a/sapi/fpm/fpm/fpm_status.c b/sapi/fpm/fpm/fpm_status.c > > index b9b9a8c..2363b57 100644 > > --- a/sapi/fpm/fpm/fpm_status.c > > +++ b/sapi/fpm/fpm/fpm_status.c > > @@ -148,7 +148,7 @@ int fpm_status_handle_request(TSRMLS_D) /* {{{ */ > > "<tr><th>start > time</th><td>%s</td></tr>\n" > > "<tr><th>start > since</th><td>%lu</td></tr>\n" > > "<tr><th>accepted > conn</th><td>%lu</td></tr>\n" > > -#if HAVE_FPM_LQ > > +#ifdef HAVE_FPM_LQ > > "<tr><th>listen > queue</th><td>%u</td></tr>\n" > > "<tr><th>max listen > queue</th><td>%u</td></tr>\n" > > "<tr><th>listen queue > len</th><td>%d</td></tr>\n" > > @@ -178,7 +178,7 @@ int fpm_status_handle_request(TSRMLS_D) /* {{{ */ > > "<th>content length</th>" > > "<th>user</th>" > > "<th>script</th>" > > -#if HAVE_FPM_LQ > > +#ifdef HAVE_FPM_LQ > > "<th>last request > cpu</th>" > > #endif > > "<th>last request > memory</th>" > > @@ -197,7 +197,7 @@ int fpm_status_handle_request(TSRMLS_D) /* {{{ */ > > "<td>%zu</td>" > > "<td>%s</td>" > > "<td>%s</td>" > > -#if HAVE_FPM_LQ > > +#ifdef HAVE_FPM_LQ > > "<td>%.2f</td>" > > #endif > > "<td>%zu</td>" > > @@ -220,7 +220,7 @@ int fpm_status_handle_request(TSRMLS_D) /* {{{ */ > > "<start-time>%s</start-time>\n" > > "<start-since>%lu</start-since>\n" > > "<accepted-conn>%lu</accepted-conn>\n" > > -#if HAVE_FPM_LQ > > +#ifdef HAVE_FPM_LQ > > "<listen-queue>%u</listen-queue>\n" > > > "<max-listen-queue>%u</max-listen-queue>\n" > > > "<listen-queue-len>%d</listen-queue-len>\n" > > @@ -249,7 +249,7 @@ int fpm_status_handle_request(TSRMLS_D) /* {{{ */ > > > "<content-length>%zu</content-length>" > > "<user>%s</user>" > > > "<script>%s</script>" > > -#if HAVE_FPM_LQ > > +#ifdef HAVE_FPM_LQ > > > "<last-request-cpu>%.2f</last-request-cpu>" > > #endif > > > "<last-request-memory>%zu</last-request-memory>" > > @@ -270,7 +270,7 @@ int fpm_status_handle_request(TSRMLS_D) /* {{{ */ > > "\"start time\":%s," > > "\"start since\":%lu," > > "\"accepted conn\":%lu," > > -#if HAVE_FPM_LQ > > +#ifdef HAVE_FPM_LQ > > "\"listen queue\":%u," > > "\"max listen queue\":%u," > > "\"listen queue len\":%d," > > @@ -300,7 +300,7 @@ int fpm_status_handle_request(TSRMLS_D) /* {{{ */ > > "\"content length\":%zu," > > "\"user\":\"%s\"," > > "\"script\":\"%s\"," > > -#if HAVE_FPM_LQ > > +#ifdef HAVE_FPM_LQ > > "\"last request cpu\":%.2f," > > #endif > > "\"last request memory\":%zu" > > @@ -320,7 +320,7 @@ int fpm_status_handle_request(TSRMLS_D) /* {{{ */ > > "start time: %s\n" > > "start since: %lu\n" > > "accepted conn: %lu\n" > > -#if HAVE_FPM_LQ > > +#ifdef HAVE_FPM_LQ > > "listen queue: %u\n" > > "max listen queue: %u\n" > > "listen queue len: %d\n" > > @@ -362,7 +362,7 @@ int fpm_status_handle_request(TSRMLS_D) /* {{{ */ > > time_buffer, > > now_epoch - scoreboard.start_epoch, > > scoreboard.requests, > > -#if HAVE_FPM_LQ > > +#ifdef HAVE_FPM_LQ > > scoreboard.lq, > > scoreboard.lq_max, > > scoreboard.lq_len, > > > > > > -- > > PHP CVS Mailing List (http://www.php.net/) > > To unsubscribe, visit: http://www.php.net/unsub.php > > > > > > -- > Laruence Xinchen Hui > http://www.laruence.com/ >
