date:20060307

[PHP-CVS-DAILY] cvs: php-src / ChangeLog

2006-03-07 Thread changelog

changelog   Wed Mar  8 06:31:42 2006 UTC

  Modified files:  
/php-srcChangeLog 
  Log:
  ChangeLog update
  
http://cvs.php.net/viewcvs.cgi/php-src/ChangeLog?r1=1.2277r2=1.2278diff_format=u
Index: php-src/ChangeLog
diff -u php-src/ChangeLog:1.2277 php-src/ChangeLog:1.2278
--- php-src/ChangeLog:1.2277Tue Mar  7 06:31:44 2006
+++ php-src/ChangeLog   Wed Mar  8 06:31:42 2006
@@ -1,3 +1,159 @@
+2006-03-07  Alex Waugh  [EMAIL PROTECTED]
+
+* main/php.h
+  sapi/cgi/cgi_main.c:
+  Fix for RISC OS
+
+* sapi/webjames/webjames.c:
+  Improve DOCUMENT_ROOT setting
+
+2006-03-07  Marcus Boerger  [EMAIL PROTECTED]
+
+* (PHP_5_1)
+  NEWS:
+  - Update
+
+2006-03-07  Colin Viebrock  [EMAIL PROTECTED]
+
+* php.gif
+  main/logos.h:
+  change these in HEAD too
+
+2006-03-07  Rob Richards  [EMAIL PROTECTED]
+
+* (PHP_5_1)
+  NEWS:
+  updated for simplexml changes
+
+* (PHP_5_1)
+  ext/simplexml/simplexml.c
+  ext/simplexml/tests/027.phpt
+  ext/simplexml/tests/030.phpt
+  ext/simplexml/tests/031.phpt
+  ext/simplexml/tests/bug35785.phpt:
+  - Synch with head
+
+2006-03-07  Ilia Alshanetsky  [EMAIL PROTECTED]
+
+* sapi/apache/mod_php5.c
+  sapi/apache/php_apache.c
+  sapi/apache2filter/sapi_apache2.c
+  sapi/apache2handler/sapi_apache2.c
+  sapi/apache_hooks/php_apache.c
+  sapi/nsapi/nsapi.c:
+  Nuke safe_mode from sapi/*
+  
+
+2006-03-07  Antony Dovgal  [EMAIL PROTECTED]
+
+* ext/oci8/package.xml:
+  prepare to the next release
+
+2006-03-07  Edin Kadribasic  [EMAIL PROTECTED]
+
+* (PHP_4_4)
+  win32/php4dllts.dsp:
+  Sync pcre update changes
+
+2006-03-07  Dmitry Stogov  [EMAIL PROTECTED]
+
+* NEWS
+  ZendEngine2/zend_compile.c
+  ZendEngine2/zend_compile.h
+  ZendEngine2/zend_globals.h
+  ZendEngine2/zend_language_parser.y
+  ZendEngine2/tests/break_label01.phpt
+  ZendEngine2/tests/break_label02.phpt
+  ZendEngine2/tests/break_label03.phpt
+  ZendEngine2/tests/break_label04.phpt
+  ZendEngine2/tests/break_label05.phpt
+  ZendEngine2/tests/break_label06.phpt
+  ZendEngine2/tests/break_label07.phpt
+  ZendEngine2/tests/break_label08.inc
+  ZendEngine2/tests/break_label08.phpt
+  ZendEngine2/tests/break_label09.phpt
+  ZendEngine2/tests/break_label10.phpt
+  ZendEngine2/tests/break_label11.phpt:
+  Reverted break label
+
+2006-03-07  Andrei Zmievski  [EMAIL PROTECTED]
+
+* ZendEngine2/zend_builtin_functions.c:
+  -** empty log message ***
+
+2006-03-07  Derick Rethans  [EMAIL PROTECTED]
+
+* ZendEngine2/zend_builtin_functions.c:
+  - Make this compile again
+
+2006-03-07  Antony Dovgal  [EMAIL PROTECTED]
+
+* (PHP_5_1)
+  NEWS
+  ext/oci8/oci8.c:
+  MFH
+  add workaround for Oracle server crash, use OCIServerVersion() instead of
+  OCIPing()
+  fix #36250 (PHP Causes ORA-07445 Core dump in Oracle server 9.2.x)
+
+* ext/oci8/oci8.c:
+  add workaround for Oracle server crash, use OCIServerVersion() instead of
+  OCIPing()
+  fix #36250 (PHP Causes ORA-07445 Core dump in Oracle server 9.2.x)
+
+2006-03-07  Andrei Zmievski  [EMAIL PROTECTED]
+
+* ZendEngine2/zend_builtin_functions.c:
+  Mark some functions as Unicode-safe and adjust UTODO notices for others.
+
+2006-03-07  Pierre-Alain Joye  [EMAIL PROTECTED]
+
+* NEWS:
+  - gd1 and ft1 entry
+
+2006-03-07  Sara Golemon  [EMAIL PROTECTED]
+
+* ZendEngine2/tests/unset_cv06.phpt:
+  Remove register_globals regression test for Pierre
+
+2006-03-07  Pierre-Alain Joye  [EMAIL PROTECTED]
+
+* NEWS
+  php.ini-dist
+  php.ini-recommended
+  ext/mbstring/mb_gpc.c
+  ext/mbstring/mb_gpc.h
+  ext/mbstring/mbstring.c
+  ext/mbstring/tests/mb_parse_str.phpt
+  ext/mbstring/tests/mb_parse_str02.phpt
+  ext/session/php_session.h
+  ext/session/session.c
+  ext/session/tests/001.phpt
+  ext/session/tests/003.phpt
+  ext/session/tests/004.phpt
+  ext/session/tests/005.phpt
+  ext/session/tests/006.phpt
+  ext/session/tests/007.phpt
+  ext/session/tests/008-php4.2.3.phpt
+  ext/session/tests/008.phpt
+  ext/session/tests/009.phpt
+  ext/session/tests/010.phpt
+  ext/session/tests/011.phpt
+  ext/session/tests/012.phpt
+  ext/session/tests/013.phpt
+  ext/session/tests/014.phpt
+  ext/session/tests/019.phpt
+  ext/session/tests/bug24592.phpt
+  ext/session/tests/bug26862.phpt
+  main/main.c
+  main/php_globals.h
+  main/php_variables.c
+  main/rfc1867.c
+  sapi/apache/mod_php5.c
+  sapi/apache_hooks/mod_php5.c
+  sapi/apache_hooks/sapi_apache.c:
+  - remove register_globals support (aka Kill the f***ing thing :)
+
 2006-03-06  Sebastian Bergmann  [EMAIL PROTECTED]
 
 * ext/pcre/config.w32:

[PHP-CVS] cvs: php-src(PHP_4_4) /win32 php4dllts.dsp

2006-03-07 Thread Edin Kadribasic

edink   Tue Mar  7 09:33:00 2006 UTC

  Modified files:  (Branch: PHP_4_4)
/php-src/win32  php4dllts.dsp 
  Log:
  Sync pcre update changes
  http://cvs.php.net/viewcvs.cgi/php-src/win32/php4dllts.dsp?r1=1.87.2.9.2.2r2=1.87.2.9.2.3diff_format=u
Index: php-src/win32/php4dllts.dsp
diff -u php-src/win32/php4dllts.dsp:1.87.2.9.2.2 
php-src/win32/php4dllts.dsp:1.87.2.9.2.3
--- php-src/win32/php4dllts.dsp:1.87.2.9.2.2Thu Aug 18 21:51:02 2005
+++ php-src/win32/php4dllts.dsp Tue Mar  7 09:33:00 2006
@@ -409,13 +409,15 @@
 
 !IF  $(CFG) == php4dllts - Win32 Debug_TS
 
+# ADD CPP /D EXPORT= /D NEWLINE=10 /D SUPPORT_UTF8 /D SUPPORT_UCP /D 
LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=1000 /D 
MATCH_LIMIT_RECURSION=1000
+
 !ELSEIF  $(CFG) == php4dllts - Win32 Release_TS
 
-# ADD CPP /D NEWLINE=10 /D SUPPORT_UTF8 /D SUPPORT_UCP /D LINK_SIZE=2 /D 
POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=1000 /D EXPORT=
+# ADD CPP /D EXPORT= /D NEWLINE=10 /D SUPPORT_UTF8 /D SUPPORT_UCP /D 
LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=1000 /D 
MATCH_LIMIT_RECURSION=1000
 
 !ELSEIF  $(CFG) == php4dllts - Win32 Release_TS_inline
 
-# ADD CPP /D NEWLINE=10 /D SUPPORT_UTF8 /D SUPPORT_UCP /D LINK_SIZE=2 /D 
POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=1000 /D EXPORT=
+# ADD CPP /D EXPORT= /D NEWLINE=10 /D SUPPORT_UTF8 /D SUPPORT_UCP /D 
LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=1000 /D 
MATCH_LIMIT_RECURSION=1000
 
 !ELSEIF  $(CFG) == php4dllts - Win32 Release_TSDbg
 
@@ -428,13 +430,15 @@
 
 !IF  $(CFG) == php4dllts - Win32 Debug_TS
 
+# ADD CPP /D EXPORT= /D NEWLINE=10 /D SUPPORT_UTF8 /D SUPPORT_UCP /D 
LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=1000 /D 
MATCH_LIMIT_RECURSION=1000
+
 !ELSEIF  $(CFG) == php4dllts - Win32 Release_TS
 
-# ADD CPP /D NEWLINE=10 /D SUPPORT_UTF8 /D SUPPORT_UCP /D LINK_SIZE=2 /D 
POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=1000 /D EXPORT=
+# ADD CPP /D EXPORT= /D NEWLINE=10 /D SUPPORT_UTF8 /D SUPPORT_UCP /D 
LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=1000 /D 
MATCH_LIMIT_RECURSION=1000
 
 !ELSEIF  $(CFG) == php4dllts - Win32 Release_TS_inline
 
-# ADD CPP /D NEWLINE=10 /D SUPPORT_UTF8 /D SUPPORT_UCP /D LINK_SIZE=2 /D 
POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=1000 /D EXPORT=
+# ADD CPP /D EXPORT= /D NEWLINE=10 /D SUPPORT_UTF8 /D SUPPORT_UCP /D 
LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=1000 /D 
MATCH_LIMIT_RECURSION=1000
 
 !ELSEIF  $(CFG) == php4dllts - Win32 Release_TSDbg
 
@@ -447,13 +451,15 @@
 
 !IF  $(CFG) == php4dllts - Win32 Debug_TS
 
+# ADD CPP /D EXPORT= /D NEWLINE=10 /D SUPPORT_UTF8 /D SUPPORT_UCP /D 
LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=1000 /D 
MATCH_LIMIT_RECURSION=1000
+
 !ELSEIF  $(CFG) == php4dllts - Win32 Release_TS
 
-# ADD CPP /D NEWLINE=10 /D SUPPORT_UTF8 /D SUPPORT_UCP /D LINK_SIZE=2 /D 
POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=1000 /D EXPORT=
+# ADD CPP /D EXPORT= /D NEWLINE=10 /D SUPPORT_UTF8 /D SUPPORT_UCP /D 
LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=1000 /D 
MATCH_LIMIT_RECURSION=1000
 
 !ELSEIF  $(CFG) == php4dllts - Win32 Release_TS_inline
 
-# ADD CPP /D NEWLINE=10 /D SUPPORT_UTF8 /D SUPPORT_UCP /D LINK_SIZE=2 /D 
POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=1000 /D EXPORT=
+# ADD CPP /D EXPORT= /D NEWLINE=10 /D SUPPORT_UTF8 /D SUPPORT_UCP /D 
LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=1000 /D 
MATCH_LIMIT_RECURSION=1000
 
 !ELSEIF  $(CFG) == php4dllts - Win32 Release_TSDbg
 
@@ -466,13 +472,15 @@
 
 !IF  $(CFG) == php4dllts - Win32 Debug_TS
 
+# ADD CPP /D EXPORT= /D NEWLINE=10 /D SUPPORT_UTF8 /D SUPPORT_UCP /D 
LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=1000 /D 
MATCH_LIMIT_RECURSION=1000
+
 !ELSEIF  $(CFG) == php4dllts - Win32 Release_TS
 
-# ADD CPP /D NEWLINE=10 /D SUPPORT_UTF8 /D SUPPORT_UCP /D LINK_SIZE=2 /D 
POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=1000 /D EXPORT=
+# ADD CPP /D EXPORT= /D NEWLINE=10 /D SUPPORT_UTF8 /D SUPPORT_UCP /D 
LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=1000 /D 
MATCH_LIMIT_RECURSION=1000
 
 !ELSEIF  $(CFG) == php4dllts - Win32 Release_TS_inline
 
-# ADD CPP /D NEWLINE=10 /D SUPPORT_UTF8 /D SUPPORT_UCP /D LINK_SIZE=2 /D 
POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=1000 /D EXPORT=
+# ADD CPP /D EXPORT= /D NEWLINE=10 /D SUPPORT_UTF8 /D SUPPORT_UCP /D 
LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=1000 /D 
MATCH_LIMIT_RECURSION=1000
 
 !ELSEIF  $(CFG) == php4dllts - Win32 Release_TSDbg
 
@@ -485,13 +493,15 @@
 
 !IF  $(CFG) == php4dllts - Win32 Debug_TS
 
+# ADD CPP /D EXPORT= /D NEWLINE=10 /D SUPPORT_UTF8 /D SUPPORT_UCP /D 
LINK_SIZE=2 /D POSIX_MALLOC_THRESHOLD=10 /D MATCH_LIMIT=1000 /D 
MATCH_LIMIT_RECURSION=1000
+
 !ELSEIF  $(CFG) == php4dllts - Win32 Release_TS
 
-# ADD CPP /D NEWLINE=10 /D SUPPORT_UTF8 /D SUPPORT_UCP /D LINK_SIZE=2 /D

[PHP-CVS] cvs: php-src /sapi/apache mod_php5.c php_apache.c /sapi/apache2filter sapi_apache2.c /sapi/apache2handler sapi_apache2.c /sapi/apache_hooks php_apache.c /sapi/nsapi nsapi.c

2006-03-07 Thread Ilia Alshanetsky

iliaa   Tue Mar  7 14:43:16 2006 UTC

  Modified files:  
/php-src/sapi/apachemod_php5.c php_apache.c 
/php-src/sapi/apache2filter sapi_apache2.c 
/php-src/sapi/apache2handlersapi_apache2.c 
/php-src/sapi/apache_hooks  php_apache.c 
/php-src/sapi/nsapi nsapi.c 
  Log:
  Nuke safe_mode from sapi/*
  
  # only main/ remains at this point, this is the next step
  
  http://cvs.php.net/viewcvs.cgi/php-src/sapi/apache/mod_php5.c?r1=1.29r2=1.30diff_format=u
Index: php-src/sapi/apache/mod_php5.c
diff -u php-src/sapi/apache/mod_php5.c:1.29 php-src/sapi/apache/mod_php5.c:1.30
--- php-src/sapi/apache/mod_php5.c:1.29 Tue Mar  7 00:20:54 2006
+++ php-src/sapi/apache/mod_php5.c  Tue Mar  7 14:43:16 2006
@@ -17,7 +17,7 @@
| PHP 4.0 patches by Zeev Suraski [EMAIL PROTECTED]  |
+--+
  */
