[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/mssql php_mssql.c
iliaa Wed Mar 5 23:53:24 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/mssql php_mssql.c
/php-srcNEWS
Log:
MFB: Revert patch for bug #44325
http://cvs.php.net/viewvc.cgi/php-src/ext/mssql/php_mssql.c?r1=1.152.2.13.2.7&r2=1.152.2.13.2.8&diff_format=u
Index: php-src/ext/mssql/php_mssql.c
diff -u php-src/ext/mssql/php_mssql.c:1.152.2.13.2.7
php-src/ext/mssql/php_mssql.c:1.152.2.13.2.8
--- php-src/ext/mssql/php_mssql.c:1.152.2.13.2.7Tue Mar 4 19:39:08 2008
+++ php-src/ext/mssql/php_mssql.c Wed Mar 5 23:53:23 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_mssql.c,v 1.152.2.13.2.7 2008/03/04 19:39:08 iliaa Exp $ */
+/* $Id: php_mssql.c,v 1.152.2.13.2.8 2008/03/05 23:53:23 iliaa Exp $ */
#ifdef COMPILE_DL_MSSQL
#define HAVE_MSSQL 1
@@ -2063,19 +2063,14 @@
/* modify datalen and maxlen according to dbrpcparam documentation */
if ( (type==SQLVARCHAR) || (type==SQLCHAR) || (type==SQLTEXT) ) {
/* variable-length type */
- if (is_null || Z_TYPE_PP(var) == IS_NULL) {
+ if (is_null) {
maxlen=0;
datalen=0;
- } else {
+ }
+ else {
convert_to_string_ex(var);
- datalen = Z_STRLEN_PP(var);
- value = (LPBYTE)Z_STRVAL_PP(var);
- if (!datalen) {
- datalen = 1;
- if (maxlen == -1) {
- maxlen = 1;
- }
- }
+ datalen=Z_STRLEN_PP(var);
+ value=(LPBYTE)Z_STRVAL_PP(var);
}
}
else{ /* fixed-length type */
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1109&r2=1.2027.2.547.2.1110&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1109 php-src/NEWS:1.2027.2.547.2.1110
--- php-src/NEWS:1.2027.2.547.2.1109Wed Mar 5 21:09:29 2008
+++ php-src/NEWSWed Mar 5 23:53:23 2008
@@ -3,8 +3,6 @@
?? Mar 2008, PHP 5.2.6
- Fixed bug #44333 (SEGFAULT when using mysql_pconnect() with client_flags).
(Felipe)
-- Fixed bug #44325 (mssql_bind not correctly bind empty strings as parameter
- value). (Ilia)
- Fixed bug #44306 (Better detection of MIPS processors on Windows). (Ilia)
- Fixed bug #44166 (Parameter handling flaw in PDO::getAvailableDrivers()).
(Ilia)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mssql php_mssql.c
iliaa Wed Mar 5 23:52:56 2008 UTC
Modified files:
/php-src/ext/mssql php_mssql.c
Log:
MFB: Revert patch for bug #44325
http://cvs.php.net/viewvc.cgi/php-src/ext/mssql/php_mssql.c?r1=1.173&r2=1.174&diff_format=u
Index: php-src/ext/mssql/php_mssql.c
diff -u php-src/ext/mssql/php_mssql.c:1.173 php-src/ext/mssql/php_mssql.c:1.174
--- php-src/ext/mssql/php_mssql.c:1.173 Tue Mar 4 19:39:33 2008
+++ php-src/ext/mssql/php_mssql.c Wed Mar 5 23:52:56 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_mssql.c,v 1.173 2008/03/04 19:39:33 iliaa Exp $ */
+/* $Id: php_mssql.c,v 1.174 2008/03/05 23:52:56 iliaa Exp $ */
#ifdef COMPILE_DL_MSSQL
#define HAVE_MSSQL 1
@@ -2056,19 +2056,14 @@
/* modify datalen and maxlen according to dbrpcparam documentation */
if ( (type==SQLVARCHAR) || (type==SQLCHAR) || (type==SQLTEXT) ) {
/* variable-length type */
- if (is_null || Z_TYPE_PP(var) == IS_NULL) {
+ if (is_null) {
maxlen=0;
datalen=0;
- } else {
+ }
+ else {
convert_to_string_ex(var);
- datalen = Z_STRLEN_PP(var);
- value = (LPBYTE)Z_STRVAL_PP(var);
- if (!datalen) {
- datalen = 1;
- if (maxlen == -1) {
- maxlen = 1;
- }
- }
+ datalen=Z_STRLEN_PP(var);
+ value=(LPBYTE)Z_STRVAL_PP(var);
}
}
else{ /* fixed-length type */
--
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/mssql php_mssql.c
iliaa Wed Mar 5 23:52:45 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mssql php_mssql.c
Log:
Revert patch for bug #44325
http://cvs.php.net/viewvc.cgi/php-src/ext/mssql/php_mssql.c?r1=1.152.2.13.2.4.2.5&r2=1.152.2.13.2.4.2.6&diff_format=u
Index: php-src/ext/mssql/php_mssql.c
diff -u php-src/ext/mssql/php_mssql.c:1.152.2.13.2.4.2.5
php-src/ext/mssql/php_mssql.c:1.152.2.13.2.4.2.6
--- php-src/ext/mssql/php_mssql.c:1.152.2.13.2.4.2.5Tue Mar 4 19:38:38 2008
+++ php-src/ext/mssql/php_mssql.c Wed Mar 5 23:52:45 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_mssql.c,v 1.152.2.13.2.4.2.5 2008/03/04 19:38:38 iliaa Exp $ */
+/* $Id: php_mssql.c,v 1.152.2.13.2.4.2.6 2008/03/05 23:52:45 iliaa Exp $ */
#ifdef COMPILE_DL_MSSQL
#define HAVE_MSSQL 1
@@ -2067,19 +2067,14 @@
/* modify datalen and maxlen according to dbrpcparam documentation */
if ( (type==SQLVARCHAR) || (type==SQLCHAR) || (type==SQLTEXT) ) {
/* variable-length type */
- if (is_null || Z_TYPE_PP(var) == IS_NULL) {
+ if (is_null) {
maxlen=0;
datalen=0;
- } else {
+ }
+ else {
convert_to_string_ex(var);
- datalen = Z_STRLEN_PP(var);
- value = (LPBYTE)Z_STRVAL_PP(var);
- if (!datalen) {
- datalen = 1;
- if (maxlen == -1) {
- maxlen = 1;
- }
- }
+ datalen=Z_STRLEN_PP(var);
+ value=(LPBYTE)Z_STRVAL_PP(var);
}
}
else{ /* fixed-length type */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main main.c
pajoye Wed Mar 5 21:20:14 2008 UTC
Modified files:
/php-src/main main.c
Log:
- MFB: #42505, new sendmail default path breaks on Novell (Guenter Knauf)
http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.761&r2=1.762&diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.761 php-src/main/main.c:1.762
--- php-src/main/main.c:1.761 Wed Mar 5 13:35:02 2008
+++ php-src/main/main.c Wed Mar 5 21:20:14 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: main.c,v 1.761 2008/03/05 13:35:02 dmitry Exp $ */
+/* $Id: main.c,v 1.762 2008/03/05 21:20:14 pajoye Exp $ */
/* {{{ includes
*/
@@ -460,9 +460,8 @@
* PHP_INCLUDE_PATH
*/
-#if defined(PHP_PROG_SENDMAIL) && !defined(NETWARE)
-# define DEFAULT_SENDMAIL_PATH PHP_PROG_SENDMAIL " -t -i "
-#elif defined(PHP_WIN32)
+/* Windows and Netware use the internal mail */
+#if defined(PHP_WIN32) || defined(NETWARE)
# define DEFAULT_SENDMAIL_PATH NULL
#else
# define DEFAULT_SENDMAIL_PATH "/usr/sbin/sendmail -t -i"
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard info.c
pajoye Wed Mar 5 21:18:26 2008 UTC
Modified files:
/php-src/ext/standard info.c
Log:
- MFB: #40013, php_uname() does not return nodename on Netware
(Guenter Knauf)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/info.c?r1=1.286&r2=1.287&diff_format=u
Index: php-src/ext/standard/info.c
diff -u php-src/ext/standard/info.c:1.286 php-src/ext/standard/info.c:1.287
--- php-src/ext/standard/info.c:1.286 Sun Mar 2 15:36:24 2008
+++ php-src/ext/standard/info.c Wed Mar 5 21:18:26 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: info.c,v 1.286 2008/03/02 15:36:24 iliaa Exp $ */
+/* $Id: info.c,v 1.287 2008/03/05 21:18:26 pajoye Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -425,6 +425,30 @@
if (uname((struct utsname *)&buf) == -1) {
php_uname = PHP_UNAME;
} else {
+#ifdef NETWARE
+ if (mode == 's') {
+ php_uname = buf.sysname;
+ } else if (mode == 'r') {
+ snprintf(tmp_uname, sizeof(tmp_uname), "%d.%d.%d",
+buf.netware_major, buf.netware_minor,
buf.netware_revision);
+ php_uname = tmp_uname;
+ } else if (mode == 'n') {
+ php_uname = buf.servername;
+ } else if (mode == 'v') {
+ snprintf(tmp_uname, sizeof(tmp_uname), "libc-%d.%d.%d
#%d",
+buf.libmajor, buf.libminor,
buf.librevision, buf.libthreshold);
+ php_uname = tmp_uname;
+ } else if (mode == 'm') {
+ php_uname = buf.machine;
+ } else { /* assume mode == 'a' */
+ snprintf(tmp_uname, sizeof(tmp_uname), "%s %s %d.%d.%d
libc-%d.%d.%d #%d %s",
+buf.sysname, buf.servername,
+buf.netware_major, buf.netware_minor,
buf.netware_revision,
+buf.libmajor, buf.libminor,
buf.librevision, buf.libthreshold,
+buf.machine);
+ php_uname = tmp_uname;
+ }
+#else
if (mode == 's') {
php_uname = buf.sysname;
} else if (mode == 'r') {
@@ -441,6 +465,7 @@
buf.machine);
php_uname = tmp_uname;
}
+#endif /* NETWARE */
}
#else
php_uname = PHP_UNAME;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/standard info.c
pajoye Wed Mar 5 21:09:29 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-srcNEWS
/php-src/ext/standard info.c
Log:
- #40013, php_uname() does not return nodename on Netware (Guenter Knauf)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1108&r2=1.2027.2.547.2.1109&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1108 php-src/NEWS:1.2027.2.547.2.1109
--- php-src/NEWS:1.2027.2.547.2.1108Wed Mar 5 20:58:08 2008
+++ php-src/NEWSWed Mar 5 21:09:29 2008
@@ -10,6 +10,8 @@
(Ilia)
- Fixed bug #42505 (new sendmail default breaks on Netware platform)
(Guenter Knauf)
+- Fixed bug #40013 (php_uname() does not return nodename on Netware
+ (Guenter Knauf)
27 Feb 2008, PHP 5.2.6RC1
- Fixed security issue detailed in CVE-2008-0599. (Rasmus)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/info.c?r1=1.249.2.10.2.16&r2=1.249.2.10.2.17&diff_format=u
Index: php-src/ext/standard/info.c
diff -u php-src/ext/standard/info.c:1.249.2.10.2.16
php-src/ext/standard/info.c:1.249.2.10.2.17
--- php-src/ext/standard/info.c:1.249.2.10.2.16 Sun Mar 2 15:36:09 2008
+++ php-src/ext/standard/info.c Wed Mar 5 21:09:29 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: info.c,v 1.249.2.10.2.16 2008/03/02 15:36:09 iliaa Exp $ */
+/* $Id: info.c,v 1.249.2.10.2.17 2008/03/05 21:09:29 pajoye Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -326,6 +326,30 @@
if (uname((struct utsname *)&buf) == -1) {
php_uname = PHP_UNAME;
} else {
+#ifdef NETWARE
+ if (mode == 's') {
+ php_uname = buf.sysname;
+ } else if (mode == 'r') {
+ snprintf(tmp_uname, sizeof(tmp_uname), "%d.%d.%d",
+buf.netware_major, buf.netware_minor,
buf.netware_revision);
+ php_uname = tmp_uname;
+ } else if (mode == 'n') {
+ php_uname = buf.servername;
+ } else if (mode == 'v') {
+ snprintf(tmp_uname, sizeof(tmp_uname), "libc-%d.%d.%d
#%d",
+buf.libmajor, buf.libminor,
buf.librevision, buf.libthreshold);
+ php_uname = tmp_uname;
+ } else if (mode == 'm') {
+ php_uname = buf.machine;
+ } else { /* assume mode == 'a' */
+ snprintf(tmp_uname, sizeof(tmp_uname), "%s %s %d.%d.%d
libc-%d.%d.%d #%d %s",
+buf.sysname, buf.servername,
+buf.netware_major, buf.netware_minor,
buf.netware_revision,
+buf.libmajor, buf.libminor,
buf.librevision, buf.libthreshold,
+buf.machine);
+ php_uname = tmp_uname;
+ }
+#else
if (mode == 's') {
php_uname = buf.sysname;
} else if (mode == 'r') {
@@ -342,6 +366,7 @@
buf.machine);
php_uname = tmp_uname;
}
+#endif /* NETWARE */
}
#else
php_uname = PHP_UNAME;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /main main.c
pajoye Wed Mar 5 20:58:08 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-srcNEWS
/php-src/main main.c
Log:
- #42505, new sendmail default path breaks on Novell (Guenter Knauf)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1107&r2=1.2027.2.547.2.1108&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1107 php-src/NEWS:1.2027.2.547.2.1108
--- php-src/NEWS:1.2027.2.547.2.1107Wed Mar 5 10:46:46 2008
+++ php-src/NEWSWed Mar 5 20:58:08 2008
@@ -8,6 +8,8 @@
- Fixed bug #44306 (Better detection of MIPS processors on Windows). (Ilia)
- Fixed bug #44166 (Parameter handling flaw in PDO::getAvailableDrivers()).
(Ilia)
+- Fixed bug #42505 (new sendmail default breaks on Netware platform)
+ (Guenter Knauf)
27 Feb 2008, PHP 5.2.6RC1
- Fixed security issue detailed in CVE-2008-0599. (Rasmus)
http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.640.2.23.2.61&r2=1.640.2.23.2.62&diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.640.2.23.2.61 php-src/main/main.c:1.640.2.23.2.62
--- php-src/main/main.c:1.640.2.23.2.61 Mon Dec 31 07:20:15 2007
+++ php-src/main/main.c Wed Mar 5 20:58:08 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: main.c,v 1.640.2.23.2.61 2007/12/31 07:20:15 sebastian Exp $ */
+/* $Id: main.c,v 1.640.2.23.2.62 2008/03/05 20:58:08 pajoye Exp $ */
/* {{{ includes
*/
@@ -352,9 +352,8 @@
# define PHP_SAFE_MODE_EXEC_DIR ""
#endif
-#if defined(PHP_PROG_SENDMAIL) && !defined(NETWARE)
-# define DEFAULT_SENDMAIL_PATH PHP_PROG_SENDMAIL " -t -i "
-#elif defined(PHP_WIN32)
+/* Windows and Netware use the internal mail */
+#if defined(PHP_WIN32) || defined(NETWARE)
# define DEFAULT_SENDMAIL_PATH NULL
#else
# define DEFAULT_SENDMAIL_PATH "/usr/sbin/sendmail -t -i"
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / run-tests.php
lstrojnyWed Mar 5 20:11:36 2008 UTC Modified files: /php-srcrun-tests.php Log: Using new magic constant __DIR__ in run-tests.php http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.343&r2=1.344&diff_format=u Index: php-src/run-tests.php diff -u php-src/run-tests.php:1.343 php-src/run-tests.php:1.344 --- php-src/run-tests.php:1.343 Sat Feb 23 18:41:31 2008 +++ php-src/run-tests.php Wed Mar 5 20:11:35 2008 @@ -24,7 +24,7 @@ +--+ */ -/* $Id: run-tests.php,v 1.343 2008/02/23 18:41:31 felipe Exp $ */ +/* $Id: run-tests.php,v 1.344 2008/03/05 20:11:35 lstrojny Exp $ */ /* Sanity check to ensure that pcre extension needed by this script is available. * In the event it is not, print a nice error message indicating that this script will @@ -186,7 +186,7 @@ global $cwd, $php, $php_cgi, $php_info, $user_tests, $ini_overwrites, $pass_options, $exts_to_test, $leak_check, $valgrind_header; // Get info from php - $info_file = realpath(dirname(__FILE__)) . '/run-test-info.php'; + $info_file = __DIR__ . '/run-test-info.php'; @unlink($info_file); $php_info = 'http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / run-tests.php
lstrojnyWed Mar 5 20:10:12 2008 UTC Modified files: (Branch: PHP_5_3) /php-srcrun-tests.php Log: Using new magic constant __DIR__ in run-tests.php http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.17&r2=1.226.2.37.2.35.2.18&diff_format=u Index: php-src/run-tests.php diff -u php-src/run-tests.php:1.226.2.37.2.35.2.17 php-src/run-tests.php:1.226.2.37.2.35.2.18 --- php-src/run-tests.php:1.226.2.37.2.35.2.17 Sun Feb 24 12:17:25 2008 +++ php-src/run-tests.php Wed Mar 5 20:10:12 2008 @@ -24,7 +24,7 @@ +--+ */ -/* $Id: run-tests.php,v 1.226.2.37.2.35.2.17 2008/02/24 12:17:25 felipe Exp $ */ +/* $Id: run-tests.php,v 1.226.2.37.2.35.2.18 2008/03/05 20:10:12 lstrojny Exp $ */ /* Sanity check to ensure that pcre extension needed by this script is available. * In the event it is not, print a nice error message indicating that this script will @@ -198,7 +198,7 @@ global $cwd, $php, $php_cgi, $php_info, $user_tests, $ini_overwrites, $pass_options, $exts_to_test, $leak_check, $valgrind_header; // Get info from php - $info_file = realpath(dirname(__FILE__)) . '/run-test-info.php'; + $info_file = __DIR__ . '/run-test-info.php'; @unlink($info_file); $php_info = 'http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
derick Wed Mar 5 19:42:06 2008 UTC Modified files: /CVSROOTavail Log: - php src karma for lars (on request by helly) http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1364&r2=1.1365&diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1364 CVSROOT/avail:1.1365 --- CVSROOT/avail:1.1364Wed Mar 5 17:47:41 2008 +++ CVSROOT/avail Wed Mar 5 19:42:06 2008 @@ -17,7 +17,7 @@ # The PHP Developers have full access to the full source trees for # PHP, as well as the documentation. -avail|dharmap,kraghuba,stevseea,colder,lwe,auroraeosrose,mike,rolland,cawa,msisolak,alan_k,rrichards,tal,mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabob,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,jani,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,raphael,danda,rbb,mboeren,dougm,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,ianh,k.schroeder,dcowgill,jerenkrantz,jay,ddhill,jorton,thetaphi,abies,vincent,goba,dmitry,pajoye,shie,rafi,magnus,tony2001,johannes,dbs,skoduru,nrathna,jesus,gopalv,bjor! i,nlopess,wrowe,shire,zoe,scottmac,t2man,dsp,davidw,ab5602,nicholsr,lsmith,cellog,davidc,felipe,robinf,jmessa,philip,sixd,gwynne|phpfi,php3,php-src,pecl,non-pecl,spl,phpdoc,phpdoc-ar,phpdoc-bg,phpdoc-cs,phpdoc-da,phpdoc-de,phpdoc-el,phpdoc-es,phpdoc-fa_IR,phpdoc-fi,phpdoc-fr,phpdoc-he,phpdoc-hk,phpdoc-hu,phpdoc-id,phpdoc-it,phpdoc-ja,phpdoc-kr,phpdoc-lt,phpdoc-nl,phpdoc-pl,phpdoc-pt_BR,phpdoc-pt,phpdoc-ro,phpdoc-ru,phpdoc-sk,phpdoc-sl,phpdoc-sv,phpdoc-tr,phpdoc-tw,phpdoc-zh,phpdoc-ca,phpdoc-no +avail|lstrojny,dharmap,kraghuba,stevseea,colder,lwe,auroraeosrose,mike,rolland,cawa,msisolak,alan_k,rrichards,tal,mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabob,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,jani,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,raphael,danda,rbb,mboeren,dougm,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,ianh,k.schroeder,dcowgill,jerenkrantz,jay,ddhill,jorton,thetaphi,abies,vincent,goba,dmitry,pajoye,shie,rafi,magnus,tony2001,johannes,dbs,skoduru,nrathna,jesus,go! palv,bjori,nlopess,wrowe,shire,zoe,scottmac,t2man,dsp,davidw,ab5602,nicholsr,lsmith,cellog,davidc,felipe,robinf,jmessa,philip,sixd,gwynne|phpfi,php3,php-src,pecl,non-pecl,spl,phpdoc,phpdoc-ar,phpdoc-bg,phpdoc-cs,phpdoc-da,phpdoc-de,phpdoc-el,phpdoc-es,phpdoc-fa_IR,phpdoc-fi,phpdoc-fr,phpdoc-he,phpdoc-hk,phpdoc-hu,phpdoc-id,phpdoc-it,phpdoc-ja,phpdoc-kr,phpdoc-lt,phpdoc-nl,phpdoc-pl,phpdoc-pt_BR,phpdoc-pt,phpdoc-ro,phpdoc-ru,phpdoc-sk,phpdoc-sl,phpdoc-sv,phpdoc-tr,phpdoc-tw,phpdoc-zh,phpdoc-ca,phpdoc-no # Some people have access to tests in the Engine avail|magnus,michael,zoe,jmessa|Zend/tests,ZendEngine2/tests -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
johannesWed Mar 5 17:47:41 2008 UTC Modified files: /CVSROOTavail Log: - Update Gwynne http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1363&r2=1.1364&diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1363 CVSROOT/avail:1.1364 --- CVSROOT/avail:1.1363Tue Mar 4 21:51:38 2008 +++ CVSROOT/avail Wed Mar 5 17:47:41 2008 @@ -17,7 +17,7 @@ # The PHP Developers have full access to the full source trees for # PHP, as well as the documentation. -avail|dharmap,kraghuba,stevseea,colder,lwe,auroraeosrose,mike,rolland,cawa,msisolak,alan_k,rrichards,tal,mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabob,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,jani,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,raphael,danda,rbb,mboeren,dougm,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,ianh,k.schroeder,dcowgill,jerenkrantz,jay,ddhill,jorton,thetaphi,abies,vincent,goba,dmitry,pajoye,shie,rafi,magnus,tony2001,johannes,dbs,skoduru,nrathna,jesus,gopalv,bjor! i,nlopess,wrowe,shire,zoe,scottmac,t2man,dsp,davidw,ab5602,nicholsr,lsmith,cellog,davidc,felipe,robinf,jmessa,philip,sixd|phpfi,php3,php-src,pecl,non-pecl,spl,phpdoc,phpdoc-ar,phpdoc-bg,phpdoc-cs,phpdoc-da,phpdoc-de,phpdoc-el,phpdoc-es,phpdoc-fa_IR,phpdoc-fi,phpdoc-fr,phpdoc-he,phpdoc-hk,phpdoc-hu,phpdoc-id,phpdoc-it,phpdoc-ja,phpdoc-kr,phpdoc-lt,phpdoc-nl,phpdoc-pl,phpdoc-pt_BR,phpdoc-pt,phpdoc-ro,phpdoc-ru,phpdoc-sk,phpdoc-sl,phpdoc-sv,phpdoc-tr,phpdoc-tw,phpdoc-zh,phpdoc-ca,phpdoc-no +avail|dharmap,kraghuba,stevseea,colder,lwe,auroraeosrose,mike,rolland,cawa,msisolak,alan_k,rrichards,tal,mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabob,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,jani,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,raphael,danda,rbb,mboeren,dougm,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,ianh,k.schroeder,dcowgill,jerenkrantz,jay,ddhill,jorton,thetaphi,abies,vincent,goba,dmitry,pajoye,shie,rafi,magnus,tony2001,johannes,dbs,skoduru,nrathna,jesus,gopalv,bjor! i,nlopess,wrowe,shire,zoe,scottmac,t2man,dsp,davidw,ab5602,nicholsr,lsmith,cellog,davidc,felipe,robinf,jmessa,philip,sixd,gwynne|phpfi,php3,php-src,pecl,non-pecl,spl,phpdoc,phpdoc-ar,phpdoc-bg,phpdoc-cs,phpdoc-da,phpdoc-de,phpdoc-el,phpdoc-es,phpdoc-fa_IR,phpdoc-fi,phpdoc-fr,phpdoc-he,phpdoc-hk,phpdoc-hu,phpdoc-id,phpdoc-it,phpdoc-ja,phpdoc-kr,phpdoc-lt,phpdoc-nl,phpdoc-pl,phpdoc-pt_BR,phpdoc-pt,phpdoc-ro,phpdoc-ru,phpdoc-sk,phpdoc-sl,phpdoc-sv,phpdoc-tr,phpdoc-tw,phpdoc-zh,phpdoc-ca,phpdoc-no # Some people have access to tests in the Engine avail|magnus,michael,zoe,jmessa|Zend/tests,ZendEngine2/tests @@ -45,7 +45,7 @@ # The PHP Documentation Group maintains the documentation and its # translations. -avail|lucas,jmertic,bobby,takagi,gcc,cem,mfp,ansriniv,jsgoupil,mazzanet,dbs,frogger,coldocean,alan_k,fleaslob,torben,lynch,kk,ted,paul,mbritton,coar,joey,bibi,mrobinso,perugini,tzwenny,hirokawa,drews,paulsen,hartmann,leon,jonen,tschuer,tfromm,manuel,stas,danbeck,sli,jmcastagnetto,mohrt,goba,samesch,jon,soneca,ronabop,glace,latoserver,rafael,jan,jcmeloni,chrullrich,mk,sebastian,troels,mathieu,phaethon,mj,corean,pandach,cycle98,vizvil,regina,cynic,jpm,dams,karoora,pcraft,suvia,zak,zimt,jmoore,ftfuture,ag315,bbonev,afortaleza,neotron,cg,delrom,jkj,hellekin,kgergely,cnewbill,fuzzy74,bjoern,fams,smasiello,dim,lucasr,cpereira,ernani,theseer,noribsd,subjective,ufux,hadar_p,asautins,dbenson,aleczapka,tom,amiller,cortesi,rarruda,betz,philip,alindeman,thyla,cucinato,zyprexia,tpug,mitja,conni,sts,georg,nmav,subbie,leszek,spheroid,slawek,alan_dangelo,ae,nohn,kaser01,visualmind,kurtz,luk,tronic,moh,bernd,yohgaki,fujimoto,gerzson,webler,spooky,cece,daniel,boo,nhoizey,joerg,imajes,hakan,c! hief977,shlomi,raful,yuval,tomer,barak,ido,mork,lior,gal,adiju,cr_depend,florian,kappu,muricaru,dt,critix,ck,costra,fancao0515,tibee,eriksson,wenz,bs,anderson,tal,sander,matroz,ave,adu,mmeier,wentzel,scaro,aspinei,lmaxcar,manuzhai,darvina,peter,maxim,romakhin,n0nick,attila,sagi,kai,microbrain,
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard/tests/array array_key_exists_variation4.phpt array_merge_variation9.phpt array_push_variation4.phpt array_slice_variation9.phpt array_values_variation6.ph
janiWed Mar 5 15:37:53 2008 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/standard/tests/array array_key_exists_variation4.phpt array_merge_variation9.phpt array_push_variation4.phpt array_slice_variation9.phpt array_values_variation6.phpt each_variation4.phpt rsort_variation4.phpt Log: MF53: Fix tests http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_key_exists_variation4.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u Index: php-src/ext/standard/tests/array/array_key_exists_variation4.phpt diff -u php-src/ext/standard/tests/array/array_key_exists_variation4.phpt:1.1.2.2 php-src/ext/standard/tests/array/array_key_exists_variation4.phpt:1.1.2.3 --- php-src/ext/standard/tests/array/array_key_exists_variation4.phpt:1.1.2.2 Wed Feb 13 13:15:11 2008 +++ php-src/ext/standard/tests/array/array_key_exists_variation4.phpt Wed Mar 5 15:37:53 2008 @@ -1,5 +1,7 @@ --TEST-- Test array_key_exists() function : usage variations - referenced variables +--INI-- +allow_call_time_pass_reference=on --FILE-- http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_merge_variation9.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u Index: php-src/ext/standard/tests/array/array_merge_variation9.phpt diff -u php-src/ext/standard/tests/array/array_merge_variation9.phpt:1.1.2.2 php-src/ext/standard/tests/array/array_merge_variation9.phpt:1.1.2.3 --- php-src/ext/standard/tests/array/array_merge_variation9.phpt:1.1.2.2 Wed Feb 13 14:20:22 2008 +++ php-src/ext/standard/tests/array/array_merge_variation9.phptWed Mar 5 15:37:53 2008 @@ -1,5 +1,7 @@ --TEST-- Test array_merge() function : usage variations - referenced variables +--INI-- +allow_call_time_pass_reference=on --FILE-- string(4) "val3" } -Done \ No newline at end of file +Done http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_push_variation4.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u Index: php-src/ext/standard/tests/array/array_push_variation4.phpt diff -u php-src/ext/standard/tests/array/array_push_variation4.phpt:1.1.2.2 php-src/ext/standard/tests/array/array_push_variation4.phpt:1.1.2.3 --- php-src/ext/standard/tests/array/array_push_variation4.phpt:1.1.2.2 Thu Feb 14 08:46:08 2008 +++ php-src/ext/standard/tests/array/array_push_variation4.phpt Wed Mar 5 15:37:53 2008 @@ -1,5 +1,7 @@ --TEST-- Test array_push() function : usage variations - referenced variables +--INI-- +allow_call_time_pass_reference=on --FILE-- http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_slice_variation9.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u Index: php-src/ext/standard/tests/array/array_slice_variation9.phpt diff -u php-src/ext/standard/tests/array/array_slice_variation9.phpt:1.1.2.2 php-src/ext/standard/tests/array/array_slice_variation9.phpt:1.1.2.3 --- php-src/ext/standard/tests/array/array_slice_variation9.phpt:1.1.2.2 Thu Feb 14 11:15:53 2008 +++ php-src/ext/standard/tests/array/array_slice_variation9.phptWed Mar 5 15:37:53 2008 @@ -1,5 +1,7 @@ --TEST-- Test array_slice() function : usage variations - referenced variables +--INI-- +allow_call_time_pass_reference=on --FILE-- int(3) } -Done \ No newline at end of file +Done http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_values_variation6.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u Index: php-src/ext/standard/tests/array/array_values_variation6.phpt diff -u php-src/ext/standard/tests/array/array_values_variation6.phpt:1.1.2.2 php-src/ext/standard/tests/array/array_values_variation6.phpt:1.1.2.3 --- php-src/ext/standard/tests/array/array_values_variation6.phpt:1.1.2.2 Thu Feb 14 14:21:48 2008 +++ php-src/ext/standard/tests/array/array_values_variation6.phpt Wed Mar 5 15:37:53 2008 @@ -1,5 +1,7 @@ --TEST-- Test array_values() function : usage variations - Referenced variables +--INI-- +allow_call_time_pass_reference=on --FILE-- int(3) } -Done \ No newline at end of file +Done http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/each_variation4.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u Index: php-src/ext/standard/tests/array/each_variation4.phpt diff -u php-src/ext/standard/tests/array/each_variation4.phpt:1.1.2.1 php-src/ext/standard/tests/array/each_variation4.phpt:1.1.2.2 --- php-src/ext/standard/tests/array/each_variation4.phpt:1.1.2.1 Tue Feb 19 17:00:57 2008 +++ php-src/ext/standard/tests/array/each_variation4.phpt Wed Mar 5 15:37:53 2008 @@ -1,5 +1,7 @@ --TEST-- Test each() function : usage variations - Referenced variables +--INI-- +allow_call_time_pass_reference=on --FILE-- string(3) "two" } -Done \ No newline at end of file +Done http://cvs.php.net/
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard/tests/array array_key_exists_variation4.phpt array_merge_variation9.phpt array_push_variation4.phpt array_slice_variation9.phpt array_values_variation6.ph
janiWed Mar 5 15:37:49 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/standard/tests/array array_key_exists_variation4.phpt array_merge_variation9.phpt array_push_variation4.phpt array_slice_variation9.phpt array_values_variation6.phpt each_variation4.phpt rsort_variation4.phpt Log: - Fix tests (allow_call_time_pass_reference might be off for properly configured sites.. :) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_key_exists_variation4.phpt?r1=1.1.4.2&r2=1.1.4.3&diff_format=u Index: php-src/ext/standard/tests/array/array_key_exists_variation4.phpt diff -u php-src/ext/standard/tests/array/array_key_exists_variation4.phpt:1.1.4.2 php-src/ext/standard/tests/array/array_key_exists_variation4.phpt:1.1.4.3 --- php-src/ext/standard/tests/array/array_key_exists_variation4.phpt:1.1.4.2 Wed Feb 13 13:16:20 2008 +++ php-src/ext/standard/tests/array/array_key_exists_variation4.phpt Wed Mar 5 15:37:48 2008 @@ -1,5 +1,7 @@ --TEST-- Test array_key_exists() function : usage variations - referenced variables +--INI-- +allow_call_time_pass_reference=on --FILE-- http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_merge_variation9.phpt?r1=1.1.4.2&r2=1.1.4.3&diff_format=u Index: php-src/ext/standard/tests/array/array_merge_variation9.phpt diff -u php-src/ext/standard/tests/array/array_merge_variation9.phpt:1.1.4.2 php-src/ext/standard/tests/array/array_merge_variation9.phpt:1.1.4.3 --- php-src/ext/standard/tests/array/array_merge_variation9.phpt:1.1.4.2 Wed Feb 13 14:20:58 2008 +++ php-src/ext/standard/tests/array/array_merge_variation9.phptWed Mar 5 15:37:48 2008 @@ -1,5 +1,7 @@ --TEST-- Test array_merge() function : usage variations - referenced variables +--INI-- +allow_call_time_pass_reference=on --FILE-- string(4) "val3" } -Done \ No newline at end of file +Done http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_push_variation4.phpt?r1=1.1.4.2&r2=1.1.4.3&diff_format=u Index: php-src/ext/standard/tests/array/array_push_variation4.phpt diff -u php-src/ext/standard/tests/array/array_push_variation4.phpt:1.1.4.2 php-src/ext/standard/tests/array/array_push_variation4.phpt:1.1.4.3 --- php-src/ext/standard/tests/array/array_push_variation4.phpt:1.1.4.2 Wed Feb 13 16:12:48 2008 +++ php-src/ext/standard/tests/array/array_push_variation4.phpt Wed Mar 5 15:37:48 2008 @@ -1,5 +1,7 @@ --TEST-- Test array_push() function : usage variations - referenced variables +--INI-- +allow_call_time_pass_reference=on --FILE-- http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_slice_variation9.phpt?r1=1.1.4.2&r2=1.1.4.3&diff_format=u Index: php-src/ext/standard/tests/array/array_slice_variation9.phpt diff -u php-src/ext/standard/tests/array/array_slice_variation9.phpt:1.1.4.2 php-src/ext/standard/tests/array/array_slice_variation9.phpt:1.1.4.3 --- php-src/ext/standard/tests/array/array_slice_variation9.phpt:1.1.4.2 Thu Feb 14 11:17:36 2008 +++ php-src/ext/standard/tests/array/array_slice_variation9.phptWed Mar 5 15:37:48 2008 @@ -1,5 +1,7 @@ --TEST-- Test array_slice() function : usage variations - referenced variables +--INI-- +allow_call_time_pass_reference=on --FILE-- int(3) } -Done \ No newline at end of file +Done http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_values_variation6.phpt?r1=1.1.4.2&r2=1.1.4.3&diff_format=u Index: php-src/ext/standard/tests/array/array_values_variation6.phpt diff -u php-src/ext/standard/tests/array/array_values_variation6.phpt:1.1.4.2 php-src/ext/standard/tests/array/array_values_variation6.phpt:1.1.4.3 --- php-src/ext/standard/tests/array/array_values_variation6.phpt:1.1.4.2 Thu Feb 14 14:22:43 2008 +++ php-src/ext/standard/tests/array/array_values_variation6.phpt Wed Mar 5 15:37:48 2008 @@ -1,5 +1,7 @@ --TEST-- Test array_values() function : usage variations - Referenced variables +--INI-- +allow_call_time_pass_reference=on --FILE-- int(3) } -Done \ No newline at end of file +Done http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/each_variation4.phpt?r1=1.1.4.2&r2=1.1.4.3&diff_format=u Index: php-src/ext/standard/tests/array/each_variation4.phpt diff -u php-src/ext/standard/tests/array/each_variation4.phpt:1.1.4.2 php-src/ext/standard/tests/array/each_variation4.phpt:1.1.4.3 --- php-src/ext/standard/tests/array/each_variation4.phpt:1.1.4.2 Tue Feb 19 17:02:27 2008 +++ php-src/ext/standard/tests/array/each_variation4.phpt Wed Mar 5 15:37:48 2008 @@ -1,5 +1,7 @@ --TEST-- Test each() function : usage variations - Referenced variables +--INI-- +allow_call_time_pass_reference=on --FILE-- s
Re: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/mbstring/tests bug43301.phpt
On Wed, 2008-03-05 at 18:15 +0300, Antony Dovgal wrote: > On 05.03.2008 18:12, Jani Taskinen wrote: > > -Parse error: parse error, expecting `T_VARIABLE' or `'$'' in %s(9) : > > mbregex replace on line %d > > +Parse error: syntax error, unexpected T_LNUMBER, expecting T_VARIABLE or > > '$' in %s/bug43301.php(%d) : mbregex replace on line 1 > > Jani, this error message depends on bison IIRC, so the first one is > correct for MacOS with older bison and the second is correct for newer > versions. This is correct output with bison 2.3 which is propably the most common version around in Linux distros. MacOSX is marginal OS anyway. And like I said in the commit message, this was simply merge from PHP_5_3. Just keeping it in sync here.. -- Patches/Donations: http://pecl.php.net/~jani/ -- 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_2) /ext/mbstring/tests bug43301.phpt
On 05.03.2008 18:12, Jani Taskinen wrote: > -Parse error: parse error, expecting `T_VARIABLE' or `'$'' in %s(9) : mbregex > replace on line %d > +Parse error: syntax error, unexpected T_LNUMBER, expecting T_VARIABLE or '$' > in %s/bug43301.php(%d) : mbregex replace on line 1 Jani, this error message depends on bison IIRC, so the first one is correct for MacOS with older bison and the second is correct for newer versions. -- Wbr, Antony Dovgal -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/mbstring/tests bug43301.phpt
janiWed Mar 5 15:12:27 2008 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/mbstring/tests bug43301.phpt Log: - fix test (MF53) http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/bug43301.phpt?r1=1.1.4.3&r2=1.1.4.4&diff_format=u Index: php-src/ext/mbstring/tests/bug43301.phpt diff -u php-src/ext/mbstring/tests/bug43301.phpt:1.1.4.3 php-src/ext/mbstring/tests/bug43301.phpt:1.1.4.4 --- php-src/ext/mbstring/tests/bug43301.phpt:1.1.4.3Mon Feb 18 14:28:13 2008 +++ php-src/ext/mbstring/tests/bug43301.phptWed Mar 5 15:12:27 2008 @@ -12,11 +12,9 @@ doc; echo mb_ereg_replace($ptr,'$1',$txt,'e'); - ?> --EXPECTF-- -Parse error: parse error, expecting `T_VARIABLE' or `'$'' in %s(9) : mbregex replace on line %d +Parse error: syntax error, unexpected T_LNUMBER, expecting T_VARIABLE or '$' in %s/bug43301.php(%d) : mbregex replace on line 1 Fatal error: mb_ereg_replace(): Failed evaluating code: -$1 in %s on line %d - +$1 in %s/bug43301.php on line %d -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard/tests/file clearstatcache_error.phpt
felipe Wed Mar 5 14:22:07 2008 UTC Modified files: /php-src/ext/standard/tests/fileclearstatcache_error.phpt Log: Fix test http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/clearstatcache_error.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/standard/tests/file/clearstatcache_error.phpt diff -u php-src/ext/standard/tests/file/clearstatcache_error.phpt:1.3 php-src/ext/standard/tests/file/clearstatcache_error.phpt:1.4 --- php-src/ext/standard/tests/file/clearstatcache_error.phpt:1.3 Fri Nov 2 12:57:52 2007 +++ php-src/ext/standard/tests/file/clearstatcache_error.phpt Wed Mar 5 14:22:06 2008 @@ -14,12 +14,12 @@ --EXPECTF-- *** Testing clearstatcache() function: error conditions *** -Warning: Wrong parameter count for clearstatcache() in %s on line %d +Warning: clearstatcache() expects exactly 0 parameters, 1 given in %s on line %d NULL *** Done *** --UEXPECTF-- *** Testing clearstatcache() function: error conditions *** -Warning: Wrong parameter count for clearstatcache() in %s on line %d +Warning: clearstatcache() expects exactly 0 parameters, 1 given in %s on line %d NULL *** Done *** -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main fopen_wrappers.c fopen_wrappers.h main.c ZendEngine2 zend.c zend.h zend_vm_def.h zend_vm_execute.h
dmitry Wed Mar 5 13:35:02 2008 UTC
Modified files:
/ZendEngine2zend.c zend.h zend_vm_def.h zend_vm_execute.h
/php-src/main fopen_wrappers.c fopen_wrappers.h main.c
Log:
Optimized require_once() and include_once() by eliminationg open() syscall on
se
cond usage.
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend.c?r1=1.407&r2=1.408&diff_format=u
Index: ZendEngine2/zend.c
diff -u ZendEngine2/zend.c:1.407 ZendEngine2/zend.c:1.408
--- ZendEngine2/zend.c:1.407Sat Feb 23 17:03:51 2008
+++ ZendEngine2/zend.c Wed Mar 5 13:35:01 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: zend.c,v 1.407 2008/02/23 17:03:51 helly Exp $ */
+/* $Id: zend.c,v 1.408 2008/03/05 13:35:01 dmitry Exp $ */
#include "zend.h"
#include "zend_extensions.h"
@@ -65,6 +65,7 @@
ZEND_API void (*zend_error_cb)(int type, const char *error_filename, const
uint error_lineno, const char *format, va_list args);
int (*zend_vspprintf)(char **pbuf, size_t max_len, const char *format, va_list
ap);
ZEND_API char *(*zend_getenv)(char *name, size_t name_len TSRMLS_DC);
+ZEND_API char *(*zend_resolve_path)(const char *filename, int filename_len
TSRMLS_DC);
void (*zend_on_timeout)(int seconds TSRMLS_DC);
@@ -1067,6 +1068,7 @@
zend_on_timeout = utility_functions->on_timeout;
zend_vspprintf = utility_functions->vspprintf_function;
zend_getenv = utility_functions->getenv_function;
+ zend_resolve_path = utility_functions->resolve_path_function;
zend_compile_file = compile_file;
zend_compile_string = compile_string;
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend.h?r1=1.349&r2=1.350&diff_format=u
Index: ZendEngine2/zend.h
diff -u ZendEngine2/zend.h:1.349 ZendEngine2/zend.h:1.350
--- ZendEngine2/zend.h:1.349Tue Jan 22 09:29:29 2008
+++ ZendEngine2/zend.h Wed Mar 5 13:35:01 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: zend.h,v 1.349 2008/01/22 09:29:29 dmitry Exp $ */
+/* $Id: zend.h,v 1.350 2008/03/05 13:35:01 dmitry Exp $ */
#ifndef ZEND_H
#define ZEND_H
@@ -503,6 +503,7 @@
int (*stream_open_function)(const char *filename, zend_file_handle
*handle TSRMLS_DC);
int (*vspprintf_function)(char **pbuf, size_t max_len, const char
*format, va_list ap);
char *(*getenv_function)(char *name, size_t name_len TSRMLS_DC);
+ char *(*resolve_path_function)(const char *filename, int filename_len
TSRMLS_DC);
} zend_utility_functions;
typedef struct _zend_utility_values {
@@ -640,6 +641,7 @@
extern ZEND_API int (*zend_stream_open_function)(const char *filename,
zend_file_handle *handle TSRMLS_DC);
extern int (*zend_vspprintf)(char **pbuf, size_t max_len, const char *format,
va_list ap);
extern ZEND_API char *(*zend_getenv)(char *name, size_t name_len TSRMLS_DC);
+extern ZEND_API char *(*zend_resolve_path)(const char *filename, int
filename_len TSRMLS_DC);
ZEND_API void zend_error(int type, const char *format, ...);
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_vm_def.h?r1=1.217&r2=1.218&diff_format=u
Index: ZendEngine2/zend_vm_def.h
diff -u ZendEngine2/zend_vm_def.h:1.217 ZendEngine2/zend_vm_def.h:1.218
--- ZendEngine2/zend_vm_def.h:1.217 Tue Mar 4 11:44:15 2008
+++ ZendEngine2/zend_vm_def.h Wed Mar 5 13:35:01 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: zend_vm_def.h,v 1.217 2008/03/04 11:44:15 dmitry Exp $ */
+/* $Id: zend_vm_def.h,v 1.218 2008/03/05 13:35:01 dmitry Exp $ */
/* If you change this file, please regenerate the zend_vm_execute.h and
* zend_vm_opcodes.h files by running:
@@ -3155,27 +3155,23 @@
case ZEND_INCLUDE_ONCE:
case ZEND_REQUIRE_ONCE: {
zend_file_handle file_handle;
-
- if (IS_ABSOLUTE_PATH(Z_STRVAL_P(inc_filename),
Z_STRLEN_P(inc_filename))) {
- cwd_state state;
-
- state.cwd_length = 0;
- state.cwd = malloc(1);
- state.cwd[0] = 0;
-
- failure_retval =
(!virtual_file_ex(&state, Z_STRVAL_P(inc_filename), NULL, 1) &&
-
zend_hash_exists(&EG(included_files), state.cwd, state.cwd_length+1));
-
- free(state.cwd);
+ char *resolved_path;
+
+ resolved_path =
zend_resolve_path(Z_STRVAL_P(inc_filename), Z_STRLEN_P(inc_filename) TSRMLS_CC);
+ if (resolved_path) {
+ failure_retval =
zend_hash_exists(&EG(included_files), resolved_path, strlen(resolved_path)+1);
+
[PHP-CVS] cvs: php-src /ext/xmlwriter/tests bug41326.phpt
felipe Wed Mar 5 13:15:03 2008 UTC Modified files: /php-src/ext/xmlwriter/testsbug41326.phpt Log: Fix test http://cvs.php.net/viewvc.cgi/php-src/ext/xmlwriter/tests/bug41326.phpt?r1=1.5&r2=1.6&diff_format=u Index: php-src/ext/xmlwriter/tests/bug41326.phpt diff -u php-src/ext/xmlwriter/tests/bug41326.phpt:1.5 php-src/ext/xmlwriter/tests/bug41326.phpt:1.6 --- php-src/ext/xmlwriter/tests/bug41326.phpt:1.5 Thu Oct 25 13:00:58 2007 +++ php-src/ext/xmlwriter/tests/bug41326.phpt Wed Mar 5 13:15:03 2008 @@ -37,7 +37,7 @@ print $xw->flush(true); ?> --EXPECTF-- -Warning: Wrong parameter count for XMLWriter::endElement() in %s on line %d +Warning: XMLWriter::endElement() expects exactly 0 parameters, 1 given in %s on line %d -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard/tests/dir .cvsignore
tony2001Wed Mar 5 12:13:00 2008 UTC Added files: (Branch: PHP_5_2) /php-src/ext/standard/tests/dir .cvsignore Log: add missing .cvsignore http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/.cvsignore?view=markup&rev=1.1 Index: php-src/ext/standard/tests/dir/.cvsignore +++ php-src/ext/standard/tests/dir/.cvsignore -- 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/standard/tests/general_functions import_request.phpt
janiWed Mar 5 12:12:09 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/standard/tests/general_functions import_request.phpt Log: - Fix test when register_globals=On in php.ini http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/import_request.phpt?r1=1.1.2.3.2.1&r2=1.1.2.3.2.2&diff_format=u Index: php-src/ext/standard/tests/general_functions/import_request.phpt diff -u php-src/ext/standard/tests/general_functions/import_request.phpt:1.1.2.3.2.1 php-src/ext/standard/tests/general_functions/import_request.phpt:1.1.2.3.2.2 --- php-src/ext/standard/tests/general_functions/import_request.phpt:1.1.2.3.2.1 Mon Oct 1 12:40:54 2007 +++ php-src/ext/standard/tests/general_functions/import_request.phptWed Mar 5 12:12:09 2008 @@ -4,6 +4,8 @@ a=1&b=heh&c=3&d[]=5&GLOBALS=test&1=hm --POST-- ap=25&bp=test&cp=blah3&dp[]=ar +--INI-- +register_globals=0 --FILE-- http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard/tests/general_functions dl-cve-2007-4887.phpt import_request.phpt
janiWed Mar 5 12:10:38 2008 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/standard/tests/general_functions dl-cve-2007-4887.phpt import_request.phpt Log: - Fix tests http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/dl-cve-2007-4887.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u Index: php-src/ext/standard/tests/general_functions/dl-cve-2007-4887.phpt diff -u php-src/ext/standard/tests/general_functions/dl-cve-2007-4887.phpt:1.1.2.1 php-src/ext/standard/tests/general_functions/dl-cve-2007-4887.phpt:1.1.2.2 --- php-src/ext/standard/tests/general_functions/dl-cve-2007-4887.phpt:1.1.2.1 Thu Sep 20 18:44:24 2007 +++ php-src/ext/standard/tests/general_functions/dl-cve-2007-4887.phpt Wed Mar 5 12:10:38 2008 @@ -1,5 +1,7 @@ --TEST-- dl() filename length checks (CVE-2007-4887) +--INI-- +enable_dl=On --FILE-- http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/import_request.phpt?r1=1.1.2.4&r2=1.1.2.5&diff_format=u Index: php-src/ext/standard/tests/general_functions/import_request.phpt diff -u php-src/ext/standard/tests/general_functions/import_request.phpt:1.1.2.4 php-src/ext/standard/tests/general_functions/import_request.phpt:1.1.2.5 --- php-src/ext/standard/tests/general_functions/import_request.phpt:1.1.2.4 Thu Oct 4 13:31:11 2007 +++ php-src/ext/standard/tests/general_functions/import_request.phptWed Mar 5 12:10:38 2008 @@ -4,6 +4,8 @@ a=1&b=heh&c=3&d[]=5&GLOBALS=test&1=hm --POST-- ap=25&bp=test&cp=blah3&dp[]=ar +--INI-- +register_globals=off --FILE-- http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard dir.c
tony2001Wed Mar 5 12:10:18 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard dir.c
Log:
MFH: apply better fix
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dir.c?r1=1.147.2.3.2.15&r2=1.147.2.3.2.16&diff_format=u
Index: php-src/ext/standard/dir.c
diff -u php-src/ext/standard/dir.c:1.147.2.3.2.15
php-src/ext/standard/dir.c:1.147.2.3.2.16
--- php-src/ext/standard/dir.c:1.147.2.3.2.15 Wed Mar 5 09:29:37 2008
+++ php-src/ext/standard/dir.c Wed Mar 5 12:10:18 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: dir.c,v 1.147.2.3.2.15 2008/03/05 09:29:37 tony2001 Exp $ */
+/* $Id: dir.c,v 1.147.2.3.2.16 2008/03/05 12:10:18 tony2001 Exp $ */
/* {{{ includes/startup/misc */
@@ -256,13 +256,15 @@
{
zval **id, **tmp, *myself;
php_stream *dirp;
+ int rsrc_id;
FETCH_DIRP();
- if (dirp->rsrc_id == DIRG(default_dir)) {
+ rsrc_id = dirp->rsrc_id;
+ zend_list_delete(dirp->rsrc_id);
+
+ if (rsrc_id == DIRG(default_dir)) {
php_set_default_dir(-1 TSRMLS_CC);
- } else {
- zend_list_delete(dirp->rsrc_id);
}
}
/* }}} */
--
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/standard dir.c
tony2001Wed Mar 5 12:10:03 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard dir.c
Log:
MFH: apply better fix
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dir.c?r1=1.147.2.3.2.12.2.4&r2=1.147.2.3.2.12.2.5&diff_format=u
Index: php-src/ext/standard/dir.c
diff -u php-src/ext/standard/dir.c:1.147.2.3.2.12.2.4
php-src/ext/standard/dir.c:1.147.2.3.2.12.2.5
--- php-src/ext/standard/dir.c:1.147.2.3.2.12.2.4 Wed Mar 5 09:29:25 2008
+++ php-src/ext/standard/dir.c Wed Mar 5 12:10:02 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: dir.c,v 1.147.2.3.2.12.2.4 2008/03/05 09:29:25 tony2001 Exp $ */
+/* $Id: dir.c,v 1.147.2.3.2.12.2.5 2008/03/05 12:10:02 tony2001 Exp $ */
/* {{{ includes/startup/misc */
@@ -256,13 +256,15 @@
{
zval **id, **tmp, *myself;
php_stream *dirp;
+ int rsrc_id;
FETCH_DIRP();
- if (dirp->rsrc_id == DIRG(default_dir)) {
+ rsrc_id = dirp->rsrc_id;
+ zend_list_delete(dirp->rsrc_id);
+
+ if (rsrc_id == DIRG(default_dir)) {
php_set_default_dir(-1 TSRMLS_CC);
- } else {
- zend_list_delete(dirp->rsrc_id);
}
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard dir.c
tony2001Wed Mar 5 12:09:34 2008 UTC
Modified files:
/php-src/ext/standard dir.c
Log:
apply better fix, so that the default handle would be closed when closing its
reference
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dir.c?r1=1.174&r2=1.175&diff_format=u
Index: php-src/ext/standard/dir.c
diff -u php-src/ext/standard/dir.c:1.174 php-src/ext/standard/dir.c:1.175
--- php-src/ext/standard/dir.c:1.174Wed Mar 5 09:28:41 2008
+++ php-src/ext/standard/dir.c Wed Mar 5 12:09:33 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: dir.c,v 1.174 2008/03/05 09:28:41 tony2001 Exp $ */
+/* $Id: dir.c,v 1.175 2008/03/05 12:09:33 tony2001 Exp $ */
/* {{{ includes/startup/misc */
@@ -278,13 +278,15 @@
{
zval **id, **tmp, *myself;
php_stream *dirp;
+ int rsrc_id;
FETCH_DIRP();
- if (dirp->rsrc_id == DIRG(default_dir)) {
+ rsrc_id = dirp->rsrc_id;
+ zend_list_delete(dirp->rsrc_id);
+
+ if (rsrc_id == DIRG(default_dir)) {
php_set_default_dir(-1 TSRMLS_CC);
- } else {
- zend_list_delete(dirp->rsrc_id);
}
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS
tony2001Wed Mar 5 10:46:46 2008 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS Log: cosmetic fixes http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1106&r2=1.2027.2.547.2.1107&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.1106 php-src/NEWS:1.2027.2.547.2.1107 --- php-src/NEWS:1.2027.2.547.2.1106Tue Mar 4 22:25:35 2008 +++ php-src/NEWSWed Mar 5 10:46:46 2008 @@ -11,9 +11,9 @@ 27 Feb 2008, PHP 5.2.6RC1 - Fixed security issue detailed in CVE-2008-0599. (Rasmus) -- Fixed potential memleak in stream filter parameter for zlib filter (Greg) +- Fixed potential memleak in stream filter parameter for zlib filter. (Greg) - Added Reflection API metadata for the methods of the DOM classes. (Sebastian) -- Fixed weired behavior in CGI parameter parsing. (Dmitry, Hannes Magnusson) +- Fixed weird behavior in CGI parameter parsing. (Dmitry, Hannes Magnusson) - Fixed a safe_mode bypass in cURL identified by Maksymilian Arciemowicz. (Ilia) - Fixed a bug with PDO::FETCH_COLUMN|PDO::FETCH_GROUP mode when a column # by @@ -157,7 +157,7 @@ - Fixed bug #42736 (xmlrpc_server_call_method() crashes). (Tony) - Fixed bug #42692 (Procedure 'int1' not present with doc/lit SoapServer). (Dmitry) -- Fixed bug #42548 (mysqli PROCEDURE calls can't return result sets). (hartmut) +- Fixed bug #42548 (mysqli PROCEDURE calls can't return result sets). (Hartmut) - Fixed bug #42369 (Implicit conversion to string leaks memory). (David C., Rob). - Fixed bug #42272 (var_export() incorrectly escapes char(0)). (Derick) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard dir.c
tony2001Wed Mar 5 09:29:37 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard dir.c
Log:
MFH: fix memory corruption due to double destruction of default dir handle
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dir.c?r1=1.147.2.3.2.14&r2=1.147.2.3.2.15&diff_format=u
Index: php-src/ext/standard/dir.c
diff -u php-src/ext/standard/dir.c:1.147.2.3.2.14
php-src/ext/standard/dir.c:1.147.2.3.2.15
--- php-src/ext/standard/dir.c:1.147.2.3.2.14 Mon Dec 31 07:20:12 2007
+++ php-src/ext/standard/dir.c Wed Mar 5 09:29:37 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: dir.c,v 1.147.2.3.2.14 2007/12/31 07:20:12 sebastian Exp $ */
+/* $Id: dir.c,v 1.147.2.3.2.15 2008/03/05 09:29:37 tony2001 Exp $ */
/* {{{ includes/startup/misc */
@@ -261,9 +261,9 @@
if (dirp->rsrc_id == DIRG(default_dir)) {
php_set_default_dir(-1 TSRMLS_CC);
+ } else {
+ zend_list_delete(dirp->rsrc_id);
}
-
- zend_list_delete(dirp->rsrc_id);
}
/* }}} */
--
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/standard dir.c
tony2001Wed Mar 5 09:29:25 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard dir.c
Log:
MFH: fix memory corruption due to double destruction of default dir handle
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dir.c?r1=1.147.2.3.2.12.2.3&r2=1.147.2.3.2.12.2.4&diff_format=u
Index: php-src/ext/standard/dir.c
diff -u php-src/ext/standard/dir.c:1.147.2.3.2.12.2.3
php-src/ext/standard/dir.c:1.147.2.3.2.12.2.4
--- php-src/ext/standard/dir.c:1.147.2.3.2.12.2.3 Mon Dec 31 07:17:14 2007
+++ php-src/ext/standard/dir.c Wed Mar 5 09:29:25 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: dir.c,v 1.147.2.3.2.12.2.3 2007/12/31 07:17:14 sebastian Exp $ */
+/* $Id: dir.c,v 1.147.2.3.2.12.2.4 2008/03/05 09:29:25 tony2001 Exp $ */
/* {{{ includes/startup/misc */
@@ -261,9 +261,9 @@
if (dirp->rsrc_id == DIRG(default_dir)) {
php_set_default_dir(-1 TSRMLS_CC);
+ } else {
+ zend_list_delete(dirp->rsrc_id);
}
-
- zend_list_delete(dirp->rsrc_id);
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard dir.c
tony2001Wed Mar 5 09:28:41 2008 UTC
Modified files:
/php-src/ext/standard dir.c
Log:
fix memory corruption due to double destruction of default dir handle
(detected by ext/standard/tests/dir/readdir_variation6.phpt)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dir.c?r1=1.173&r2=1.174&diff_format=u
Index: php-src/ext/standard/dir.c
diff -u php-src/ext/standard/dir.c:1.173 php-src/ext/standard/dir.c:1.174
--- php-src/ext/standard/dir.c:1.173Thu Feb 28 14:16:14 2008
+++ php-src/ext/standard/dir.c Wed Mar 5 09:28:41 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: dir.c,v 1.173 2008/02/28 14:16:14 felipe Exp $ */
+/* $Id: dir.c,v 1.174 2008/03/05 09:28:41 tony2001 Exp $ */
/* {{{ includes/startup/misc */
@@ -283,9 +283,9 @@
if (dirp->rsrc_id == DIRG(default_dir)) {
php_set_default_dir(-1 TSRMLS_CC);
+ } else {
+ zend_list_delete(dirp->rsrc_id);
}
-
- zend_list_delete(dirp->rsrc_id);
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
