Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/Zend/zend_ini_scanner.c branches/PHP_5_3/Zend/zend_ini_scanner_defs.h trunk/Zend/zend_ini_scanner.c trunk/Zend/zend_ini_scanner_defs.h

2009-12-01 Thread Jani Taskinen

On 12/01/2009 01:22 AM, Gwynne Raskind wrote:

On Nov 30, 2009, at 5:45 PM, Jani Taskinen wrote:

1. Does not deal with utf8 stuff very well..?
2. Paths..?
3. Diff..?

I'd say revert whatever you did..


Having taken another look at the UTF-8 issue, I'd say this was a problem with 
your SVN, not anything here. The log message got entered into SVN with the 
escapes that way; by the time it reached the server it was already wrong. Check 
your ~/.subversion/config for the log-encoding setting; if it's set correctly 
let me know and I'll dig further. I'll commit a robust fix for the lengths 
issue shortly.


It should default to UTF-8? It's not set in my .subversion/config 
(commented out) so it should use the native locale? And for me it's 
always utf-8 on all of my machines.


--Jani


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



[PHP-CVS] svn: /SVNROOT/ hook-common.inc.php

2009-12-01 Thread Gwynne Raskind
gwynne   Tue, 01 Dec 2009 11:57:17 +

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

Log:
fix UTF-8 encoding issues

Changed paths:
U   SVNROOT/hook-common.inc.php

Modified: SVNROOT/hook-common.inc.php
===
--- SVNROOT/hook-common.inc.php 2009-12-01 11:57:15 UTC (rev 291549)
+++ SVNROOT/hook-common.inc.php 2009-12-01 11:57:17 UTC (rev 291550)
@@ -5,6 +5,7 @@
 error_reporting(E_ALL | E_STRICT);
 date_default_timezone_set('UTC');
 putenv(PATH=/usr/local/bin:/usr/bin:/bin);
+putenv(LC_ALL=en_US.UTF-8);

 function fail($error)
 {

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

[PHP-CVS] svn: /SVNROOT/ httpd.conf

2009-12-01 Thread Gwynne Raskind
gwynne   Tue, 01 Dec 2009 11:58:37 +

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

Log:
Add compression, compression logging, and a robots.txt

Changed paths:
U   SVNROOT/httpd.conf

Modified: SVNROOT/httpd.conf
===
--- SVNROOT/httpd.conf  2009-12-01 11:57:51 UTC (rev 291551)
+++ SVNROOT/httpd.conf  2009-12-01 11:58:37 UTC (rev 291552)
@@ -1,8 +1,11 @@
 VirtualHost *:80
 ServerName svn.php.net
 CustomLog |/local/bin/rotatelogs /home/svn/logs/svn-svn_log.%Y%m%d 86400 
%h %t %u %{SVN-ACTION}e env=SVN-ACTION
-CustomLog |/local/bin/rotatelogs /home/svn/logs/svn-access_log.%Y%m%d 
86400 combined
+CustomLog |/local/bin/rotatelogs /home/svn/logs/svn-access_log.%Y%m%d 
86400 %h %u %t \%r\ %s %b (%{cratio}n%%) \%{Referer}i\ 
\%{User-Agent}i\
 ErrorLog |/local/bin/rotatelogs /home/svn/logs/svn-error_log.%Y%m%d 86400
+DeflateCompressionLevel 6
+DeflateFilterNote Ratio cratio
+LogLevel info

 ScriptAlias /viewvc /home/svn/viewvc-svn/bin/cgi/viewvc.cgi
 ScriptAlias /query /home/svn/viewvc-svn/bin/cgi/query.cgi
@@ -31,9 +34,11 @@
 AuthName PHP Subversion Repository
 AuthUserFile /home/svn/SVNROOT/passwd.db
 AuthDigestDomain /repository
+SetOutputFilter DEFLATE
 /Location

-RedirectMatch ^/(?!repository|viewvc|query|docroot)(.*)$ /viewvc/$1
+Alias /robots.txt /home/svn/robots.txt
+RedirectMatch ^/(?!robots|repository|viewvc|query|docroot)(.*)$ /viewvc/$1

 /VirtualHost


-- 
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/Zend/zend_ini_scanner.c branches/PHP_5_3/Zend/zend_ini_scanner_defs.h trunk/Zend/zend_ini_scanner.c trunk/Zend/zend_ini_scanner_defs.h

2009-12-01 Thread Gwynne Raskind
On Dec 1, 2009, at 3:08 AM, Jani Taskinen wrote:
 Having taken another look at the UTF-8 issue, I'd say this was a problem 
 with your SVN, not anything here. The log message got entered into SVN with 
 the escapes that way; by the time it reached the server it was already 
 wrong. Check your ~/.subversion/config for the log-encoding setting; if it's 
 set correctly let me know and I'll dig further. I'll commit a robust fix for 
 the lengths issue shortly.
 It should default to UTF-8? It's not set in my .subversion/config (commented 
 out) so it should use the native locale? And for me it's always utf-8 on all 
 of my machines.


