Re: [PHP-CVS] cvs: phpruntests /phpt-tests hw.phpsample_expectheaders.phpt sample_fileexternal.phpt
Johannes Schlüter wrote: > On Wed, 2009-04-22 at 17:37 -0500, Greg Beaver wrote: > >> Johannes Schlüter wrote: >> >>> Hi, >>> >>> On Wed, 2009-04-22 at 16:14 +, Zoe Slattery wrote: >>> >>> --EXPECTHEADERS-- Status: 404 Not Found X-Powered-By: PHP/5.3.0RC2-dev Content-type: text/html --EXPECT-- >>> shouldn't that support %s modifiers? I'm quite sure the X-Powered-By >>> header will change quite often and it will be painful to change them all >>> the time :-) >>> >> Probably better is to remove the X-Powered-By in this test, since its >> point is only to verify that EXPECTHEADERS is working? >> > > Wasn't sure whether it means "expecting all of them" or just "at least > them (in a random order?)" it means "all of these headers must be present, but others may be as well" Greg -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: phpruntests /phpt-tests hw.phpsample_expectheaders.phpt sample_fileexternal.phpt
On Wed, 2009-04-22 at 17:37 -0500, Greg Beaver wrote: > Johannes Schlüter wrote: > > Hi, > > > > On Wed, 2009-04-22 at 16:14 +, Zoe Slattery wrote: > > > >> --EXPECTHEADERS-- > >> Status: 404 Not Found > >> X-Powered-By: PHP/5.3.0RC2-dev > >> Content-type: text/html > >> > >> --EXPECT-- > > > > shouldn't that support %s modifiers? I'm quite sure the X-Powered-By > > header will change quite often and it will be painful to change them all > > the time :-) > > Probably better is to remove the X-Powered-By in this test, since its > point is only to verify that EXPECTHEADERS is working? Wasn't sure whether it means "expecting all of them" or just "at least them (in a random order?)" johannes -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: phpruntests /phpt-tests hw.phpsample_expectheaders.phpt sample_fileexternal.phpt
Johannes Schlüter wrote: > Hi, > > On Wed, 2009-04-22 at 16:14 +, Zoe Slattery wrote: > >> --EXPECTHEADERS-- >> Status: 404 Not Found >> X-Powered-By: PHP/5.3.0RC2-dev >> Content-type: text/html >> >> --EXPECT-- > > shouldn't that support %s modifiers? I'm quite sure the X-Powered-By > header will change quite often and it will be painful to change them all > the time :-) Probably better is to remove the X-Powered-By in this test, since its point is only to verify that EXPECTHEADERS is working? Greg -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/soap config.w32
pajoye Wed Apr 22 19:07:11 2009 UTC
Modified files:
/php-src/ext/soap config.w32
Log:
- MFB: make it loud when libxml is missing or the dep is not present
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/config.w32?r1=1.5&r2=1.6&diff_format=u
Index: php-src/ext/soap/config.w32
diff -u php-src/ext/soap/config.w32:1.5 php-src/ext/soap/config.w32:1.6
--- php-src/ext/soap/config.w32:1.5 Mon Feb 9 09:31:12 2004
+++ php-src/ext/soap/config.w32 Wed Apr 22 19:07:11 2009
@@ -1,15 +1,19 @@
-// $Id: config.w32,v 1.5 2004/02/09 09:31:12 dmitry Exp $
+// $Id: config.w32,v 1.6 2009/04/22 19:07:11 pajoye Exp $
// vim:ft=javascript
ARG_ENABLE("soap", "SOAP support", "no");
-if (PHP_SOAP != "no" && PHP_LIBXML == "yes") {
- EXTENSION('soap', 'soap.c php_encoding.c php_http.c php_packet_soap.c
php_schema.c php_sdl.c php_xml.c');
- AC_DEFINE('HAVE_PHP_SOAP', 1, "SOAP support");
+if (PHP_SOAP != "no") {
+ if (PHP_LIBXML == "yes" && ADD_EXTENSION_DEP('soap', 'libxml')) {
+ EXTENSION('soap', 'soap.c php_encoding.c php_http.c
php_packet_soap.c php_schema.c php_sdl.c php_xml.c');
+ AC_DEFINE('HAVE_PHP_SOAP', 1, "SOAP support");
- if (!PHP_SOAP_SHARED) {
- ADD_FLAG('CFLAGS_SOAP', "/D LIBXML_STATIC ");
+ if (!PHP_SOAP_SHARED) {
+ ADD_FLAG('CFLAGS_SOAP', "/D LIBXML_STATIC ");
+ }
+ } else {
+ WARNING("soap not enabled, libxml not found");
+ PHP_SOAP = "no"
}
- ADD_EXTENSION_DEP('soap', 'libxml');
}
--
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 config.w32
pajoye Wed Apr 22 19:06:47 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/soap config.w32
Log:
- make it loud when libxml is missing or the dep is not present
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/config.w32?r1=1.5.8.1&r2=1.5.8.2&diff_format=u
Index: php-src/ext/soap/config.w32
diff -u php-src/ext/soap/config.w32:1.5.8.1 php-src/ext/soap/config.w32:1.5.8.2
--- php-src/ext/soap/config.w32:1.5.8.1 Mon Jun 23 18:40:29 2008
+++ php-src/ext/soap/config.w32 Wed Apr 22 19:06:47 2009
@@ -1,10 +1,10 @@
-// $Id: config.w32,v 1.5.8.1 2008/06/23 18:40:29 pajoye Exp $
+// $Id: config.w32,v 1.5.8.2 2009/04/22 19:06:47 pajoye Exp $
// vim:ft=javascript
ARG_ENABLE("soap", "SOAP support", "no");
-if (PHP_SOAP != "no" && PHP_LIBXML == "yes") {
- if (ADD_EXTENSION_DEP('soap', 'libxml')) {
+if (PHP_SOAP != "no") {
+ if (PHP_LIBXML == "yes" && ADD_EXTENSION_DEP('soap', 'libxml')) {
EXTENSION('soap', 'soap.c php_encoding.c php_http.c
php_packet_soap.c php_schema.c php_sdl.c php_xml.c');
AC_DEFINE('HAVE_PHP_SOAP', 1, "SOAP support");
@@ -16,4 +16,3 @@
PHP_SOAP = "no"
}
}
-
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: phpruntests /phpt-tests hw.php sample_expectheaders.phpt sample_fileexternal.phpt
Hi, On Wed, 2009-04-22 at 16:14 +, Zoe Slattery wrote: > --EXPECTHEADERS-- > Status: 404 Not Found > X-Powered-By: PHP/5.3.0RC2-dev > Content-type: text/html > > --EXPECT-- shouldn't that support %s modifiers? I'm quite sure the X-Powered-By header will change quite often and it will be painful to change them all the time :-) johannes -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: phpruntests /phpt-tests hw.php sample_expectheaders.phpt sample_fileexternal.phpt
zoe Wed Apr 22 16:14:38 2009 UTC Added files: /phpruntests/phpt-tests sample_expectheaders.phpt hw.php sample_fileexternal.phpt Log: Sample tests for EXPECTHEADERS and FILE_EXTERNAL http://cvs.php.net/viewvc.cgi/phpruntests/phpt-tests/sample_expectheaders.phpt?view=markup&rev=1.1 Index: phpruntests/phpt-tests/sample_expectheaders.phpt +++ phpruntests/phpt-tests/sample_expectheaders.phpt --TEST-- Sample expect headers test --FILE-- --EXPECTHEADERS-- Status: 404 Not Found X-Powered-By: PHP/5.3.0RC2-dev Content-type: text/html --EXPECT-- hello world http://cvs.php.net/viewvc.cgi/phpruntests/phpt-tests/hw.php?view=markup&rev=1.1 Index: phpruntests/phpt-tests/hw.php +++ phpruntests/phpt-tests/hw.php http://cvs.php.net/viewvc.cgi/phpruntests/phpt-tests/sample_fileexternal.phpt?view=markup&rev=1.1 Index: phpruntests/phpt-tests/sample_fileexternal.phpt +++ phpruntests/phpt-tests/sample_fileexternal.phpt --TEST-- sample test for file_external --FILE_EXTERNAL-- hw.php --EXPECT-- hello world -- 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) /ext/pdo_firebird firebird_driver.c
Its mostly to keep the code the same across all branches. Ilia Alshanetsky On 21-Apr-09, at 7:24 PM, Johannes Schlüter wrote: On Thu, 2009-04-16 at 22:14 +, Ilia Alshanetsky wrote: #include "php.h" +#ifdef ZEND_ENGINE_2 +# include "zend_exceptions.h" +#else Not that it is a big issue but do we really need PHP 4 compatibiity in the code? :-) johannes -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php -- 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_attr.c
iliaa Wed Apr 22 12:35:22 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/intl/msgformat msgformat_attr.c
Log:
Removed unused vars
http://cvs.php.net/viewvc.cgi/php-src/ext/intl/msgformat/msgformat_attr.c?r1=1.1.2.4&r2=1.1.2.5&diff_format=u
Index: php-src/ext/intl/msgformat/msgformat_attr.c
diff -u php-src/ext/intl/msgformat/msgformat_attr.c:1.1.2.4
php-src/ext/intl/msgformat/msgformat_attr.c:1.1.2.5
--- php-src/ext/intl/msgformat/msgformat_attr.c:1.1.2.4 Mon Aug 11 19:48:00 2008
+++ php-src/ext/intl/msgformat/msgformat_attr.c Wed Apr 22 12:35:22 2009
@@ -34,8 +34,6 @@
PHP_FUNCTION( msgfmt_get_pattern )
{
UChar value_buf[64];
- intlength = USIZE( value_buf );
- UChar* value = value_buf;
MSG_FORMAT_METHOD_INIT_VARS;
/* Parse parameters. */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/date/tests date_format_variation2.phpt
wharmby Wed Apr 22 10:42:23 2009 UTC
Modified files:
/php-src/ext/date/tests date_format_variation2.phpt
Log:
PHP 6 version of a new date test missed from earlier drop
http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/date_format_variation2.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/date/tests/date_format_variation2.phpt
diff -u /dev/null php-src/ext/date/tests/date_format_variation2.phpt:1.2
--- /dev/null Wed Apr 22 10:42:23 2009
+++ php-src/ext/date/tests/date_format_variation2.phpt Wed Apr 22 10:42:23 2009
@@ -0,0 +1,208 @@
+--TEST--
+Test date_format() function : usage variation - Passing unexpected values to
second argument $format.
+--FILE--
+ 1, 'two' => 2);
+
+// resource
+$file_handle = fopen(__FILE__, 'r');
+
+//array of values to iterate over
+$inputs = array(
+
+ // int data
+ 'int 0' => 0,
+ 'int 1' => 1,
+ 'int 12345' => 12345,
+ 'int -12345' => -12345,
+
+ // float data
+ 'float 10.5' => 10.5,
+ 'float -10.5' => -10.5,
+ 'float .5' => .5,
+
+ // array data
+ 'empty array' => array(),
+ 'int indexed array' => $index_array,
+ 'associative array' => $assoc_array,
+ 'nested arrays' => array('foo', $index_array, $assoc_array),
+
+ // null data
+ 'uppercase NULL' => NULL,
+ 'lowercase null' => null,
+
+ // boolean data
+ 'lowercase true' => true,
+ 'lowercase false' =>false,
+ 'uppercase TRUE' =>TRUE,
+ 'uppercase FALSE' =>FALSE,
+
+ // empty data
+ 'empty string DQ' => "",
+ 'empty string SQ' => '',
+
+ // string data
+ 'string DQ' => "string",
+ 'string SQ' => 'string',
+ 'mixed case string' => "sTrInG",
+ 'heredoc' => $heredoc,
+
+ // object data
+ 'instance of classWithToString' => new classWithToString(),
+ 'instance of classWithoutToString' => new classWithoutToString(),
+
+ // undefined data
+ 'undefined var' => @$undefined_var,
+
+ // unset data
+ 'unset var' => @$unset_var,
+
+ // resource
+ 'resource' => $file_handle
+);
+
+$object = date_create("2005-07-14 22:30:41");
+
+foreach($inputs as $variation =>$format) {
+ echo "\n-- $variation --\n";
+ var_dump( date_format($object, $format) );
+};
+
+// closing the resource
+fclose( $file_handle );
+
+?>
+===DONE===
+--EXPECTF--
+*** Testing date_format() : usage variation - unexpected values to second
argument $format***
+
+-- int 0 --
+unicode(1) "0"
+
+-- int 1 --
+unicode(1) "1"
+
+-- int 12345 --
+unicode(5) "12345"
+
+-- int -12345 --
+unicode(6) "-12345"
+
+-- float 10.5 --
+unicode(4) "10.5"
+
+-- float -10.5 --
+unicode(5) "-10.5"
+
+-- float .5 --
+unicode(3) "0.5"
+
+-- empty array --
+
+Warning: date_format() expects parameter 2 to be binary string, array given in
%s on line %d
+bool(false)
+
+-- int indexed array --
+
+Warning: date_format() expects parameter 2 to be binary string, array given in
%s on line %d
+bool(false)
+
+-- associative array --
+
+Warning: date_format() expects parameter 2 to be binary string, array given in
%s on line %d
+bool(false)
+
+-- nested arrays --
+
+Warning: date_format() expects parameter 2 to be binary string, array given in
%s on line %d
+bool(false)
+
+-- uppercase NULL --
+unicode(0) ""
+
+-- lowercase null --
+unicode(0) ""
+
+-- lowercase true --
+unicode(1) "1"
+
+-- lowercase false --
+unicode(0) ""
+
+-- uppercase TRUE --
+unicode(1) "1"
+
+-- uppercase FALSE --
+unicode(0) ""
+
+-- empty string DQ --
+unicode(0) ""
+
+-- empty string SQ --
+unicode(0) ""
+
+-- string DQ --
+unicode(40) "4131Thu, 14 Jul 2005 22:30:41 +010030710"
+
+-- string SQ --
+unicode(40) "4131Thu, 14 Jul 2005 22:30:41 +010030710"
+
+-- mixed case string --
+unicode(40) "41BSTThu, 14 Jul 2005 22:30:41 +01001722"
+
+-- heredoc --
+unicode(82) "10Europe/LondonThursdayThursday2005 42005Thu, 14 Jul 2005
22:30:41 +0100Thursday14"
+
+-- instance of classWithToString --
+unicode(66) "CThursdaypm4141 PM
2005b14Europe/London2005-07-14T22:30:41+01:0031"
+
+-- instance of classWithoutToString --
+
+Warning: date_format() expects parameter 2 to be binary string, object given
in %s on line %d
+bool(false)
+
+-- undefined var --
+unicode(0) ""
+
+-- unset var --
+unicode(0) ""
+
+-- resource --
+
+Warning: date_format() expects parameter 2 to be binary string, resource given
in %s on line %d
+bool(false)
+===DONE===
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: win-installer / license.rtf
pajoye Wed Apr 22 09:54:57 2009 UTC
Modified files:
/win-installer license.rtf
Log:
- 2009 (Thanks Johannes for the notice)
http://cvs.php.net/viewvc.cgi/win-installer/license.rtf?r1=1.2&r2=1.3&diff_format=u
Index: win-installer/license.rtf
diff -u win-installer/license.rtf:1.2 win-installer/license.rtf:1.3
--- win-installer/license.rtf:1.2 Fri Oct 20 12:17:01 2006
+++ win-installer/license.rtf Wed Apr 22 09:54:57 2009
@@ -1,22 +1,50 @@
-{\rtf1\ansi\ansicpg1252\uc1\deff0\stshfdbch0\stshfloch0\stshfhich0\stshfbi0\deflang1033\deflangfe1033{\fonttbl{\f0\froman\fcharset0\fprq2{\*\panose
02020603050405020304}Times New Roman;}
-{\f2\fmodern\fcharset0\fprq1{\*\panose 02070309020205020404}Courier
New;}{\f36\froman\fcharset238\fprq2 Times New Roman
CE;}{\f37\froman\fcharset204\fprq2 Times New Roman
Cyr;}{\f39\froman\fcharset161\fprq2 Times New Roman Greek;}
-{\f40\froman\fcharset162\fprq2 Times New Roman
Tur;}{\f41\froman\fcharset177\fprq2 Times New Roman
(Hebrew);}{\f42\froman\fcharset178\fprq2 Times New Roman
(Arabic);}{\f43\froman\fcharset186\fprq2 Times New Roman Baltic;}
-{\f44\froman\fcharset163\fprq2 Times New Roman
(Vietnamese);}{\f56\fmodern\fcharset238\fprq1 Courier New
CE;}{\f57\fmodern\fcharset204\fprq1 Courier New
Cyr;}{\f59\fmodern\fcharset161\fprq1 Courier New Greek;}
-{\f60\fmodern\fcharset162\fprq1 Courier New
Tur;}{\f61\fmodern\fcharset177\fprq1 Courier New
(Hebrew);}{\f62\fmodern\fcharset178\fprq1 Courier New
(Arabic);}{\f63\fmodern\fcharset186\fprq1 Courier New Baltic;}
-{\f64\fmodern\fcharset163\fprq1 Courier New
(Vietnamese);}}{\colortbl;\red0\green0\blue0;\red0\green0\blue255;\red0\green255\blue255;\red0\green255\blue0;\red255\green0\blue255;\red255\green0\blue0;\red255\green255\blue0;\red255\green255\blue255;
-\red0\green0\blue128;\red0\green128\blue128;\red0\green128\blue0;\red128\green0\blue128;\red128\green0\blue0;\red128\green128\blue0;\red128\green128\blue128;\red192\green192\blue192;}{\stylesheet{
-\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0
\fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \snext0
Normal;}{\*\cs10 \additive \ssemihidden Default Paragraph Font;}{\*
-\ts11\tsrowd\trftsWidthB3\trpaddl108\trpaddr108\trpaddfl3\trpaddft3\trpaddfb3\trpaddfr3\trcbpat1\trcfpat1\tscellwidthfts0\tsvertalt\tsbrdrt\tsbrdrl\tsbrdrb\tsbrdrr\tsbrdrdgl\tsbrdrdgr\tsbrdrh\tsbrdrv
-\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0
\fs20\lang1024\langfe1024\cgrid\langnp1024\langfenp1024 \snext11 \ssemihidden
Normal Table;}}{\*\latentstyles\lsdstimax156\lsdlockeddef0}{\*\rsidtbl
\rsid1708422\rsid3476715
-\rsid8601513\rsid13902601}{\*\generator Microsoft Word
11.0.5604;}{\info{\author John Mertic}{\operator
User}{\creatim\yr2006\mo5\dy21\hr20\min3}{\revtim\yr2006\mo10\dy20\hr14\min16}{\version5}{\edmins7}{\nofpages2}{\nofwords480}{\nofchars2738}
-{\*\company
NCS}{\nofcharsws3212}{\vern24689}}\widowctrl\ftnbj\aenddoc\noxlattoyen\expshrtn\noultrlspc\dntblnsbdb\nospaceforul\hyphcaps0\horzdoc\dghspace120\dgvspace120\dghorigin1701\dgvorigin1984\dghshow0\dgvshow3
-\jcompress\viewkind4\viewscale100\nolnhtadjtbl\rsidroot8601513 \fet0\sectd
\linex0\sectdefaultcl\sftnbj {\*\pnseclvl1\pnucrm\pnstart1\pnindent720\pnhang
{\pntxta .}}{\*\pnseclvl2\pnucltr\pnstart1\pnindent720\pnhang {\pntxta
.}}{\*\pnseclvl3
-\pndec\pnstart1\pnindent720\pnhang {\pntxta
.}}{\*\pnseclvl4\pnlcltr\pnstart1\pnindent720\pnhang {\pntxta
)}}{\*\pnseclvl5\pndec\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta
)}}{\*\pnseclvl6\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}
-{\*\pnseclvl7\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta
)}}{\*\pnseclvl8\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta
)}}{\*\pnseclvl9\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta
)}}\pard\plain
-\ql
\li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid3476715
\fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033
{\f2\fs20\insrsid3476715\charrsid3476715
-
+{\rtf1\adeflang1025\ansi\ansicpg1252\uc1\adeff0\deff0\stshfdbch0\stshfloch0\stshfhich0\stshfbi0\deflang1033\deflangfe1033\themelang1033\themelangfe0\themelangcs0{\fonttbl{\f0\fbidi
\froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New
Roman;}{\f2\fbidi \fmodern\fcharset0\fprq1{\*\panose
02070309020205020404}Courier New;}
+{\f34\fbidi \froman\fcharset1\fprq2{\*\panose 02040503050406030204}Cambria
Math;}{\flomajor\f31500\fbidi \froman\fcharset0\fprq2{\*\panose
02020603050405020304}Times New Roman;}
+{\fdbmajor\f31501\fbidi \froman\fcharset0\fprq2{\*\panose
02020603050405020304}Times New Roman;}{\fhimajor\f31502\fbidi
\froman\fcharset0\fprq2{\*\panose 02040503050406030204}Cambria;}
+{\fbimajor\f31503\fbidi \froman\fcharset0\fprq2{\*\panose
02020603050405020304}Times New Roman;}{\flominor\f31504\fbidi
\froman\fcharset0\fprq2{
