[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/Makefile.gcov branches/PHP_5_4/Makefile.gcov trunk/Makefile.gcov

2012-02-20 Thread Nuno Lopes 
nlopess  Mon, 20 Feb 2012 16:01:34 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=323386

Log:
fix race condition in find (it was finding the copied files over and over 
again, and recursing forever)

Changed paths:
U   php/php-src/branches/PHP_5_3/Makefile.gcov
U   php/php-src/branches/PHP_5_4/Makefile.gcov
U   php/php-src/trunk/Makefile.gcov

Modified: php/php-src/branches/PHP_5_3/Makefile.gcov
===
--- php/php-src/branches/PHP_5_3/Makefile.gcov  2012-02-20 15:22:27 UTC (rev 
323385)
+++ php/php-src/branches/PHP_5_3/Makefile.gcov  2012-02-20 16:01:34 UTC (rev 
323386)
@@ -12,7 +12,8 @@
@rm -rf lcov_data/
@$(mkinstalldirs) lcov_data/
@echo
-   -@find . -name \*.gcda -o -name \*.gcno -o -name \*.da -o -name \*.h | 
sed -e 's/^\.\///' | sed -e 's/\.gcda//g' -e 's/\.gcno//g' -e 's/\.da//g' | 
uniq | while read x; do \
+   -@files=`find . -name \*.gcda -o -name \*.gcno -o -name \*.da -o -name 
\*.h | sed -e 's/^\.\///' | sed -e 's/\.gcda//g' -e 's/\.gcno//g' -e 
's/\.da//g' | uniq` ;\
+   for x in $$files; do \
echo -n . ;\
y=`echo $$x | sed -e 's!\.libs/!!'`; \
dir=lcov_data/`dirname $$x`; \

Modified: php/php-src/branches/PHP_5_4/Makefile.gcov
===
--- php/php-src/branches/PHP_5_4/Makefile.gcov  2012-02-20 15:22:27 UTC (rev 
323385)
+++ php/php-src/branches/PHP_5_4/Makefile.gcov  2012-02-20 16:01:34 UTC (rev 
323386)
@@ -12,7 +12,8 @@
@rm -rf lcov_data/
@$(mkinstalldirs) lcov_data/
@echo
-   -@find . -name \*.gcda -o -name \*.gcno -o -name \*.da -o -name \*.h | 
sed -e 's/^\.\///' | sed -e 's/\.gcda//g' -e 's/\.gcno//g' -e 's/\.da//g' | 
uniq | while read x; do \
+   -@files=`find . -name \*.gcda -o -name \*.gcno -o -name \*.da -o -name 
\*.h | sed -e 's/^\.\///' | sed -e 's/\.gcda//g' -e 's/\.gcno//g' -e 
's/\.da//g' | uniq` ;\
+   for x in $$files; do \
echo -n . ;\
y=`echo $$x | sed -e 's!\.libs/!!'`; \
dir=lcov_data/`dirname $$x`; \

Modified: php/php-src/trunk/Makefile.gcov
===
--- php/php-src/trunk/Makefile.gcov 2012-02-20 15:22:27 UTC (rev 323385)
+++ php/php-src/trunk/Makefile.gcov 2012-02-20 16:01:34 UTC (rev 323386)
@@ -14,7 +14,8 @@
@rm -rf lcov_data/
@$(mkinstalldirs) lcov_data/
@echo
-   -@find . -name \*.gcda -o -name \*.gcno -o -name \*.da -o -name \*.h | 
sed -e 's/^\.\///' | sed -e 's/\.gcda//g' -e 's/\.gcno//g' -e 's/\.da//g' | 
$(EGREP) $(LCOV_INCLUDE) | uniq | while read x; do \
+   -@files=`find . -name \*.gcda -o -name \*.gcno -o -name \*.da -o -name 
\*.h | sed -e 's/^\.\///' | sed -e 's/\.gcda//g' -e 's/\.gcno//g' -e 
's/\.da//g' | $(EGREP) $(LCOV_INCLUDE) | uniq` ;\
+   for x in $$files; do \
echo -n . ;\
y=`echo $$x | sed -e 's!\.libs/!!'`; \
dir=lcov_data/`dirname $$x`; \

-- 
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/sapi/fpm/ php-fpm.conf.in

2012-02-20 Thread Rasmus Lerdorf 
rasmus   Mon, 20 Feb 2012 20:29:26 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=323395

Log:
Fix bug 61149

Bug: https://bugs.php.net/61149 (Open) access.format directive should be in 
quotation marks
  
Changed paths:
U   php/php-src/branches/PHP_5_3/sapi/fpm/php-fpm.conf.in

Modified: php/php-src/branches/PHP_5_3/sapi/fpm/php-fpm.conf.in
===
--- php/php-src/branches/PHP_5_3/sapi/fpm/php-fpm.conf.in   2012-02-20 
18:28:57 UTC (rev 323394)
+++ php/php-src/branches/PHP_5_3/sapi/fpm/php-fpm.conf.in   2012-02-20 
20:29:26 UTC (rev 323395)
@@ -399,7 +399,7 @@
 ;  %u: remote user
 ;
 ; Default: %R - %u %t \%m %r\ %s
-;access.format = %R - %u %t %m %r%Q%q %s %f %{mili}d %{kilo}M %C%%
+;access.format = %R - %u %t %m %r%Q%q %s %f %{mili}d %{kilo}M %C%%

 ; The log file for slow requests
 ; Default Value: not set

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_3/sapi/fpm/ php-fpm.conf.in

2012-02-20 Thread Hannes Magnusson 
On Mon, Feb 20, 2012 at 21:29, Rasmus Lerdorf ras...@php.net wrote:
 rasmus                                   Mon, 20 Feb 2012 20:29:26 +

 Revision: http://svn.php.net/viewvc?view=revisionrevision=323395

 Log:
 Fix bug 61149

 Bug: https://bugs.php.net/61149 (Open) access.format directive should be in 
 quotation marks

 Changed paths:
    U   php/php-src/branches/PHP_5_3/sapi/fpm/php-fpm.conf.in

 Modified: php/php-src/branches/PHP_5_3/sapi/fpm/php-fpm.conf.in
 ===
 --- php/php-src/branches/PHP_5_3/sapi/fpm/php-fpm.conf.in       2012-02-20 
 18:28:57 UTC (rev 323394)
 +++ php/php-src/branches/PHP_5_3/sapi/fpm/php-fpm.conf.in       2012-02-20 
 20:29:26 UTC (rev 323395)
 @@ -399,7 +399,7 @@
  ;  %u: remote user
  ;
  ; Default: %R - %u %t \%m %r\ %s
 -;access.format = %R - %u %t %m %r%Q%q %s %f %{mili}d %{kilo}M %C%%
 +;access.format = %R - %u %t %m %r%Q%q %s %f %{mili}d %{kilo}M %C%%

That doesn't look right. Don't the inner  need to be escaped?

-Hannes

--
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/sapi/fpm/ php-fpm.conf.in

2012-02-20 Thread Rasmus Lerdorf 
rasmus   Tue, 21 Feb 2012 00:01:19 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=323396

Log:
Yup, these need to be escaped. Good catch.

Changed paths:
U   php/php-src/branches/PHP_5_3/sapi/fpm/php-fpm.conf.in

Modified: php/php-src/branches/PHP_5_3/sapi/fpm/php-fpm.conf.in
===
--- php/php-src/branches/PHP_5_3/sapi/fpm/php-fpm.conf.in   2012-02-20 
20:29:26 UTC (rev 323395)
+++ php/php-src/branches/PHP_5_3/sapi/fpm/php-fpm.conf.in   2012-02-21 
00:01:19 UTC (rev 323396)
@@ -399,7 +399,7 @@
 ;  %u: remote user
 ;
 ; Default: %R - %u %t \%m %r\ %s
-;access.format = %R - %u %t %m %r%Q%q %s %f %{mili}d %{kilo}M %C%%
+;access.format = %R - %u %t \%m %r%Q%q\ %s %f %{mili}d %{kilo}M %C%%

 ; The log file for slow requests
 ; Default Value: not set

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php