And you were right again :). It turned out to be an issue with SVN requiring 
locale settings, which is completely ridiculous. Show me another program that 
needs the system locale to be exactly correct in order to handle UTF-8 
correctly... anyway, it's fixed now.

-- Gwynne


--
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/Zend/zend_ini_scanner.c branches/PHP_5_3/Zend/zend_ini_scanner_defs.h trunk/Zend/zend_ini_scanner.c trunk/Zend/zend_ini_scanner_defs.h

2009-12-01 Thread Jani Taskinen

On 12/01/2009 02:00 PM, Gwynne Raskind wrote:

On Dec 1, 2009, at 3:08 AM, Jani Taskinen wrote:

Having taken another look at the UTF-8 issue, I'd say this was a
problem with your SVN, not anything here. The log message got
entered into SVN with the escapes that way; by the time it
reached the server it was already wrong. Check your
~/.subversion/config for the log-encoding setting; if it's set
correctly let me know and I'll dig further. I'll commit a robust
fix for the lengths issue shortly.

It should default to UTF-8? It's not set in my .subversion/config
(commented out) so it should use the native locale? And for me it's
always utf-8 on all of my machines.


And you were right again :). It turned out to be an issue with SVN
requiring locale settings, which is completely ridiculous. Show me
another program that needs the system locale to be exactly correct in
order to handle UTF-8 correctly... anyway, it's fixed now.


Thanks. I'll test sometime soon again. :D

--Jani


--
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_2/ NEWS

2009-12-01 Thread Ilia Alshanetsky
iliaaTue, 01 Dec 2009 13:23:28 +

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

Log:
fixed typo

Changed paths:
U   php/php-src/branches/PHP_5_2/NEWS

Modified: php/php-src/branches/PHP_5_2/NEWS
===
--- php/php-src/branches/PHP_5_2/NEWS   2009-12-01 13:20:22 UTC (rev 291557)
+++ php/php-src/branches/PHP_5_2/NEWS   2009-12-01 13:23:28 UTC (rev 291558)
@@ -8,7 +8,7 @@

 - Fixed bug #50266 (conflicting types for llabs). (Jani)
 - Fixed bug #50168 (FastCGI fails with wrong error on HEAD request to
-  non-existant file). (Dmitry)
+  non-existent file). (Dmitry)
 - Fixed bug #49660 (libxml 2.7.3+ limits text nodes to 10MB). (Felipe)

 27 Nov 2009, PHP 5.2.12RC3

-- 
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/ext/mysqli/mysqli_api.c trunk/ext/mysqli/mysqli_api.c

2009-12-01 Thread Rasmus Lerdorf
rasmus   Tue, 01 Dec 2009 21:39:19 +

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

Log:
Fix broken build.
This constant is not in older versions of MySQL.

Changed paths:
U   php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_api.c
U   php/php-src/trunk/ext/mysqli/mysqli_api.c

Modified: php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_api.c
===
--- php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_api.c2009-12-01 
21:23:29 UTC (rev 291571)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_api.c2009-12-01 
21:39:19 UTC (rev 291572)
@@ -1604,7 +1604,9 @@
 #endif
 #endif /* MYSQLI_USE_MYSQLND */
case MYSQL_OPT_CONNECT_TIMEOUT:
+#ifdef MYSQL_REPORT_DATA_TRUNCATION
 case MYSQL_REPORT_DATA_TRUNCATION:
+#endif
 case MYSQL_OPT_LOCAL_INFILE:
 case MYSQL_OPT_NAMED_PIPE:
 #ifdef MYSQL_OPT_PROTOCOL

Modified: php/php-src/trunk/ext/mysqli/mysqli_api.c
===
--- php/php-src/trunk/ext/mysqli/mysqli_api.c   2009-12-01 21:23:29 UTC (rev 
291571)
+++ php/php-src/trunk/ext/mysqli/mysqli_api.c   2009-12-01 21:39:19 UTC (rev 
291572)
@@ -1657,7 +1657,9 @@
 #endif
 #endif /* MYSQLI_USE_MYSQLND */
