Re: [PHP-CVS] cvs: php4 /ext/mbstring/tests 027.inc 027.phpt
On Mon, 21 Oct 2002, Moriyoshi Koizumi wrote:
moriyoshi Sun Oct 20 22:27:51 2002 EDT
Added files:
/php4/ext/mbstring/tests 027.inc 027.phpt
Log:
Added a new test case to confirm the inconsistent regex behaviour reported
on [EMAIL PROTECTED] (10830)
Why do you use an include file for this? This makes maintaining it
harder, please include it in the test script itself.
Derick
Index: php4/ext/mbstring/tests/027.inc
+++ php4/ext/mbstring/tests/027.inc
?php
$a=aaa\n;
var_dump( mb_ereg(^[^]+$,$a) );
var_dump( ereg(^[^]+$,$a) );
?
Index: php4/ext/mbstring/tests/027.phpt
+++ php4/ext/mbstring/tests/027.phpt
--TEST--
[EMAIL PROTECTED] #10830
--SKIPIF--
?php include('skipif.inc'); ?
function_exists('mb_ereg') or die(SKIP);
--POST--
--GET--
--FILE--
?php include('027.inc'); ?
--EXPECT--
bool(false)
bool(false)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
--
---
Derick Rethans http://derickrethans.nl/
JDI Media Solutions
--[ if you hold a unix shell to your ear, do you hear the c? ]-
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php4 /ext/mbstring/tests 027.inc 027.phpt
Hi! On Mon, 21 Oct 2002, Yasuo Ohgaki wrote: Derick Rethans wrote: Why do you use an include file for this? This makes maintaining it harder, please include it in the test script itself. Most mbstring tests are written by me. For me, hard coding php script in phpt is hard to maintain. i.e. I cannot execute it directly. That's why you can run only one test with: PHP_TEST_EXECUTABLE=sapi/cli/php php run-tests ext/mbstring/tests/027.phpt It's upto personal preference as long as consistent in the module, IMO. I don't agree with that; if everybody did things up to their own preference I would have coded all my tests scripts in one line without whitespace, that's much fastter you know? Anyway, for the overal quality of the test suite I want all tests implemented the same. It's either you or me who's going to change it. regards, Derick -- --- Derick Rethans http://derickrethans.nl/ JDI Media Solutions --[ if you hold a unix shell to your ear, do you hear the c? ]- -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php4 /ext/oci8 oci8.c
Your log message becomes a comment here shouldn't it be Bug #number?
marcus
At 13:00 21.10.2002, Thies C. Arntzen wrote:
thies Mon Oct 21 07:00:41 2002 EDT
Modified files:
/php4/ext/oci8 oci8.c
Log:
#19948
Index: php4/ext/oci8/oci8.c
diff -u php4/ext/oci8/oci8.c:1.180 php4/ext/oci8/oci8.c:1.181
--- php4/ext/oci8/oci8.c:1.180 Sat Oct 19 22:20:13 2002
+++ php4/ext/oci8/oci8.cMon Oct 21 07:00:40 2002
-20,7 +20,7
+--+
*/
-/* $Id: oci8.c,v 1.180 2002/10/20 02:20:13 maxim Exp $ */
+/* $Id: oci8.c,v 1.181 2002/10/21 11:00:40 thies Exp $ */
/* TODO list:
*
-631,7 +631,7
php_info_print_table_start();
php_info_print_table_row(2, OCI8 Support, enabled);
- php_info_print_table_row(2, Revision, $Revision: 1.180 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.181 $);
#ifndef PHP_WIN32
php_info_print_table_row(2, Oracle Version, PHP_OCI8_VERSION );
php_info_print_table_row(2, Compile-time ORACLE_HOME,
PHP_OCI8_DIR );
-1823,6 +1823,8
}
if (statement-error == OCI_SUCCESS_WITH_INFO || statement-error
== OCI_SUCCESS) {
+ statement-has_data = 1;
+
/* do the stuff needed for OCIDefineByName */
for (i = 0; i statement-ncolumns; i++) {
column = oci_get_col(statement, i + 1, 0);
-1837,8 +1839,6
zval_dtor(column-define-zval);
_oci_make_zval(column-define-zval,statement,column,OCIFetch,0 TSRMLS_CC);
}
-
- statement-has_data = 1;
return 1;
}
--
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
Re: [PHP-CVS] cvs: php4 / run-tests.php
Good call on \s, but what's with the \$ ? Haven't used ereg functions in ages, but why should the $ be escaped? If this is mandatory, we should update the examples at: http://www.php.net/manual/en/ref.regex.php Ah, that's not about regex. I suppose double quoted $ signs should always imply beginning of variable tokens. http://www.php.net/manual/en/language.types.string.php Moriyoshi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/fdf config.m4 fdf.c php_fdf.h
hholzgraMon Oct 21 15:55:29 2002 EDT
Modified files:
/php4/ext/fdf config.m4 fdf.c php_fdf.h
Log:
updated FDF extension to work with current Adodeb fdftk 5.0 (hartmut)
reworked some existing stuff
added some functions suporting stuff that have been added since fdftk 2.0
emulating read from/save to strings by transparently using temp. files
(activeX version of fdftk has this, but not plain C version :( )
Index: php4/ext/fdf/config.m4
diff -u php4/ext/fdf/config.m4:1.18 php4/ext/fdf/config.m4:1.19
--- php4/ext/fdf/config.m4:1.18 Tue Mar 19 19:39:28 2002
+++ php4/ext/fdf/config.m4 Mon Oct 21 15:55:28 2002
-1,5 +1,5
dnl
-dnl $Id: config.m4,v 1.18 2002/03/20 00:39:28 sniper Exp $
+dnl $Id: config.m4,v 1.19 2002/10/21 19:55:28 hholzgra Exp $
dnl
PHP_ARG_WITH(fdftk, for FDF support,
-7,32 +7,68
if test $PHP_FDFTK != no; then
- for i in /usr /usr/local $PHP_FDFTK; do
-if test -r $i/include/FdfTk.h; then
- FDFTK_DIR=$i
-elif test -r $i/include/fdftk.h; then
- AC_DEFINE(HAVE_FDFTK_H_LOWER,1,[ ])
- FDFTK_DIR=$i
-fi
+ case $host_os in
+ aix*)
+ libtype=aix
+ ;;
+ solaris* )
+ libtype=solaris
+ ;;
+ linux*)
+ libtype=linux
+ ;;
+ *)
+ AC_MSG_ERROR(sorry but the fdf tookkit is available for aix, solaris
+and linux only ... $host_os ... blame adboe)
+ ;;
+ esac
+
+ if test $PHP_FDFTK = yes; then
+ PHP_FDFTK=/usr /usr/local ../FDFToolkitForUNIX
+ext/fdf/FDFToolkitForUNIX
+ fi
+
+ for dir in $PHP_FDFTK; do
+ for subdir in include HeadersAndLibraries/headers; do
+ if test -r $dir/$subdir/FdfTk.h; then
+ FDFTK_DIR=$dir
+ FDFTK_H_DIR=$dir/$subdir
+ elif test -r $dir/$subdir/fdftk.h; then
+ AC_DEFINE(HAVE_FDFTK_H_LOWER,1,[ ])
+ FDFTK_DIR=$dir
+ FDFTK_H_DIR=$dir/$subdir
+ fi
+ done
done
if test -z $FDFTK_DIR; then
AC_MSG_ERROR(FdfTk.h or fdftk.h not found. Please reinstall the fdftk
distribution.)
fi
- PHP_ADD_INCLUDE($FDFTK_DIR/include)
-
+ PHP_ADD_INCLUDE($FDFTK_H_DIR)
+
FDFLIBRARY=
- for i in fdftk FdfTk; do
-PHP_CHECK_LIBRARY($i, FDFOpen, [FDFLIBRARY=$i], [], [-L$FDFTK_DIR/lib -lm])
- done
+ for file in fdftk FdfTk; do
+ for dir in $FDFTK_DIR/lib $FDFTK_DIR/HeadersAndLibraries/$libtype/C; do
+ echo testing $dir/lib$file.so
+ if test -r $dir/lib$file.so; then
+ if test -z $FDFLIBRARY; then
+ PHP_CHECK_LIBRARY($file, FDFOpen, [FDFLIBRARY=$file], [], [-L$dir -lm])
+ if test $FDFLIBRARY; then
+ echo ok
+ FDFTK_LIB_DIR=$dir
+ fi
+ fi
+ fi
+ done
+ done
if test -z $FDFLIBRARY; then
-AC_MSG_ERROR(fdftk module requires = fdftk 2.0)
+AC_MSG_ERROR(no usable fdf library found)
fi
+
+
AC_DEFINE(HAVE_FDFLIB,1,[ ])
- PHP_ADD_LIBRARY_WITH_PATH($FDFLIBRARY, $FDFTK_DIR/lib, FDFTK_SHARED_LIBADD)
+ PHP_ADD_LIBRARY_WITH_PATH($FDFLIBRARY, $FDFTK_LIB_DIR, FDFTK_SHARED_LIBADD)
PHP_SUBST(FDFTK_SHARED_LIBADD)
PHP_NEW_EXTENSION(fdf, fdf.c, $ext_shared)
Index: php4/ext/fdf/fdf.c
diff -u php4/ext/fdf/fdf.c:1.64 php4/ext/fdf/fdf.c:1.65
--- php4/ext/fdf/fdf.c:1.64 Thu Jun 27 02:46:51 2002
+++ php4/ext/fdf/fdf.c Mon Oct 21 15:55:28 2002
-17,7 +17,7
+--+
*/
-/* $Id: fdf.c,v 1.64 2002/06/27 06:46:51 derick Exp $ */
+/* $Id: fdf.c,v 1.65 2002/10/21 19:55:28 hholzgra Exp $ */
/* FdfTk lib 2.0 is a Complete C/C++ FDF Toolkit available from
http://beta1.adobe.com/ada/acrosdk/forms.html. */
-29,6 +29,7
#endif
#include php.h
+#include php_open_temporary_file.h
#if HAVE_FDFLIB
-45,24 +46,41
/* {{{ fdf_functions[]
*/
function_entry fdf_functions[] = {
- PHP_FE(fdf_open,
NULL)
- PHP_FE(fdf_create,
NULL)
+ PHP_FE(fdf_add_doc_javascript, NULL)
+ PHP_FE(fdf_add_template,NULL)
PHP_FE(fdf_close,
NULL)
- PHP_FE(fdf_save,
NULL)
+ PHP_FE(fdf_create,
+ NULL)
+ PHP_FE(fdf_enum_values, NULL)
+ PHP_FE(fdf_errno, NULL)
+ PHP_FE(fdf_error, NULL)
+
[PHP-CVS] cvs: php4 /ext/ncurses php_ncurses.h
hholzgraMon Oct 21 10:56:43 2002 EDT Modified files: /php4/ext/ncurses php_ncurses.h Log: ZTS build fix Index: php4/ext/ncurses/php_ncurses.h diff -u php4/ext/ncurses/php_ncurses.h:1.7 php4/ext/ncurses/php_ncurses.h:1.8 --- php4/ext/ncurses/php_ncurses.h:1.7 Fri Sep 27 18:33:14 2002 +++ php4/ext/ncurses/php_ncurses.h Mon Oct 21 10:56:42 2002 -59,7 +59,7 */ #ifdef ZTS -#define NCURSES_G(v) (ncurses_globals-v) +#define NCURSES_G(v) TSRMG(ncurses_globals_id, zend_ncurses_globals *, v) #define NCURSES_LS_FETCH() zend_ncurses_globals *ncurses_globals = ts_resource(ncurses_globals_id) #else #define NCURSES_G(v) (ncurses_globals.v) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/standard basic_functions.c
hholzgraMon Oct 21 15:24:49 2002 EDT
Modified files:
/php4/ext/standard basic_functions.c
Log:
fixed build for getopt_long-less platforms,
removed left-over todo comments
Index: php4/ext/standard/basic_functions.c
diff -u php4/ext/standard/basic_functions.c:1.534
php4/ext/standard/basic_functions.c:1.535
--- php4/ext/standard/basic_functions.c:1.534 Mon Oct 21 15:12:13 2002
+++ php4/ext/standard/basic_functions.c Mon Oct 21 15:24:48 2002
-17,7 +17,7
+--+
*/
-/* $Id: basic_functions.c,v 1.534 2002/10/21 19:12:13 jon Exp $ */
+/* $Id: basic_functions.c,v 1.535 2002/10/21 19:24:48 hholzgra Exp $ */
#include php.h
#include php_streams.h
-1412,8 +1412,6
* Get argv from the global symbol table. We calculate argc ourselves
* in order to be on the safe side, even though it is also available
* from the symbol table.
-*
-* TODO: Take from trackbars instead.
*/
if (zend_hash_find(HASH_OF(PG(http_globals)[TRACK_VARS_SERVER]), argv,
sizeof(argv),
(void **) args) != FAILURE) {
-1469,7 +1467,6
while (zend_hash_get_current_data(Z_ARRVAL_P(p_longopts),
(void **)arg) == SUCCESS) {
- /* TODO: check for : and ::, strip'em, efrees ... */
p-has_arg = 0;
name = estrdup(Z_STRVAL_PP(arg));
len = strlen(name);
-1513,13 +1510,14
#endif
/* Skip unknown arguments. */
if (o == '?') {
- // TODO bailout?
continue;
}
/* Prepare the option character and the argument string. */
if(o == 0) {
+#ifdef HAVE_GETOPT_LONG
optname = (char *)longopts[longindex].name;
+#endif
} else {
if(o == 1) o = '-';
opt[0] = o;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/standard php_fopen_wrapper.c /main SAPI.c main.c php_content_types.c php_globals.h
hholzgraMon Oct 21 12:41:07 2002 EDT
Modified files:
/php4/main SAPI.c main.c php_content_types.c php_globals.h
/php4/ext/standard php_fopen_wrapper.c
Log:
some changes to how request input data (Content-Lenght 0) is handled
- webdav-specific stuff removed (should be handled using httpd.conf
LIMIT or equivalents)
- always_populate_raw_post_data now working on any method, not just
POST (and webdav methods with allow_webdav_methods), when
Content-Length is greater zero
- raw input data is also available using php://input stream,
this way one doesn't have to care about memory_limit
- input data is now always consumed (although maybe ignored,
this fixes we had withproblems with keep-alive connections
@ raw POST data is now available as php://input stream (hartmut)
Index: php4/main/SAPI.c
diff -u php4/main/SAPI.c:1.150 php4/main/SAPI.c:1.151
--- php4/main/SAPI.c:1.150 Sat Sep 7 21:06:29 2002
+++ php4/main/SAPI.cMon Oct 21 12:41:06 2002
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: SAPI.c,v 1.150 2002/09/08 01:06:29 yohgaki Exp $ */
+/* $Id: SAPI.c,v 1.151 2002/10/21 16:41:06 hholzgra Exp $ */
#include ctype.h
#include sys/stat.h
@@ -128,7 +128,7 @@
char *content_type = estrndup(SG(request_info).content_type,
content_type_length);
char *p;
char oldchar=0;
- void (*post_reader_func)(TSRMLS_D);
+ void (*post_reader_func)(TSRMLS_D) = NULL;
/* dedicated implementation for increased performance:
@@ -159,7 +159,6 @@
return;
}
SG(request_info).post_entry = NULL;
- post_reader_func = sapi_module.default_post_reader;
}
if (oldchar) {
*(p-1) = oldchar;
@@ -169,10 +168,10 @@
if(post_reader_func) {
post_reader_func(TSRMLS_C);
+ }
- if(PG(always_populate_raw_post_data)
sapi_module.default_post_reader) {
- sapi_module.default_post_reader(TSRMLS_C);
- }
+ if(PG(always_populate_raw_post_data) sapi_module.default_post_reader) {
+ sapi_module.default_post_reader(TSRMLS_C);
}
}
@@ -282,6 +281,7 @@
SAPI_API void sapi_activate(TSRMLS_D)
{
void (*post_reader_func)(TSRMLS_D);
+
zend_llist_init(SG(sapi_headers).headers, sizeof(sapi_header_struct), (void
(*)(void *)) sapi_free_header, 0);
SG(sapi_headers).send_default_content_type = 1;
@@ -306,39 +306,34 @@
}
SG(rfc1867_uploaded_files) = NULL;
+ /* handle request mehtod */
if (SG(server_context)) {
- if ( SG(request_info).request_method
- (!strcmp(SG(request_info).request_method, POST)
- || (PG(allow_webdav_methods)
-(!strcmp(SG(request_info).request_method,
PROPFIND)
- || !strcmp(SG(request_info).request_method,
PROPPATCH)
- || !strcmp(SG(request_info).request_method,
MKCOL)
- || !strcmp(SG(request_info).request_method,
PUT)
- || !strcmp(SG(request_info).request_method,
MOVE)
- || !strcmp(SG(request_info).request_method,
COPY)
- || !strcmp(SG(request_info).request_method,
LOCK) {
- if (!SG(request_info).content_type) {
+ if ( SG(request_info).request_method) {
+ if(!strcmp(SG(request_info).request_method, POST)
+ (SG(request_info).content_type)) {
+ /* HTTP POST - may contain form data to be read into
+variables
+ depending on content type given
+ */
+ sapi_read_post_data(TSRMLS_C);
+ } else {
+ /* any other method with content payload will fill
+ $HTTP_RAW_POST_DATA if enabled by
+always_populate_raw_post_data
+ it is up to the webserver to decide whether to
+allow a method or not
+ */
SG(request_info).content_type_dup = NULL;
if(PG(always_populate_raw_post_data)) {
- SG(request_info).post_entry = NULL;
- post_reader_func =
sapi_module.default_post_reader;
-
- if(post_reader_func) {
- post_reader_func(TSRMLS_C);
-
-
[PHP-CVS] cvs: php4 / run-tests.php
moriyoshi Mon Oct 21 06:22:41 2002 EDT
Modified files:
/php4 run-tests.php
Log:
\s cannot be used with ereg()
Index: php4/run-tests.php
diff -u php4/run-tests.php:1.77 php4/run-tests.php:1.78
--- php4/run-tests.php:1.77 Mon Oct 21 05:04:56 2002
+++ php4/run-tests.php Mon Oct 21 06:22:41 2002
-435,7 +435,7
unlink($tmp_skipif);
if (ereg(^skip, trim($output))){
echo SKIP $tested;
- $reason = (ereg(^skip\s*(.+)$, trim($output))) ?
ereg_replace(^skip\s*(.+)$, \\1, trim($output)) : FALSE;
+ $reason = (ereg(^skip[[:space:]]*(.+)\$,
+trim($output))) ? ereg_replace(^^skip[[:space:]]*(.+)\$, \\1, trim($output)) :
+FALSE;
if ($reason) {
echo (reason: $reason)\n;
} else {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php4 /ext/xml/tests 007.phpt
On Mon, 21 Oct 2002, Melvyn Sopacua wrote:
msopacua Mon Oct 21 04:55:07 2002 EDT
Modified files:
/php4/ext/xml/tests 007.phpt
Log:
Skip this when strtoupper doesn't behave as expected, because casefolding
depends on this.
erm, this is just a local problem. Just set the locale to German here
and it will work just fine I think. IMO this is a hack :)
Derick
Index: php4/ext/xml/tests/007.phpt
diff -u php4/ext/xml/tests/007.phpt:1.3 php4/ext/xml/tests/007.phpt:1.4
--- php4/ext/xml/tests/007.phpt:1.3 Thu Apr 4 09:33:05 2002
+++ php4/ext/xml/tests/007.phpt Mon Oct 21 04:55:07 2002
-1,7 +1,13
--TEST--
xml_parse_into_struct/umlauts in tags
--SKIPIF--
-?php include(skipif.inc); ?
+?php // vim600: syn=php
+include(skipif.inc);
+if(strtoupper(äöü) == äöü)
+{
+ die(skip strtoupper on non-ascii not supported on this platform);
+}
+?
--FILE--
?php
function startHandler($parser,$tag,$attr) { var_dump($tag,$attr); }
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
--
---
Derick Rethans http://derickrethans.nl/
JDI Media Solutions
--[ if you hold a unix shell to your ear, do you hear the c? ]-
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
rasmus Mon Oct 21 03:28:25 2002 EDT Modified files: /CVSROOTavail Log: phpdoc karma for Fernando Conceição Index: CVSROOT/avail diff -u CVSROOT/avail:1.516 CVSROOT/avail:1.517 --- CVSROOT/avail:1.516 Fri Oct 18 21:29:32 2002 +++ CVSROOT/avail Mon Oct 21 03:28:25 2002 -27,7 +27,7 # The PHP Documentation Group maintains the documentation and its # translations. -avail|coldocean,alan_k,fleaslob,chad,torben,lynch,kk,ted,kwazy,aka,affinity,paul,skaag,pglat,mbritton,coar,lwest,joey,bibi,mrobinso,lwh,perugini,hamoralesr,tzwenny,hirokawa,drews,paulsen,hartmann,philross,leon,valdirh,dmarion,dubois,jonen,tschuer,tfromm,manuel,stas,danbeck,sli,jmcastagnetto,mohrt,cris,goba,samesch,jon,soneca,kaufm,ronabop,glace,latoserver,phpguru_dk,lojmann,rafael,jan,jcmeloni,chrullrich,mk,sebastian,troels,mathieu,voize,phaethon,mgx,mj,corean,pandach,brown,cycle98,vizvil,openlife,regina,cynic,jpm,dams,alponce,menuconfig,obst,topgoods,karoora,pcraft,suvia,zak,zimt,mgx,sintoris,jmoore,ftfuture,uttam,ag315,ropik,jbi1979,bbonev,malo,afortaleza,neotron,cg,delrom,jkj,hellekin,kgergely,andreroq,eduardh,cnewbill,fuzzy74,inki,bjoern,fams,smasiello,dim,lucasr,cpereira,lagflores,kjh90,ernani,theseer,cevm,noribsd,eskaly,mctrash,berto,leobopp,tcr,subjective,ufux,virtual,fireclaw,hadar_p,asautins,dbenson,aleczapka,flaviobrito,mattias,tom,amiller,cortesi,lancelot_,irc-html,mkaufman,rarruda,j-f,betz,philip,alindeman,thyla,cucinato,jpsantos,zyprexia,tpug,ozgurakan,mitja,conni,sts,stefanhinz,georg,nmav,subbie,leszek,spheroid,joona,kjartno,slawek,nooboo,alan_dangelo,ae,ahambazaza,nohn,kaser01,visualmind,abohamam,stefan,kurtz,luk,tronic,moh,bernd,wilko,yohgaki,fujimoto,gerzson,webler,spooky,tinenie,cece,daniel,offs,boo,nhoizey,nogada,albaity,joerg,mazen,neil536t,maco,imajes,hakan,chief977,dwestfal,ott,shlomi,holev,raful,yuval,tomer,masterjy,barak,ido,mork,lior,gal,adiju,cr_depend,cyberowl,daniel.paul,florian,iulianphp,kappu,michelinux,muricaru,narcotic,dt,valy,critix,spg1et,ck,costra,fancao0515,rbenea,tibee,ins0mnia,eriksson,wenz,jaxler,volker,avaly,bernardojts,bs,phaser,tal,sander,matroz,thales,dorun,ave,adu,adamf1,figuric,katow,l30n4rd0,samih,mmeier,wentzel,scaro,amtd,aspinei,costello,coti,ernani_joppert,lmaxcar,lucaiacono,manuzhai,mcastro,sukamade,darvina,peter,maxim,adir,roland,romakhin,jmurin,n0nick,attila,sagi,kai,microbrain,rhheo,shimi,k.schroeder,djworld,emil,lboshell,netholic,dmitry83,machado,progcom,verdana,yincheng,surfmax,arzt,nicos,chregu,msopacua,bbd,cyril,gregory,hudzilla,klean,mignoni,wiesemann,xqi,mersal,zruya,sean,staybyte,daif,aber_sabeel,alzahrani,ayman_h,thomaslio,sfox,jippie,floripa,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,spic,truelight,gnuhacker,_batman_,sachat,dallas,dart,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,feyge,abodive,ama,andras,hassen,jkhdk,okamura,popov,xman|phpdoc,ZendAPI,phpdoc-ar,phpdoc-cs,phpdoc-de,phpdoc-es,phpdoc-fi,phpdoc-fr,phpdoc-he,phpdoc-hk,phpdoc-hu,phpdoc-it,phpdoc-ja,phpdoc-kr,phpdoc-nl,phpdoc-pl,phpdoc-pt_BR,phpdoc-ro,phpdoc-ru,phpdoc-sk,phpdoc-sl,phpdoc-sv,phpdoc-tr,phpdoc-tw,phpdoc-zh
[PHP-CVS] cvs: php4 /ext/oci8 oci8.c
thies Mon Oct 21 07:00:41 2002 EDT
Modified files:
/php4/ext/oci8 oci8.c
Log:
#19948
Index: php4/ext/oci8/oci8.c
diff -u php4/ext/oci8/oci8.c:1.180 php4/ext/oci8/oci8.c:1.181
--- php4/ext/oci8/oci8.c:1.180 Sat Oct 19 22:20:13 2002
+++ php4/ext/oci8/oci8.cMon Oct 21 07:00:40 2002
-20,7 +20,7
+--+
*/
-/* $Id: oci8.c,v 1.180 2002/10/20 02:20:13 maxim Exp $ */
+/* $Id: oci8.c,v 1.181 2002/10/21 11:00:40 thies Exp $ */
/* TODO list:
*
-631,7 +631,7
php_info_print_table_start();
php_info_print_table_row(2, OCI8 Support, enabled);
- php_info_print_table_row(2, Revision, $Revision: 1.180 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.181 $);
#ifndef PHP_WIN32
php_info_print_table_row(2, Oracle Version, PHP_OCI8_VERSION );
php_info_print_table_row(2, Compile-time ORACLE_HOME, PHP_OCI8_DIR );
-1823,6 +1823,8
}
if (statement-error == OCI_SUCCESS_WITH_INFO || statement-error ==
OCI_SUCCESS) {
+ statement-has_data = 1;
+
/* do the stuff needed for OCIDefineByName */
for (i = 0; i statement-ncolumns; i++) {
column = oci_get_col(statement, i + 1, 0);
-1837,8 +1839,6
zval_dtor(column-define-zval);
_oci_make_zval(column-define-zval,statement,column,OCIFetch,0 TSRMLS_CC);
}
-
- statement-has_data = 1;
return 1;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 / php.ini-dist php.ini-recommended /main main.c php_globals.h
iliaa Mon Oct 21 09:09:29 2002 EDT
Modified files:
/php4/main main.c php_globals.h
/php4 php.ini-dist php.ini-recommended
Log:
Fixed bug #16880. Added an ini option max_input_time that allows the user
to specify how much time a script may spend parsing input data (POST, GET, etc..).
Index: php4/main/main.c
diff -u php4/main/main.c:1.499 php4/main/main.c:1.500
--- php4/main/main.c:1.499 Sat Oct 19 22:57:40 2002
+++ php4/main/main.cMon Oct 21 09:09:28 2002
-18,7 +18,7
+--+
*/
-/* $Id: main.c,v 1.499 2002/10/20 02:57:40 fujimoto Exp $ */
+/* $Id: main.c,v 1.500 2002/10/21 13:09:28 iliaa Exp $ */
/* {{{ includes
*/
-251,6 +251,7
STD_PHP_INI_BOOLEAN(html_errors, 1,
PHP_INI_ALL,OnUpdateBool, html_errors,
php_core_globals, core_globals)
STD_PHP_INI_BOOLEAN(xmlrpc_errors,0,
PHP_INI_SYSTEM, OnUpdateBool, xmlrpc_errors,
php_core_globals, core_globals)
STD_PHP_INI_ENTRY(xmlrpc_error_number,0,PHP_INI_ALL,
OnUpdateInt,xmlrpc_error_number,php_core_globals,
core_globals)
+ STD_PHP_INI_ENTRY(max_input_time, 0,PHP_INI_ALL,
+ OnUpdateInt,max_input_time, php_core_globals, core_globals)
STD_PHP_INI_BOOLEAN(ignore_user_abort,0,PHP_INI_ALL,
OnUpdateBool, ignore_user_abort,
php_core_globals, core_globals)
STD_PHP_INI_BOOLEAN(implicit_flush, 0,
PHP_INI_PERDIR|PHP_INI_SYSTEM,OnUpdateBool, implicit_flush,
php_core_globals, core_globals)
STD_PHP_INI_BOOLEAN(log_errors, 0,
PHP_INI_ALL,OnUpdateBool, log_errors,
php_core_globals, core_globals)
-835,7 +836,7
zend_activate(TSRMLS_C);
sapi_activate(TSRMLS_C);
- zend_set_timeout(EG(timeout_seconds));
+ zend_set_timeout(PG(max_input_time));
if (PG(expose_php)) {
sapi_add_header(SAPI_PHP_VERSION_HEADER,
sizeof(SAPI_PHP_VERSION_HEADER)-1, 1);
-1539,6 +1540,8
#if defined(ZEND_MULTIBYTE) defined(HAVE_MBSTRING)
php_mbstring_set_zend_encoding(TSRMLS_C);
#endif /* ZEND_MULTIBYTE HAVE_MBSTRING */
+ zend_unset_timeout(TSRMLS_C);
+ zend_set_timeout(EG(timeout_seconds));
retval = (zend_execute_scripts(ZEND_REQUIRE TSRMLS_CC, NULL, 3,
prepend_file_p, primary_file, append_file_p) == SUCCESS);
if (old_primary_file_path) {
Index: php4/main/php_globals.h
diff -u php4/main/php_globals.h:1.82 php4/main/php_globals.h:1.83
--- php4/main/php_globals.h:1.82Sun Sep 1 07:33:19 2002
+++ php4/main/php_globals.h Mon Oct 21 09:09:29 2002
-71,6 +71,7
char *safe_mode_exec_dir;
long memory_limit;
+ long max_input_time;
zend_bool track_errors;
zend_bool display_errors;
Index: php4/php.ini-dist
diff -u php4/php.ini-dist:1.166 php4/php.ini-dist:1.167
--- php4/php.ini-dist:1.166 Thu Oct 17 05:49:46 2002
+++ php4/php.ini-dist Mon Oct 21 09:09:29 2002
-218,6 +218,7
;;;
max_execution_time = 30 ; Maximum execution time of each script, in seconds
+max_input_time = 60; Maximum amount of time each script may spend parsing request
+data
memory_limit = 8M ; Maximum amount of memory a script may consume (8MB)
;;
Index: php4/php.ini-recommended
diff -u php4/php.ini-recommended:1.114 php4/php.ini-recommended:1.115
--- php4/php.ini-recommended:1.114 Thu Oct 17 05:49:47 2002
+++ php4/php.ini-recommendedMon Oct 21 09:09:29 2002
-232,6 +232,7
;;;
max_execution_time = 30 ; Maximum execution time of each script, in seconds
+max_input_time = 60; Maximum amount of time each script may spend parsing request
+data
memory_limit = 8M ; Maximum amount of memory a script may consume (8MB)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 / run-tests.php
sander Mon Oct 21 05:04:57 2002 EDT
Modified files:
/php4 run-tests.php
Log:
The results of each test should go on a single line
Index: php4/run-tests.php
diff -u php4/run-tests.php:1.76 php4/run-tests.php:1.77
--- php4/run-tests.php:1.76 Mon Oct 21 04:55:49 2002
+++ php4/run-tests.php Mon Oct 21 05:04:56 2002
-434,10 +434,12
$output = `$php $tmp_skipif`;
unlink($tmp_skipif);
if (ereg(^skip, trim($output))){
- echo SKIP $tested\n;
+ echo SKIP $tested;
$reason = (ereg(^skip\s*(.+)$, trim($output))) ?
ereg_replace(^skip\s*(.+)$, \\1, trim($output)) : FALSE;
if ($reason) {
- echo \treason: $reason\n;
+ echo (reason: $reason)\n;
+ } else {
+ echo \n;
}
return 'SKIPPED';
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php4 / run-tests.php
Good call on \s, but what's with the \$ ?
Haven't used ereg functions in ages, but why should the $ be escaped?
If this is mandatory, we should update the examples at:
http://www.php.net/manual/en/ref.regex.php
At 10:23 10/21/2002 +, Moriyoshi Koizumi wrote:
moriyoshi Mon Oct 21 06:23:31 2002 EDT
Modified files:
/php4 run-tests.php
Log:
Fixed typo.
Index: php4/run-tests.php
diff -u php4/run-tests.php:1.78 php4/run-tests.php:1.79
--- php4/run-tests.php:1.78 Mon Oct 21 06:22:41 2002
+++ php4/run-tests.php Mon Oct 21 06:23:31 2002
-435,7 +435,7
unlink($tmp_skipif);
if (ereg(^skip, trim($output))){
echo SKIP $tested;
- $reason = (ereg(^skip[[:space:]]*(.+)\$,
trim($output))) ? ereg_replace(^^skip[[:space:]]*(.+)\$, \\1,
trim($output)) : FALSE;
+ $reason = (ereg(^skip[[:space:]]*(.+)\$,
trim($output))) ? ereg_replace(^skip[[:space:]]*(.+)\$, \\1,
trim($output)) : FALSE;
if ($reason) {
echo (reason: $reason)\n;
} else {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Met vriendelijke groeten / With kind regards,
Webmaster IDG.nl
Melvyn Sopacua
Logan I spent a minute looking at my own code by accident.
Logan I was thinking What the hell is this guy doing?
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/curl curl.c
sterlingMon Oct 21 18:36:00 2002 EDT
Modified files:
/php4/ext/curl curl.c
Log:
no need to double fetch
Index: php4/ext/curl/curl.c
diff -u php4/ext/curl/curl.c:1.119 php4/ext/curl/curl.c:1.120
--- php4/ext/curl/curl.c:1.119 Wed Oct 2 12:44:48 2002
+++ php4/ext/curl/curl.cMon Oct 21 18:35:59 2002
-16,7 +16,7
+--+
*/
-/* $Id: curl.c,v 1.119 2002/10/02 16:44:48 derick Exp $ */
+/* $Id: curl.c,v 1.120 2002/10/21 22:35:59 sterling Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
-304,7 +304,6
php_curl *ch = (php_curl *) ctx;
php_curl_write *t = ch-handlers-write;
size_t length = size * nmemb;
- TSRMLS_FETCH();
switch (t-method) {
case PHP_CURL_STDOUT:
-1125,6 +1124,6
* tab-width: 4
* c-basic-offset: 4
* End:
- * vim600: noet sw=4 ts=4 fdm=marker
- * vim600: noet sw=4 ts=4
+ * vim600: fdm=marker
+ * vim: noet sw=4 ts=4
*/
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/fdf config.m4
sniper Mon Oct 21 18:58:52 2002 EDT Modified files: /php4/ext/fdf config.m4 Log: Cleanup. (no tabs here!) Index: php4/ext/fdf/config.m4 diff -u php4/ext/fdf/config.m4:1.19 php4/ext/fdf/config.m4:1.20 --- php4/ext/fdf/config.m4:1.19 Mon Oct 21 15:55:28 2002 +++ php4/ext/fdf/config.m4 Mon Oct 21 18:58:52 2002 -1,5 +1,5 dnl -dnl $Id: config.m4,v 1.19 2002/10/21 19:55:28 hholzgra Exp $ +dnl $Id: config.m4,v 1.20 2002/10/21 22:58:52 sniper Exp $ dnl PHP_ARG_WITH(fdftk, for FDF support, -7,65 +7,62 if test $PHP_FDFTK != no; then - case $host_os in - aix*) - libtype=aix - ;; - solaris* ) - libtype=solaris - ;; - linux*) - libtype=linux - ;; - *) - AC_MSG_ERROR(sorry but the fdf tookkit is available for aix, solaris and linux only ... $host_os ... blame adboe) - ;; + case $host_os in +aix*) + libtype=aix +;; +solaris* ) + libtype=solaris +;; +linux*) + libtype=linux +;; +*) + AC_MSG_ERROR([The fdf toolkit is not available for $host_os.]) +;; esac - if test $PHP_FDFTK = yes; then - PHP_FDFTK=/usr /usr/local ../FDFToolkitForUNIX ext/fdf/FDFToolkitForUNIX - fi + if test $PHP_FDFTK = yes; then +PHP_FDFTK=/usr /usr/local ../FDFToolkitForUNIX ext/fdf/FDFToolkitForUNIX + fi for dir in $PHP_FDFTK; do - for subdir in include HeadersAndLibraries/headers; do - if test -r $dir/$subdir/FdfTk.h; then - FDFTK_DIR=$dir - FDFTK_H_DIR=$dir/$subdir - elif test -r $dir/$subdir/fdftk.h; then - AC_DEFINE(HAVE_FDFTK_H_LOWER,1,[ ]) - FDFTK_DIR=$dir - FDFTK_H_DIR=$dir/$subdir - fi - done +for subdir in include HeadersAndLibraries/headers; do + if test -r $dir/$subdir/FdfTk.h; then +FDFTK_DIR=$dir +FDFTK_H_DIR=$dir/$subdir +break 2 + elif test -r $dir/$subdir/fdftk.h; then +AC_DEFINE(HAVE_FDFTK_H_LOWER,1,[ ]) +FDFTK_DIR=$dir +FDFTK_H_DIR=$dir/$subdir +break 2 + fi +done done if test -z $FDFTK_DIR; then -AC_MSG_ERROR(FdfTk.h or fdftk.h not found. Please reinstall the fdftk distribution.) +AC_MSG_ERROR([FdfTk.h or fdftk.h not found. Please reinstall the fdf toolkit.]) fi PHP_ADD_INCLUDE($FDFTK_H_DIR) FDFLIBRARY= for file in fdftk FdfTk; do - for dir in $FDFTK_DIR/lib $FDFTK_DIR/HeadersAndLibraries/$libtype/C; do - echo testing $dir/lib$file.so +for dir in $FDFTK_DIR/lib $FDFTK_DIR/HeadersAndLibraries/$libtype/C; do if test -r $dir/lib$file.so; then - if test -z $FDFLIBRARY; then - PHP_CHECK_LIBRARY($file, FDFOpen, [FDFLIBRARY=$file], [], [-L$dir -lm]) - if test $FDFLIBRARY; then - echo ok - FDFTK_LIB_DIR=$dir - fi - fi - fi - done - done +PHP_CHECK_LIBRARY($file, FDFOpen, [FDFLIBRARY=$file], [], [-L$dir -lm]) +if test $FDFLIBRARY; then + FDFTK_LIB_DIR=$dir + break 2 +fi + fi +done + done if test -z $FDFLIBRARY; then AC_MSG_ERROR(no usable fdf library found) fi - - AC_DEFINE(HAVE_FDFLIB,1,[ ]) PHP_ADD_LIBRARY_WITH_PATH($FDFLIBRARY, $FDFTK_LIB_DIR, FDFTK_SHARED_LIBADD) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/standard link.c TSRM tsrm_virtual_cwd.c tsrm_virtual_cwd.h
iliaa Mon Oct 21 19:35:29 2002 EDT
Modified files:
/TSRM tsrm_virtual_cwd.c tsrm_virtual_cwd.h
/php4/ext/standard link.c
Log:
Fixed symlink/link functions on ZTS builds.
Made URL detection in symlink code use php_stream_locate_url_wrapper().
Index: TSRM/tsrm_virtual_cwd.c
diff -u TSRM/tsrm_virtual_cwd.c:1.32 TSRM/tsrm_virtual_cwd.c:1.33
--- TSRM/tsrm_virtual_cwd.c:1.32Sat Oct 5 07:26:17 2002
+++ TSRM/tsrm_virtual_cwd.c Mon Oct 21 19:35:28 2002
-17,7 +17,7
+--+
*/
-/* $Id: tsrm_virtual_cwd.c,v 1.32 2002/10/05 11:26:17 dreid Exp $ */
+/* $Id: tsrm_virtual_cwd.c,v 1.33 2002/10/21 23:35:28 iliaa Exp $ */
#include sys/types.h
#include sys/stat.h
-282,6 +282,28
return buf;
}
+CWD_API char *virtual_link(char *buf, size_t size TSRMLS_DC)
+{
+ size_t length;
+ char *p;
+ char tmp_path[MAXPATHLEN * 2];
+ char resolved_path[MAXPATHLEN];
+
+ if (IS_ABSOLUTE_PATH(buf, size)) {
+ memcpy(resolved_path, buf, size);
+ p[size] = '\0';
+ return resolved_path;
+ } else {
+ virtual_getcwd(tmp_path, MAXPATHLEN TSRMLS_CC);
+ p = tmp_path + strlen(tmp_path);
+ *p++ = '/';
+ memcpy(p, buf, size);
+ *(p + size) = '\0';
+
+ return tmp_path;
+ }
+}
+
/* Resolve path relatively to state and put the real path into state */
/* returns 0 for ok, 1 for error */
CWD_API int virtual_file_ex(cwd_state *state, const char *path, verify_path_func
verify_path)
-703,11 +725,13
{
cwd_state new_state;
int retval;
+ char *p;
CWD_STATE_COPY(new_state, CWDG(cwd));
- virtual_file_ex(new_state, path, NULL);
+ /* virtual_file_ex(new_state, path, NULL); */
+ p = virtual_link(path, strlen(path) TSRMLS_CC);
- retval = lstat(new_state.cwd, buf);
+ retval = lstat(p, buf);
CWD_STATE_FREE(new_state);
return retval;
Index: TSRM/tsrm_virtual_cwd.h
diff -u TSRM/tsrm_virtual_cwd.h:1.20 TSRM/tsrm_virtual_cwd.h:1.21
--- TSRM/tsrm_virtual_cwd.h:1.20Thu Oct 3 21:04:00 2002
+++ TSRM/tsrm_virtual_cwd.h Mon Oct 21 19:35:28 2002
-17,7 +17,7
+--+
*/
-/* $Id: tsrm_virtual_cwd.h,v 1.20 2002/10/04 01:04:00 sas Exp $ */
+/* $Id: tsrm_virtual_cwd.h,v 1.21 2002/10/21 23:35:28 iliaa Exp $ */
#ifndef VIRTUAL_CWD_H
#define VIRTUAL_CWD_H
-140,6 +140,7
#endif
#if !defined(TSRM_WIN32) !defined(NETWARE)
CWD_API int virtual_lstat(const char *path, struct stat *buf TSRMLS_DC);
+CWD_API char *virtual_link(char *buf, size_t size TSRMLS_DC);
#endif
CWD_API int virtual_unlink(const char *path TSRMLS_DC);
CWD_API int virtual_mkdir(const char *pathname, mode_t mode TSRMLS_DC);
-191,7 +192,7
#define VCWD_RENAME(oldname, newname) virtual_rename(oldname, newname TSRMLS_CC)
#define VCWD_STAT(path, buff) virtual_stat(path, buff TSRMLS_CC)
#if !defined(TSRM_WIN32) !defined(NETWARE)
-#define VCWD_LSTAT(path, buff) virtual_stat(path, buff TSRMLS_CC)
+#define VCWD_LSTAT(path, buff) virtual_lstat(path, buff TSRMLS_CC)
#else
#define VCWD_LSTAT(path, buff) virtual_lstat(path, buff TSRMLS_CC)
#endif
Index: php4/ext/standard/link.c
diff -u php4/ext/standard/link.c:1.40 php4/ext/standard/link.c:1.41
--- php4/ext/standard/link.c:1.40 Fri Sep 6 03:30:51 2002
+++ php4/ext/standard/link.cMon Oct 21 19:35:29 2002
-16,7 +16,7
+--+
*/
-/* $Id: link.c,v 1.40 2002/09/06 07:30:51 derick Exp $ */
+/* $Id: link.c,v 1.41 2002/10/21 23:35:29 iliaa Exp $ */
#include php.h
#include php_filestat.h
-57,21 +57,25
PHP_FUNCTION(readlink)
{
zval **filename;
- char buff[256];
+ char buff[MAXPATHLEN];
+ char *p;
int ret;
-
+
if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, filename) == FAILURE) {
WRONG_PARAM_COUNT;
}
convert_to_string_ex(filename);
- ret = readlink(Z_STRVAL_PP(filename), buff, 255);
+ p = virtual_link(Z_STRVAL_PP(filename), Z_STRLEN_PP(filename) TSRMLS_CC);
+
+ ret = readlink(p, buff, MAXPATHLEN-1);
if (ret == -1) {
php_error(E_WARNING, readlink failed (%s), strerror(errno));
RETURN_FALSE;
}
/* Append NULL to the end of the string */
buff[ret] = '\0';
+
RETURN_STRING(buff, 1);
}
/* }}} */
-109,6 +113,8
{
zval **topath, **frompath;
int ret;
+ char source_p[MAXPATHLEN];
+ char dest_p[MAXPATHLEN];
if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, topath, frompath) ==
FAILURE) {
WRONG_PARAM_COUNT;
-116,28 +122,33
[PHP-CVS] cvs: php4 / Makefile.global
yohgaki Mon Oct 21 20:03:49 2002 EDT Modified files: /php4 Makefile.global Log: Hmm. -c options was there, but removed. It is _needed_ for php.ini users uses buffer by default. Index: php4/Makefile.global diff -u php4/Makefile.global:1.30 php4/Makefile.global:1.31 --- php4/Makefile.global:1.30 Tue Oct 8 03:57:29 2002 +++ php4/Makefile.globalMon Oct 21 20:03:49 2002 -48,7 +48,7 test: $(SAPI_CLI_PATH) TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \ - $(top_builddir)/$(SAPI_CLI_PATH) $(top_srcdir)/run-tests.php $(TESTS) + $(top_builddir)/$(SAPI_CLI_PATH) -c $(top_srcdir)/php.ini-dist +$(top_srcdir)/run-tests.php $(TESTS) clean: find . -name \*.lo -o -name \*.o | xargs rm -f -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 / Makefile.global
sniper Mon Oct 21 20:18:26 2002 EDT Modified files: /php4 Makefile.global Log: - Revert the undiscussed change. # # Yasuo, don't you think there was a reason to drop this??? # Please, discuss these things before you go and change something. # Index: php4/Makefile.global diff -u php4/Makefile.global:1.31 php4/Makefile.global:1.32 --- php4/Makefile.global:1.31 Mon Oct 21 20:03:49 2002 +++ php4/Makefile.globalMon Oct 21 20:18:26 2002 -48,7 +48,7 test: $(SAPI_CLI_PATH) TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \ - $(top_builddir)/$(SAPI_CLI_PATH) -c $(top_srcdir)/php.ini-dist $(top_srcdir)/run-tests.php $(TESTS) + $(top_builddir)/$(SAPI_CLI_PATH) $(top_srcdir)/run-tests.php +$(TESTS) clean: find . -name \*.lo -o -name \*.o | xargs rm -f -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] Re: cvs: php4 / Makefile.global
(BJani Taskinen wrote: (B sniperMon Oct 21 20:18:26 2002 EDT (B (B Modified files: (B /php4 Makefile.global (B Log: (B - Revert the undiscussed change. (B # (B # Yasuo, don't you think there was a reason to drop this??? (B # Please, discuss these things before you go and change something. (B # (B (BOk. I didn't see discussion for dropping -c option :) (BWhat's the reason? (B (B-- (BYasuo Ohgaki (B (B (B (B-- (BPHP CVS Mailing List (http://www.php.net/) (BTo unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] Re: cvs: php4 / Makefile.global
Ah. I see. (B (BPrevious commit made by Derick is bogus :) (BThe -c option does not make tests depend on php.ini-dest. (BOnly php executable running run-tests.php use it. (B (BTherefore, tests scripts are _not_ depended on php.ini-dest. (Bi.e. actual test script is using whatever php.ini users (Bare using. (B (BSee run-tests.php (B (BBTW, are you guys ever tried to use php.ini-recommended (Bas your default? (B (B-- (BYasuo Ohgaki (B (BJani Taskinen wrote: (B sniperMon Oct 21 20:18:26 2002 EDT (B (B Modified files: (B /php4 Makefile.global (B Log: (B - Revert the undiscussed change. (B # (B # Yasuo, don't you think there was a reason to drop this??? (B # Please, discuss these things before you go and change something. (B # (B (B (B-- (BPHP CVS Mailing List (http://www.php.net/) (BTo unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] Re: cvs: php4 / Makefile.global
Shane Caraveo wrote: Yasuo Ohgaki wrote: Jani Taskinen wrote: sniper Mon Oct 21 20:18:26 2002 EDT Modified files: /php4 Makefile.global Log: - Revert the undiscussed change. # # Yasuo, don't you think there was a reason to drop this??? # Please, discuss these things before you go and change something. # Ok. I didn't see discussion for dropping -c option :) What's the reason? -- Yasuo Ohgaki I don't recall seeing any discussion on removing -c either, can you point me to the archive of the thread? Shane Nice loop ;) -- Yasuo Ohgaki -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] Re: cvs: php4 / Makefile.global
On Tue, 22 Oct 2002, Yasuo Ohgaki wrote: Jani Taskinen wrote: sniper Mon Oct 21 20:18:26 2002 EDT Modified files: /php4Makefile.global Log: - Revert the undiscussed change. # # Yasuo, don't you think there was a reason to drop this??? # Please, discuss these things before you go and change something. # Ok. I didn't see discussion for dropping -c option :) What's the reason? Duh..can't find that discussion now. Not sure on which list it was on. But I do remember that such discussion took place some time ago. Basically it was about how different php.ini's affect the tests and that we shouldn't default to our basic one. Someone also added the posibility to override some ini-settings in the .phpt files if needed. --Jani -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] Re: cvs: php4 / Makefile.global
On Tue, 22 Oct 2002, Yasuo Ohgaki wrote: Previous commit made by Derick is bogus :) The -c option does not make tests depend on php.ini-dest. Only php executable running run-tests.php use it. Of course. Maybe we shouldn't use ANY ini file? :) Therefore, tests scripts are _not_ depended on php.ini-dest. i.e. actual test script is using whatever php.ini users are using. True. --Jani -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] Re: cvs: php4 / Makefile.global
Just making sure. No objections using php.ini-dist _only for_ run-tests.php? PS: This is the 3rd time I've trird to fix buffering issue with run-tests.php and php.ini-recommended :) -- Yasuo Ohgaki Jani Taskinen wrote: On Tue, 22 Oct 2002, Yasuo Ohgaki wrote: Previous commit made by Derick is bogus :) The -c option does not make tests depend on php.ini-dest. Only php executable running run-tests.php use it. Of course. Maybe we shouldn't use ANY ini file? :) Therefore, tests scripts are _not_ depended on php.ini-dest. i.e. actual test script is using whatever php.ini users are using. True. --Jani -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