-/* $Id: mod_php5.c,v 1.29 2006/03/07 00:20:54 pajoye Exp $ */
+/* $Id: mod_php5.c,v 1.30 2006/03/07 14:43:16 iliaa Exp $ */
 
 #include php_apache_http.h
 #include http_conf_globals.h
@@ -514,7 +514,7 @@
SG(request_info).auth_password = NULL;
SG(request_info).auth_digest = NULL;
 
-   if (authorization  (!PG(safe_mode) || (PG(safe_mode)  
!auth_type(r {
+   if (authorization) {
char *p = getword(r-pool, authorization, ' ');
if (!strcasecmp(p, Basic)) {
tmp = uudecode(r-pool, authorization);
http://cvs.php.net/viewcvs.cgi/php-src/sapi/apache/php_apache.c?r1=1.92r2=1.93diff_format=u
Index: php-src/sapi/apache/php_apache.c
diff -u php-src/sapi/apache/php_apache.c:1.92 
php-src/sapi/apache/php_apache.c:1.93
--- php-src/sapi/apache/php_apache.c:1.92   Sun Jan  1 13:09:57 2006
+++ php-src/sapi/apache/php_apache.cTue Mar  7 14:43:16 2006
@@ -17,7 +17,7 @@
|  David Sklar [EMAIL PROTECTED] |
+--+
  */
-/* $Id: php_apache.c,v 1.92 2006/01/01 13:09:57 sniper Exp $ */
+/* $Id: php_apache.c,v 1.93 2006/03/07 14:43:16 iliaa Exp $ */
 
 #include php_apache_http.h
 
@@ -275,7 +275,7 @@
env_arr = table_elts(r-headers_in);
env = (table_entry *)env_arr-elts;
for (i = 0; i  env_arr-nelts; ++i) {
-   if (env[i].key  (!PG(safe_mode) || (PG(safe_mode)  
strncasecmp(env[i].key, authorization, 13 {
+   if (env[i].key) {
php_info_print_table_row(2, env[i].key, 
env[i].val);
}
}
@@ -353,9 +353,7 @@
 env_arr = table_elts(((request_rec *) SG(server_context))-headers_in);
 tenv = (table_entry *)env_arr-elts;
 for (i = 0; i  env_arr-nelts; ++i) {
-   if (!tenv[i].key ||
-   (PG(safe_mode) 
-!strncasecmp(tenv[i].key, authorization, 13))) {
+   if (!tenv[i].key) {
continue;
}
if (add_assoc_string(return_value, tenv[i].key, 
(tenv[i].val==NULL) ?  : tenv[i].val, 1)==FAILURE) {
@@ -541,11 +539,6 @@
Reset the Apache write timer */
 PHP_FUNCTION(apache_reset_timeout)
 {
-   if (PG(safe_mode)) {
-   php_error_docref(NULL TSRMLS_CC, E_WARNING, Cannot reset the 
Apache timeout in safe mode);
-   RETURN_FALSE;
-   }
-
ap_reset_timeout((request_rec *)SG(server_context));
RETURN_TRUE;
 }
http://cvs.php.net/viewcvs.cgi/php-src/sapi/apache2filter/sapi_apache2.c?r1=1.137r2=1.138diff_format=u
Index: php-src/sapi/apache2filter/sapi_apache2.c
diff -u php-src/sapi/apache2filter/sapi_apache2.c:1.137 
php-src/sapi/apache2filter/sapi_apache2.c:1.138
--- php-src/sapi/apache2filter/sapi_apache2.c:1.137 Sun Jan  1 13:09:57 2006
+++ php-src/sapi/apache2filter/sapi_apache2.c   Tue Mar  7 14:43:16 2006
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: sapi_apache2.c,v 1.137 2006/01/01 13:09:57 sniper Exp $ */
+/* $Id: sapi_apache2.c,v 1.138 2006/03/07 14:43:16 iliaa Exp $ */
 
 #include fcntl.h
 
@@ -406,13 +406,8 @@
apr_table_unset(f-r-headers_out, Last-Modified);
apr_table_unset(f-r-headers_out, Expires);
apr_table_unset(f-r-headers_out, ETag);
-   if (!PG(safe_mode) || (PG(safe_mode)  !ap_auth_type(f-r))) {
-   auth = apr_table_get(f-r-headers_in, Authorization);
-   php_handle_auth_data(auth TSRMLS_CC);
-   } else {
-   SG(request_info).auth_user = NULL;
-   SG(request_info).auth_password = NULL;
-   }
+   auth = apr_table_get(f-r-headers_in, Authorization);
+   php_handle_auth_data(auth TSRMLS_CC);
php_request_startup(TSRMLS_C);
 }

[PHP-CVS] cvs: php-src(PHP_5_1) /ext/simplexml simplexml.c /ext/simplexml/tests 027.phpt 030.phpt 031.phpt bug35785.phpt

2006-03-07 Thread Rob Richards

rrichards   Tue Mar  7 15:22:48 2006 UTC

  Added files: (Branch: PHP_5_1)
/php-src/ext/simplexml/tests030.phpt 031.phpt 

  Modified files:  
/php-src/ext/simplexml  simplexml.c 
/php-src/ext/simplexml/tests027.phpt bug35785.phpt 
  Log:
  - Synch with head
  http://cvs.php.net/viewcvs.cgi/php-src/ext/simplexml/simplexml.c?r1=1.151.2.17r2=1.151.2.18diff_format=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.151.2.17 
php-src/ext/simplexml/simplexml.c:1.151.2.18
--- php-src/ext/simplexml/simplexml.c:1.151.2.17Sun Mar  5 15:36:03 2006
+++ php-src/ext/simplexml/simplexml.c   Tue Mar  7 15:22:48 2006
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: simplexml.c,v 1.151.2.17 2006/03/05 15:36:03 tony2001 Exp $ */
+/* $Id: simplexml.c,v 1.151.2.18 2006/03/07 15:22:48 rrichards Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -632,6 +632,14 @@
xmlAttrPtr  attr = NULL;
int exists = 0;
int test = 0;
+   zvaltmp_zv;
+
+   if (Z_TYPE_P(member) != IS_STRING  Z_TYPE_P(member) != IS_LONG) {
+   tmp_zv = *member;
+   zval_copy_ctor(tmp_zv);
+   member = tmp_zv;
+   convert_to_string(member);
+   }
 
sxe = php_sxe_fetch_object(object TSRMLS_CC);
 
@@ -661,13 +669,28 @@
 
if (node) {
if (attribs) {
-   while (attr) {
-   if ((!test || !xmlStrcmp(attr-name, 
sxe-iter.name))  !xmlStrcmp(attr-name, Z_STRVAL_P(member))  match_ns(sxe, 
(xmlNodePtr) attr, sxe-iter.nsprefix)) {
-   exists = 1;
-   break;
+   if (Z_TYPE_P(member) == IS_LONG) {
+   int nodendx = 0;
+
+   while (attr  nodendx = Z_LVAL_P(member)) {
+   if ((!test || !xmlStrcmp(attr-name, 
sxe-iter.name))  match_ns(sxe, (xmlNodePtr) attr, sxe-iter.nsprefix)) {
+   if (nodendx == 
Z_LVAL_P(member)) {
+   exists = 1;
+   break;
+   }
+   nodendx++;
+   }
+   attr = attr-next;
}
+   } else {
+   while (attr) {
+   if ((!test || !xmlStrcmp(attr-name, 
sxe-iter.name))  !xmlStrcmp(attr-name, Z_STRVAL_P(member))  match_ns(sxe, 
(xmlNodePtr) attr, sxe-iter.nsprefix)) {
+   exists = 1;
+   break;
+   }
 
-   attr = attr-next;
+   attr = attr-next;
+   }
}
}
 
@@ -679,14 +702,6 @@
node = sxe_get_element_by_offset(sxe, 
Z_LVAL_P(member), node, NULL);
}
else {
-   zval tmp_zv;
-
-   if (Z_TYPE_P(member) != IS_STRING) {
-   tmp_zv = *member;
-   zval_copy_ctor(tmp_zv);
-   member = tmp_zv;
-   convert_to_string(member);
-   }
node = node-children;
while (node) {
xmlNodePtr nnext;
@@ -696,9 +711,6 @@
}
node = nnext;
}
-   if (member == tmp_zv) {
-   zval_dtor(tmp_zv);
-   }
}
if (node) {
exists = 1;
@@ -706,6 +718,10 @@
}
}
 
+   if (member == tmp_zv) {
+   zval_dtor(tmp_zv);
+   }
+
return exists;
 }
 /* }}} */
@@ -733,12 +749,12 @@
php_sxe_object *sxe;
xmlNodePtr  node;
xmlNodePtr  nnext;
-   xmlAttrPtr  attr;
+   xmlAttrPtr  attr = NULL;
xmlAttrPtr  anext;
zvaltmp_zv;
-   int test;
+   int test = 0;
 
-   if (Z_TYPE_P(member) != IS_STRING) {
+   if (Z_TYPE_P(member) != IS_STRING

[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS

2006-03-07 Thread Rob Richards

rrichards   Tue Mar  7 15:27:01 2006 UTC

  Modified files:  (Branch: PHP_5_1)
/php-srcNEWS 
  Log:
  updated for simplexml changes
  
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.446r2=1.2027.2.447diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.446 php-src/NEWS:1.2027.2.447
--- php-src/NEWS:1.2027.2.446   Tue Mar  7 07:47:43 2006
+++ php-src/NEWSTue Mar  7 15:27:01 2006
@@ -14,6 +14,9 @@
 - Improved SimpleXML: (Marcus)
   . Added SimpleXMLElement::getName() to retrieve name of element.
   . Added ability to create elements on the fly.
+  . Added addChild() method for element creation supporting namespaces.
+  . Added addAttribute() method for attribute creation supporting namespaces.
+  . Added ability to delete specific elements and attributes by offset.
 - Improved Reflection API: (Marcus)
   . Added ReflectionClass::newInstanceArgs($args).
   . Added ability to analyze extension dependency.

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

[PHP-CVS] cvs: CVSROOT / avail

2006-03-07 Thread Derick Rethans

derick  Tue Mar  7 19:26:04 2006 UTC

  Modified files:  
/CVSROOTavail 
  Log:
  - Give jsgoupil access to smarty/docs.
  
  
http://cvs.php.net/viewcvs.cgi/CVSROOT/avail?r1=1.1104r2=1.1105diff_format=u
Index: CVSROOT/avail
diff -u CVSROOT/avail:1.1104 CVSROOT/avail:1.1105
--- CVSROOT/avail:1.1104Tue Mar  7 08:45:37 2006
+++ CVSROOT/avail   Tue Mar  7 19:26:04 2006
@@ -128,7 +128,7 @@
 
 # The Smarty docs translators
 
-avail|gerald,arno,fernando,marcelo,surfmax,didou,nlopess,tony2001,freespace,thomasgm,yannick,pete_morgan,forestaki|smarty/docs
+avail|jsgoupil,gerald,arno,fernando,marcelo,surfmax,didou,nlopess,tony2001,freespace,thomasgm,yannick,pete_morgan,forestaki|smarty/docs
 
 # The Smarty Web Group has access to the Smarty website.
 

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

[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS

2006-03-07 Thread Marcus Boerger

helly   Tue Mar  7 19:29:04 2006 UTC

  Modified files:  (Branch: PHP_5_1)
/php-srcNEWS 
  Log:
  - Update
  
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.447r2=1.2027.2.448diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.447 php-src/NEWS:1.2027.2.448
--- php-src/NEWS:1.2027.2.447   Tue Mar  7 15:27:01 2006
+++ php-src/NEWSTue Mar  7 19:29:04 2006
@@ -11,7 +11,7 @@
   - Fixed ArrayIterator::seek().
   - Added SimpleXMLElement::count().
   - Dropped erroneous RecursiveDirectoryIterator::getSubPathInfo().
-- Improved SimpleXML: (Marcus)
+- Improved SimpleXML: (Marcus, Rob)
   . Added SimpleXMLElement::getName() to retrieve name of element.
   . Added ability to create elements on the fly.
   . Added addChild() method for element creation supporting namespaces.
@@ -49,6 +49,7 @@
   (Mike)
 - Fixed crash with DOMImplementation::createDocumentType(name:). (Mike)
 - Fixed bug #36638 (strtotime() returns false when 2nd argument  1). (Derick)
+- Fixed bug #36625 (pg_trace() does not work). (iakio at mono-space dot net)
 - Fixed bug #36611 (assignment to SimpleXML object attribute changes argument 
   type to string). (Tony)
 - Fixed bug #36606 (pg_query_params() changes arguments type to string). (Tony)

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

[PHP-CVS] cvs: php-src /ext/spl spl_directory.c

2006-03-07 Thread Marcus Boerger

helly   Tue Mar  7 20:22:12 2006 UTC

  Modified files:  
/php-src/ext/splspl_directory.c 
  Log:
  - WS
  
http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/spl_directory.c?r1=1.80r2=1.81diff_format=u
Index: php-src/ext/spl/spl_directory.c
diff -u php-src/ext/spl/spl_directory.c:1.80 
php-src/ext/spl/spl_directory.c:1.81
--- php-src/ext/spl/spl_directory.c:1.80Mon Mar  6 09:45:25 2006
+++ php-src/ext/spl/spl_directory.c Tue Mar  7 20:22:12 2006
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: spl_directory.c,v 1.80 2006/03/06 09:45:25 helly Exp $ */
+/* $Id: spl_directory.c,v 1.81 2006/03/07 20:22:12 helly Exp $ */
 
 #ifdef HAVE_CONFIG_H
 # include config.h
@@ -437,8 +437,8 @@
 
if (!len) {
php_set_error_handling(EH_NORMAL, NULL TSRMLS_CC);
-zend_throw_exception_ex(spl_ce_RuntimeException, 0 TSRMLS_CC, 
Directory name must not be empty.);
-return;
+   zend_throw_exception_ex(spl_ce_RuntimeException, 0 TSRMLS_CC, 
Directory name must not be empty.);
+   return;
}
 
intern = (spl_filesystem_object*)zend_object_store_get_object(getThis() 
TSRMLS_CC);

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

[PHP-CVS] cvs: php-src /sapi/webjames webjames.c

2006-03-07 Thread Alex Waugh

alexwaugh   Tue Mar  7 22:34:37 2006 UTC

  Modified files:  
/php-src/sapi/webjames  webjames.c 
  Log:
  Improve DOCUMENT_ROOT setting
  
  
http://cvs.php.net/viewcvs.cgi/php-src/sapi/webjames/webjames.c?r1=1.12r2=1.13diff_format=u
Index: php-src/sapi/webjames/webjames.c
diff -u php-src/sapi/webjames/webjames.c:1.12 
php-src/sapi/webjames/webjames.c:1.13
--- php-src/sapi/webjames/webjames.c:1.12   Sun Jan  1 13:09:58 2006
+++ php-src/sapi/webjames/webjames.cTue Mar  7 22:34:37 2006
@@ -27,7 +27,7 @@
 
 #include unixlib/local.h
 
-#define WEBJAMES_SAPI_VERSION 1.0.0
+#define WEBJAMES_SAPI_VERSION 1.0.1
 
 typedef struct {
struct connection *conn; /*structure holding all the details of the 
current request*/
@@ -96,6 +96,7 @@
 static void sapi_webjames_register_variables(zval *track_vars_array TSRMLS_DC)
 {
char buf[BUF_SIZE + 1];
+   char *docroot;
 
buf[BUF_SIZE] = '\0';
 
@@ -105,7 +106,9 @@
ADD_NUM(SERVER_PORT, port);
ADD_STRING(SERVER_ADMIN,configuration.webmaster);
ADD_STRING(GATEWAY_INTERFACE, CGI/1.1);
-   ADD_STRING(DOCUMENT_ROOT, configuration.site);
+
+   docroot = __unixify(WG(conn)-homedir,0,NULL,1024,0);
+   if (docroot) ADD_STRING(DOCUMENT_ROOT, docroot);
 
ADD_FIELD(REQUEST_METHOD, methodstr);
ADD_FIELD(REQUEST_URI, requesturi);
@@ -147,7 +150,7 @@
char *path;
 
/* Convert filename to Unix format*/
-   __riscosify_control|=__RISCOSIFY_DONT_CHECK_DIR;
+   __riscosify_control|=__RISCOSIFY_STRICT_UNIX_SPECS;
path = __unixify(WG(conn)-filename,0,NULL,1024,0);
if (path) SG(request_info).path_translated = estrdup(path);
 

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

[PHP-CVS] cvs: php-src(PHP_5_1) /sapi/webjames webjames.c

2006-03-07 Thread Alex Waugh

alexwaugh   Tue Mar  7 22:35:30 2006 UTC

  Modified files:  (Branch: PHP_5_1)
/php-src/sapi/webjames  webjames.c 
  Log:
  MFH Improve DOCUMENT_ROOT setting
  
  
http://cvs.php.net/viewcvs.cgi/php-src/sapi/webjames/webjames.c?r1=1.11.2.1r2=1.11.2.2diff_format=u
Index: php-src/sapi/webjames/webjames.c
diff -u php-src/sapi/webjames/webjames.c:1.11.2.1 
php-src/sapi/webjames/webjames.c:1.11.2.2
--- php-src/sapi/webjames/webjames.c:1.11.2.1   Sun Jan  1 12:50:19 2006
+++ php-src/sapi/webjames/webjames.cTue Mar  7 22:35:30 2006
@@ -27,7 +27,7 @@
 
 #include unixlib/local.h
 
-#define WEBJAMES_SAPI_VERSION 1.0.0
+#define WEBJAMES_SAPI_VERSION 1.0.1
 
 typedef struct {
struct connection *conn; /*structure holding all the details of the 
current request*/
@@ -96,6 +96,7 @@
 static void sapi_webjames_register_variables(zval *track_vars_array TSRMLS_DC)
 {
char buf[BUF_SIZE + 1];
+   char *docroot;
 
buf[BUF_SIZE] = '\0';
 
@@ -105,7 +106,9 @@
ADD_NUM(SERVER_PORT, port);
ADD_STRING(SERVER_ADMIN,configuration.webmaster);
ADD_STRING(GATEWAY_INTERFACE, CGI/1.1);
-   ADD_STRING(DOCUMENT_ROOT, configuration.site);
+
+   docroot = __unixify(WG(conn)-homedir,0,NULL,1024,0);
+   if (docroot) ADD_STRING(DOCUMENT_ROOT, docroot);
 
ADD_FIELD(REQUEST_METHOD, methodstr);
ADD_FIELD(REQUEST_URI, requesturi);
@@ -147,7 +150,7 @@
char *path;
 
/* Convert filename to Unix format*/
-   __riscosify_control|=__RISCOSIFY_DONT_CHECK_DIR;
+   __riscosify_control|=__RISCOSIFY_STRICT_UNIX_SPECS;
path = __unixify(WG(conn)-filename,0,NULL,1024,0);
if (path) SG(request_info).path_translated = estrdup(path);
 

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

[PHP-CVS] cvs: php-src /main php.h /sapi/cgi cgi_main.c

2006-03-07 Thread Alex Waugh

alexwaugh   Tue Mar  7 22:37:19 2006 UTC

  Modified files:  
/php-src/main   php.h 
/php-src/sapi/cgi   cgi_main.c 
  Log:
  Fix for RISC OS
  
  
http://cvs.php.net/viewcvs.cgi/php-src/main/php.h?r1=1.227r2=1.228diff_format=u
Index: php-src/main/php.h
diff -u php-src/main/php.h:1.227 php-src/main/php.h:1.228
--- php-src/main/php.h:1.227Fri Feb 24 13:30:21 2006
+++ php-src/main/php.h  Tue Mar  7 22:37:18 2006
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: php.h,v 1.227 2006/02/24 13:30:21 helly Exp $ */
+/* $Id: php.h,v 1.228 2006/03/07 22:37:18 alexwaugh Exp $ */
 
 #ifndef PHP_H
 #define PHP_H
@@ -415,7 +415,7 @@
  */
 
 #ifndef XtOffset
-#if defined(CRAY) || (defined(__arm)  !defined(LINUX))
+#if defined(CRAY) || (defined(__arm)  !(defined(LINUX) || 
defined(__riscos__)))
 #ifdef __STDC__
 #define XtOffset(p_type, field) _Offsetof(p_type, field)
 #else
http://cvs.php.net/viewcvs.cgi/php-src/sapi/cgi/cgi_main.c?r1=1.276r2=1.277diff_format=u
Index: php-src/sapi/cgi/cgi_main.c
diff -u php-src/sapi/cgi/cgi_main.c:1.276 php-src/sapi/cgi/cgi_main.c:1.277
--- php-src/sapi/cgi/cgi_main.c:1.276   Mon Feb 13 10:23:58 2006
+++ php-src/sapi/cgi/cgi_main.c Tue Mar  7 22:37:18 2006
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: cgi_main.c,v 1.276 2006/02/13 10:23:58 dmitry Exp $ */
+/* $Id: cgi_main.c,v 1.277 2006/03/07 22:37:18 alexwaugh Exp $ */
 
 #include php.h
 #include php_globals.h
@@ -69,6 +69,7 @@
 
 #ifdef __riscos__
 #include unixlib/local.h
+int __riscosify_control = __RISCOSIFY_STRICT_UNIX_SPECS;
 #endif
 
 #include zend_compile.h

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

[PHP-CVS] cvs: php-src(PHP_5_1) /main php.h /sapi/cgi cgi_main.c

2006-03-07 Thread Alex Waugh

alexwaugh   Tue Mar  7 22:37:53 2006 UTC

  Modified files:  (Branch: PHP_5_1)
/php-src/main   php.h 
/php-src/sapi/cgi   cgi_main.c 
  Log:
  MFH Fix for RISC OS
  
  
http://cvs.php.net/viewcvs.cgi/php-src/main/php.h?r1=1.221.2.3r2=1.221.2.4diff_format=u
Index: php-src/main/php.h
diff -u php-src/main/php.h:1.221.2.3 php-src/main/php.h:1.221.2.4
--- php-src/main/php.h:1.221.2.3Sat Feb 25 18:25:44 2006
+++ php-src/main/php.h  Tue Mar  7 22:37:53 2006
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: php.h,v 1.221.2.3 2006/02/25 18:25:44 helly Exp $ */
+/* $Id: php.h,v 1.221.2.4 2006/03/07 22:37:53 alexwaugh Exp $ */
 
 #ifndef PHP_H
 #define PHP_H
@@ -417,7 +417,7 @@
  */
 
 #ifndef XtOffset
-#if defined(CRAY) || (defined(__arm)  !defined(LINUX))
+#if defined(CRAY) || (defined(__arm)  !(defined(LINUX) || 
defined(__riscos__)))
 #ifdef __STDC__
 #define XtOffset(p_type, field) _Offsetof(p_type, field)
 #else
http://cvs.php.net/viewcvs.cgi/php-src/sapi/cgi/cgi_main.c?r1=1.267.2.7r2=1.267.2.8diff_format=u
Index: php-src/sapi/cgi/cgi_main.c
diff -u php-src/sapi/cgi/cgi_main.c:1.267.2.7 
php-src/sapi/cgi/cgi_main.c:1.267.2.8
--- php-src/sapi/cgi/cgi_main.c:1.267.2.7   Fri Feb  3 16:30:09 2006
+++ php-src/sapi/cgi/cgi_main.c Tue Mar  7 22:37:53 2006
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: cgi_main.c,v 1.267.2.7 2006/02/03 16:30:09 dmitry Exp $ */
+/* $Id: cgi_main.c,v 1.267.2.8 2006/03/07 22:37:53 alexwaugh Exp $ */
 
 #include php.h
 #include php_globals.h
@@ -69,6 +69,7 @@
 
 #ifdef __riscos__
 #include unixlib/local.h
+int __riscosify_control = __RISCOSIFY_STRICT_UNIX_SPECS;
 #endif
 
 #include zend_compile.h

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

[PHP-CVS-DAILY] cvs: php-src / ChangeLog

[PHP-CVS] cvs: php-src(PHP_4_4) /win32 php4dllts.dsp

[PHP-CVS] cvs: php-src /sapi/apache mod_php5.c php_apache.c /sapi/apache2filter sapi_apache2.c /sapi/apache2handler sapi_apache2.c /sapi/apache_hooks php_apache.c /sapi/nsapi nsapi.c

[PHP-CVS] cvs: php-src(PHP_5_1) /ext/simplexml simplexml.c /ext/simplexml/tests 027.phpt 030.phpt 031.phpt bug35785.phpt

[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS

[PHP-CVS] cvs: CVSROOT / avail

[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS

[PHP-CVS] cvs: php-src /ext/spl spl_directory.c

[PHP-CVS] cvs: php-src /sapi/webjames webjames.c

[PHP-CVS] cvs: php-src(PHP_5_1) /sapi/webjames webjames.c

[PHP-CVS] cvs: php-src /main php.h /sapi/cgi cgi_main.c

[PHP-CVS] cvs: php-src(PHP_5_1) /main php.h /sapi/cgi cgi_main.c

12 matches

Site Navigation

Mail list logo

Footer information