case MYSQL_OPT_CONNECT_TIMEOUT:
+#ifdef MYSQL_REPORT_DATA_TRUNCATION
 case MYSQL_REPORT_DATA_TRUNCATION:
+#endif
 case MYSQL_OPT_LOCAL_INFILE:
 case MYSQL_OPT_NAMED_PIPE:
 #ifdef MYSQL_OPT_PROTOCOL

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

[PHP-CVS] svn: /SVNROOT/ global_avail

2009-12-01 Thread Philip Olson
philip   Wed, 02 Dec 2009 00:54:58 +

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

Log:
- web karma for our mirror master daniel brown

Changed paths:
U   SVNROOT/global_avail

Modified: SVNROOT/global_avail
===
--- SVNROOT/global_avail2009-12-01 22:50:15 UTC (rev 291575)
+++ SVNROOT/global_avail2009-12-02 00:54:58 UTC (rev 291576)
@@ -52,7 +52,7 @@
 # The PHP Web Group maintains www.php.net, news.php.net, bugs.php.net,
 # people.php.net and master.php.net.

-avail|scottmac,jmertic,lsmith,johannes,ilia,cmv,tcobb,gareth,jah,eschmid,ronabop,derick,sterling,stas,phildriscoll,jmoore,andre,jani,david,lyric,zimt,mk,goba,zak,jmcastagnetto,dams,tom,jacques,sebastian,georg,mj,imajes,cortesi,sander,markonen,edink,jan,victor,mfischer,wez,sesser,pollita,alindeman,magnus,iliaa,philip,didou,sfox,sean,dufuz,nlopess,pajoye,helly,tony2001,bjori,felipe,dsp,aharvey|web/php,web/php-bugs,web/php-master,web/php-news,web/php-hosts,web/php-wiki,web/php-people
+avail|scottmac,jmertic,lsmith,johannes,ilia,cmv,tcobb,gareth,jah,eschmid,ronabop,derick,sterling,stas,phildriscoll,jmoore,andre,jani,david,lyric,zimt,mk,goba,zak,jmcastagnetto,dams,tom,jacques,sebastian,georg,mj,imajes,cortesi,sander,markonen,edink,jan,victor,mfischer,wez,sesser,pollita,alindeman,magnus,iliaa,philip,didou,sfox,sean,dufuz,nlopess,pajoye,helly,tony2001,bjori,felipe,dsp,aharvey,danbrown|web/php,web/php-bugs,web/php-master,web/php-news,web/php-hosts,web/php-wiki,web/php-people

 # The PHP Presentation Group has access to the presentations on the
 # conf.php.net site.

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

[PHP-CVS] svn: /php/php-src/trunk/sapi/cli/ php.1.in

2009-12-01 Thread Joey Smith
joey Wed, 02 Dec 2009 02:01:18 +

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

Log:
Merge some spelling corrections found in the Debian patch base.

Changed paths:
U   php/php-src/trunk/sapi/cli/php.1.in

Modified: php/php-src/trunk/sapi/cli/php.1.in
===
--- php/php-src/trunk/sapi/cli/php.1.in 2009-12-02 00:54:58 UTC (rev 291576)
+++ php/php-src/trunk/sapi/cli/php.1.in 2009-12-02 02:01:18 UTC (rev 291577)
@@ -69,7 +69,7 @@
 You can access the input line by \fB$argn\fP. While processing the input lines
 .B $argi
 contains the number of the actual line being processed. Further more
-the paramters \-B and \-E can be used to execute
+the parameters \-B and \-E can be used to execute
 .IR code
 (see \-r) before and
 after all input lines have been processed respectively. Notice that the
@@ -318,7 +318,7 @@
 cannot be found.
 .SH EXAMPLES
 .TP 5
-\fIphp -r 'echo Hello World\\n;'\fP
+\fIphp \-r 'echo Hello World\\n;'\fP
 This command simply writes the text Hello World to standard out.
 .TP
 \fIphp \-r 'print_r(gd_info());'\fP
@@ -342,7 +342,7 @@
 Using this PHP command you can count the lines being input.
 .TP
 \fIphp \-R '@$l+=count(file($argn));' \-E 'echo Lines:$l\\n;'\fP
-In this example PHP expects each input line beeing a file. It counts all lines
+In this example PHP expects each input line being a file. It counts all lines
 of the files specified by each input line and shows the summarized result.
 You may combine this with tools like find and change the php scriptlet.
 .TP

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