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

2007-11-13 Thread changelog
changelog   Wed Nov 14 01:31:25 2007 UTC

  Modified files:  
/php-srcChangeLog 
  Log:
  ChangeLog update
  
http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.2867r2=1.2868diff_format=u
Index: php-src/ChangeLog
diff -u php-src/ChangeLog:1.2867 php-src/ChangeLog:1.2868
--- php-src/ChangeLog:1.2867Tue Nov 13 01:31:30 2007
+++ php-src/ChangeLog   Wed Nov 14 01:31:25 2007
@@ -1,3 +1,115 @@
+2007-11-13  Etienne Kneuss  [EMAIL PROTECTED]
+
+* ext/soap/soap.c:
+  Fix typos
+
+2007-11-13  Ilia Alshanetsky  [EMAIL PROTECTED]
+
+* ext/pgsql/pgsql.c:
+  MFB: Fixed bug #43279 (pg_send_query_params() converts all elements in
+  'params'
+  to strings)
+
+* (PHP_5_2)
+  NEWS
+  ext/pgsql/pgsql.c:
+  
+  MFB: Fixed bug #43279 (pg_send_query_params() converts all elements in
+  'params' to strings)
+
+* (PHP_5_3)
+  ext/pgsql/pgsql.c:
+  Fixed bug #43279 (pg_send_query_params() converts all elements in 
'params'
+  to strings)
+
+2007-11-13  Antony Dovgal  [EMAIL PROTECTED]
+
+* (PHP_5_3)
+  ZendEngine2/zend_compile.c
+  ZendEngine2/tests/access_modifiers_001.phpt
+  ZendEngine2/tests/access_modifiers_002.phpt
+  ZendEngine2/tests/access_modifiers_003.phpt
+  ZendEngine2/tests/access_modifiers_004.phpt
+  ZendEngine2/tests/access_modifiers_005.phpt
+  ZendEngine2/tests/access_modifiers_006.phpt
+  ZendEngine2/tests/access_modifiers_007.phpt:
+  MFH: disallow multiple access modifiers and 'abstract abstract' methods
+  (patch by Etienne Kneuss)
+  add tests
+
+* ZendEngine2/tests/access_modifiers_001.phpt
+  ZendEngine2/tests/access_modifiers_001.phpt
+  ZendEngine2/tests/access_modifiers_002.phpt
+  ZendEngine2/tests/access_modifiers_002.phpt
+  ZendEngine2/tests/access_modifiers_003.phpt
+  ZendEngine2/tests/access_modifiers_003.phpt
+  ZendEngine2/tests/access_modifiers_004.phpt
+  ZendEngine2/tests/access_modifiers_004.phpt
+  ZendEngine2/tests/access_modifiers_005.phpt
+  ZendEngine2/tests/access_modifiers_005.phpt
+  ZendEngine2/tests/access_modifiers_006.phpt
+  ZendEngine2/tests/access_modifiers_006.phpt
+  ZendEngine2/tests/access_modifiers_007.phpt
+  ZendEngine2/tests/access_modifiers_007.phpt:
+  
+  disallow multiple access modifiers and 'abstract abstract' methods
+  add tests
+
+* ZendEngine2/zend_compile.c:
+  disallow multiple access modifiers and 'abstract abstract' methods
+  add tests
+
+2007-11-13  Dmitry Stogov  [EMAIL PROTECTED]
+
+* ext/soap/tests/bugs/bug42692.phpt
+  ext/soap/tests/bugs/bug42692.phpt
+  ext/soap/tests/bugs/bug42692.phpt
+  ext/soap/tests/bugs/bug42692.wsdl
+  ext/soap/tests/bugs/bug42692.wsdl
+  ext/soap/tests/bugs/bug42692.wsdl:
+1.1.4;
+  file bug42692.phpt was initially added on branch PHP_5_2.
+
+* (PHP_5_2)
+  NEWS
+  ext/soap/soap.c
+  ext/soap/soap.c
+  ext/soap/soap.c
+  ext/soap/tests/bugs/bug42692.phpt
+  ext/soap/tests/bugs/bug42692.phpt
+  ext/soap/tests/bugs/bug42692.wsdl
+  ext/soap/tests/bugs/bug42692.wsdl:
+  Fixed bug #42692 (Procedure 'int1' not present with doc/lit SoapServer)
+
+2007-11-13  Antony Dovgal  [EMAIL PROTECTED]
+
+* ext/oci8/config.m4:
+  remove Oracle8 support (it should have been done long ago..)
+
+* (PHP_5_2)
+  ext/standard/file.c:
+  fix typo
+
+* (PHP_5_3)
+  ext/standard/file.c:
+  fix typo (nice catch, Nuno!)
+
+2007-11-13  Dmitry Stogov  [EMAIL PROTECTED]
+
+* TSRM/tsrm_virtual_cwd.c
+  TSRM/tsrm_virtual_cwd.c
+  ext/standard/tests/file/bug43248.phpt
+  ext/standard/tests/file/bug43248.phpt:
+  Fixed bug #43248 (backward compatibility break in realpath())
+
+* (PHP_5_2)
+  NEWS
+  TSRM/tsrm_virtual_cwd.c
+  ext/standard/tests/file/bug43248.phpt
+  ext/standard/tests/file/bug43248.phpt
+  ext/standard/tests/file/bug43248.phpt:
+  Fixed Bug #43248 (backward compatibility break in realpath())
+
 2007-11-12  Zoe Slattery  [EMAIL PROTECTED]
 
 * (PHP_5_2)


[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog

2007-11-13 Thread changelog
changelog   Wed Nov 14 01:31:28 2007 UTC

  Modified files:  
/ZendEngine2ChangeLog 
  Log:
  ChangeLog update
  
http://cvs.php.net/viewvc.cgi/ZendEngine2/ChangeLog?r1=1.1197r2=1.1198diff_format=u
Index: ZendEngine2/ChangeLog
diff -u ZendEngine2/ChangeLog:1.1197 ZendEngine2/ChangeLog:1.1198
--- ZendEngine2/ChangeLog:1.1197Tue Nov 13 01:31:33 2007
+++ ZendEngine2/ChangeLog   Wed Nov 14 01:31:28 2007
@@ -1,3 +1,40 @@
+2007-11-13  Antony Dovgal  [EMAIL PROTECTED]
+
+* (PHP_5_3)
+  zend_compile.c
+  tests/access_modifiers_001.phpt
+  tests/access_modifiers_002.phpt
+  tests/access_modifiers_003.phpt
+  tests/access_modifiers_004.phpt
+  tests/access_modifiers_005.phpt
+  tests/access_modifiers_006.phpt
+  tests/access_modifiers_007.phpt:
+  MFH: disallow multiple access modifiers and 'abstract abstract' methods
+  (patch by Etienne Kneuss)
+  add tests
+
+* tests/access_modifiers_001.phpt
+  tests/access_modifiers_001.phpt
+  tests/access_modifiers_002.phpt
+  tests/access_modifiers_002.phpt
+  tests/access_modifiers_003.phpt
+  tests/access_modifiers_003.phpt
+  tests/access_modifiers_004.phpt
+  tests/access_modifiers_004.phpt
+  tests/access_modifiers_005.phpt
+  tests/access_modifiers_005.phpt
+  tests/access_modifiers_006.phpt
+  tests/access_modifiers_006.phpt
+  tests/access_modifiers_007.phpt
+  tests/access_modifiers_007.phpt:
+  
+  disallow multiple access modifiers and 'abstract abstract' methods
+  add tests
+
+* zend_compile.c:
+  disallow multiple access modifiers and 'abstract abstract' methods
+  add tests
+
 2007-11-12  Dmitry Stogov  [EMAIL PROTECTED]
 
 * zend_compile.c
@@ -19997,7 +20034,7 @@
 2003-06-10  Jani Taskinen  [EMAIL PROTECTED]
 
 * zend_multiply.h:
-  - Missing $Id: ChangeLog,v 1.1197 2007/11/13 01:31:33 changelog Exp $ tag
+  - Missing $Id: ChangeLog,v 1.1198 2007/11/14 01:31:28 changelog Exp $ tag
 
 2003-06-10  James Cox  [EMAIL PROTECTED]
 
@@ -21721,7 +21758,7 @@
   zend_types.h
   zend_variables.c
   zend_variables.h:
-  - Added some missing CVS $Id: ChangeLog,v 1.1197 2007/11/13 01:31:33 
changelog Exp $ tags, headers and footers.
+  - Added some missing CVS $Id: ChangeLog,v 1.1198 2007/11/14 01:31:28 
changelog Exp $ tags, headers and footers.
 
 2003-01-30  Ilia Alshanetsky  [EMAIL PROTECTED]
 



[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/standard/tests/file bug43248.phpt TSRM tsrm_virtual_cwd.c

2007-11-13 Thread Dmitry Stogov
dmitry  Tue Nov 13 09:46:39 2007 UTC

  Added files: (Branch: PHP_5_2)
/php-src/ext/standard/tests/filebug43248.phpt 

  Modified files:  
/php-srcNEWS 
/TSRM   tsrm_virtual_cwd.c 
  Log:
  Fixed Bug #43248 (backward compatibility break in realpath())
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1007r2=1.2027.2.547.2.1008diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1007 php-src/NEWS:1.2027.2.547.2.1008
--- php-src/NEWS:1.2027.2.547.2.1007Mon Nov 12 19:00:04 2007
+++ php-src/NEWSTue Nov 13 09:46:39 2007
@@ -1,6 +1,7 @@
 PHPNEWS
 |||
 ?? ??? 2008, PHP 5.2.6
+- Fixed bug #43248 (backward compatibility break in realpath()). (Dmitry)
 - Fixed bug #43221 (SimpleXML adding default namespace in addAttribute). (Rob)
 - Fixed bug #43216 (stream_is_local() returns false on file://). (Dmitry)
 - Fixed bug #43201 (Crash on using unitialized vals and __get/__set). (Dmitry)
http://cvs.php.net/viewvc.cgi/TSRM/tsrm_virtual_cwd.c?r1=1.74.2.9.2.36r2=1.74.2.9.2.37diff_format=u
Index: TSRM/tsrm_virtual_cwd.c
diff -u TSRM/tsrm_virtual_cwd.c:1.74.2.9.2.36 
TSRM/tsrm_virtual_cwd.c:1.74.2.9.2.37
--- TSRM/tsrm_virtual_cwd.c:1.74.2.9.2.36   Tue Oct 23 05:57:35 2007
+++ TSRM/tsrm_virtual_cwd.c Tue Nov 13 09:46:39 2007
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: tsrm_virtual_cwd.c,v 1.74.2.9.2.36 2007/10/23 05:57:35 dmitry Exp $ */
+/* $Id: tsrm_virtual_cwd.c,v 1.74.2.9.2.37 2007/11/13 09:46:39 dmitry Exp $ */
 
 #include sys/types.h
 #include sys/stat.h
@@ -712,22 +712,24 @@
}
ptr = tsrm_strtok_r(NULL, TOKENIZER_STRING, tok);
}
+   free(free_path);
+
+   if (use_realpath == CWD_REALPATH) {
+   if (ret) {
+   CWD_STATE_FREE(state);
+   *state = old_state; 

+   return 1;
+   }
+   } else {
 #if defined(TSRM_WIN32) || defined(NETWARE)
-   if (path[path_length-1] == '\\' || path[path_length-1] == '/') {
+   if (path[path_length-1] == '\\' || path[path_length-1] 
== '/') {
 #else 
-   if (path[path_length-1] == '/') {
+   if (path[path_length-1] == '/') {
 #endif
-   state-cwd = (char*)realloc(state-cwd, 
state-cwd_length + 2);
-   state-cwd[state-cwd_length++] = DEFAULT_SLASH;
-   state-cwd[state-cwd_length] = 0;
-   }
-
-   free(free_path);
-
-   if ((use_realpath == CWD_REALPATH)  ret) {
-   CWD_STATE_FREE(state);
-   *state = old_state; 
-   return 1;
+   state-cwd = (char*)realloc(state-cwd, 
state-cwd_length + 2);
+   state-cwd[state-cwd_length++] = DEFAULT_SLASH;
+   state-cwd[state-cwd_length] = 0;
+   }
}
 
if (state-cwd_length == COPY_WHEN_ABSOLUTE(state-cwd)) {

http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/bug43248.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/file/bug43248.phpt
+++ php-src/ext/standard/tests/file/bug43248.phpt

-- 
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/file bug43248.phpt TSRM tsrm_virtual_cwd.c

2007-11-13 Thread Dmitry Stogov
dmitry  Tue Nov 13 09:47:07 2007 UTC

  Added files: (Branch: PHP_5_3)
/php-src/ext/standard/tests/filebug43248.phpt 

  Modified files:  
/TSRM   tsrm_virtual_cwd.c 
  Log:
  Fixed bug #43248 (backward compatibility break in realpath())
  
  
http://cvs.php.net/viewvc.cgi/TSRM/tsrm_virtual_cwd.c?r1=1.74.2.9.2.35.2.1r2=1.74.2.9.2.35.2.2diff_format=u
Index: TSRM/tsrm_virtual_cwd.c
diff -u TSRM/tsrm_virtual_cwd.c:1.74.2.9.2.35.2.1 
TSRM/tsrm_virtual_cwd.c:1.74.2.9.2.35.2.2
--- TSRM/tsrm_virtual_cwd.c:1.74.2.9.2.35.2.1   Tue Oct 23 05:57:25 2007
+++ TSRM/tsrm_virtual_cwd.c Tue Nov 13 09:47:06 2007
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: tsrm_virtual_cwd.c,v 1.74.2.9.2.35.2.1 2007/10/23 05:57:25 dmitry Exp 
$ */
+/* $Id: tsrm_virtual_cwd.c,v 1.74.2.9.2.35.2.2 2007/11/13 09:47:06 dmitry Exp 
$ */
 
 #include sys/types.h
 #include sys/stat.h
@@ -712,22 +712,25 @@
}
ptr = tsrm_strtok_r(NULL, TOKENIZER_STRING, tok);
}
-#if defined(TSRM_WIN32) || defined(NETWARE)
-   if (path[path_length-1] == '\\' || path[path_length-1] == '/') {
-#else 
-   if (path[path_length-1] == '/') {
-#endif
-   state-cwd = (char*)realloc(state-cwd, 
state-cwd_length + 2);
-   state-cwd[state-cwd_length++] = DEFAULT_SLASH;
-   state-cwd[state-cwd_length] = 0;
-   }
 
free(free_path);
 
-   if ((use_realpath == CWD_REALPATH)  ret) {
-   CWD_STATE_FREE(state);
-   *state = old_state; 
-   return 1;
+   if (use_realpath == CWD_REALPATH) {
+   if (ret) {
+   CWD_STATE_FREE(state);
+   *state = old_state; 

+   return 1;
+   }
+   } else {
+#if defined(TSRM_WIN32) || defined(NETWARE)
+   if (path[path_length-1] == '\\' || path[path_length-1] 
== '/') {
+#else 
+   if (path[path_length-1] == '/') {
+#endif
+   state-cwd = (char*)realloc(state-cwd, 
state-cwd_length + 2);
+   state-cwd[state-cwd_length++] = DEFAULT_SLASH;
+   state-cwd[state-cwd_length] = 0;
+   }
}
 
if (state-cwd_length == COPY_WHEN_ABSOLUTE(state-cwd)) {

http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/bug43248.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/file/bug43248.phpt
+++ php-src/ext/standard/tests/file/bug43248.phpt

-- 
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 bug43248.phpt TSRM tsrm_virtual_cwd.c

2007-11-13 Thread Dmitry Stogov
dmitry  Tue Nov 13 09:47:19 2007 UTC

  Modified files:  
/TSRM   tsrm_virtual_cwd.c 
/php-src/ext/standard/tests/filebug43248.phpt 
  Log:
  Fixed bug #43248 (backward compatibility break in realpath())
  
  
http://cvs.php.net/viewvc.cgi/TSRM/tsrm_virtual_cwd.c?r1=1.116r2=1.117diff_format=u
Index: TSRM/tsrm_virtual_cwd.c
diff -u TSRM/tsrm_virtual_cwd.c:1.116 TSRM/tsrm_virtual_cwd.c:1.117
--- TSRM/tsrm_virtual_cwd.c:1.116   Tue Oct 23 05:57:13 2007
+++ TSRM/tsrm_virtual_cwd.c Tue Nov 13 09:47:19 2007
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: tsrm_virtual_cwd.c,v 1.116 2007/10/23 05:57:13 dmitry Exp $ */
+/* $Id: tsrm_virtual_cwd.c,v 1.117 2007/11/13 09:47:19 dmitry Exp $ */
 
 #include sys/types.h
 #include sys/stat.h
@@ -712,22 +712,25 @@
}
ptr = tsrm_strtok_r(NULL, TOKENIZER_STRING, tok);
}
-#if defined(TSRM_WIN32) || defined(NETWARE)
-   if (path[path_length-1] == '\\' || path[path_length-1] == '/') {
-#else 
-   if (path[path_length-1] == '/') {
-#endif
-   state-cwd = (char*)realloc(state-cwd, 
state-cwd_length + 2);
-   state-cwd[state-cwd_length++] = DEFAULT_SLASH;
-   state-cwd[state-cwd_length] = 0;
-   }
 
free(free_path);
 
-   if ((use_realpath == CWD_REALPATH)  ret) {
-   CWD_STATE_FREE(state);
-   *state = old_state; 
-   return 1;
+   if (use_realpath == CWD_REALPATH) {
+   if (ret) {
+   CWD_STATE_FREE(state);
+   *state = old_state; 

+   return 1;
+   }
+   } else {
+#if defined(TSRM_WIN32) || defined(NETWARE)
+   if (path[path_length-1] == '\\' || path[path_length-1] 
== '/') {
+#else 
+   if (path[path_length-1] == '/') {
+#endif
+   state-cwd = (char*)realloc(state-cwd, 
state-cwd_length + 2);
+   state-cwd[state-cwd_length++] = DEFAULT_SLASH;
+   state-cwd[state-cwd_length] = 0;
+   }
}
 
if (state-cwd_length == COPY_WHEN_ABSOLUTE(state-cwd)) {
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/bug43248.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/standard/tests/file/bug43248.phpt
diff -u /dev/null php-src/ext/standard/tests/file/bug43248.phpt:1.2
--- /dev/null   Tue Nov 13 09:47:19 2007
+++ php-src/ext/standard/tests/file/bug43248.phpt   Tue Nov 13 09:47:19 2007
@@ -0,0 +1,8 @@
+--TEST--
+Bug #43248 backward compatibility break in realpath() 
+--FILE--
+?php
+echo realpath(dirname(__FILE__) . '/../file/');
+?
+--EXPECTF--
+%sfile

-- 
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 file.c

2007-11-13 Thread Antony Dovgal
tony2001Tue Nov 13 10:31:25 2007 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/standard   file.c 
  Log:
  fix typo (nice catch, Nuno!)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/file.c?r1=1.409.2.6.2.28.2.5r2=1.409.2.6.2.28.2.6diff_format=u
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.409.2.6.2.28.2.5 
php-src/ext/standard/file.c:1.409.2.6.2.28.2.6
--- php-src/ext/standard/file.c:1.409.2.6.2.28.2.5  Mon Nov 12 18:44:18 2007
+++ php-src/ext/standard/file.c Tue Nov 13 10:31:24 2007
@@ -21,7 +21,7 @@
+--+
 */
 
-/* $Id: file.c,v 1.409.2.6.2.28.2.5 2007/11/12 18:44:18 iliaa Exp $ */
+/* $Id: file.c,v 1.409.2.6.2.28.2.6 2007/11/13 10:31:24 tony2001 Exp $ */
 
 /* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
 
@@ -610,7 +610,7 @@
RETURN_FALSE;
}
 
-   if (mode[0] = 'c') {
+   if (mode[0] == 'c') {
php_stream_truncate_set_size(stream, 0);
}
 

-- 
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 file.c

2007-11-13 Thread Antony Dovgal
tony2001Tue Nov 13 10:31:34 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/standard   file.c 
  Log:
  fix typo
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/file.c?r1=1.409.2.6.2.29r2=1.409.2.6.2.30diff_format=u
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.409.2.6.2.29 
php-src/ext/standard/file.c:1.409.2.6.2.30
--- php-src/ext/standard/file.c:1.409.2.6.2.29  Mon Nov 12 18:47:46 2007
+++ php-src/ext/standard/file.c Tue Nov 13 10:31:34 2007
@@ -21,7 +21,7 @@
+--+
  */
 
-/* $Id: file.c,v 1.409.2.6.2.29 2007/11/12 18:47:46 iliaa Exp $ */
+/* $Id: file.c,v 1.409.2.6.2.30 2007/11/13 10:31:34 tony2001 Exp $ */
 
 /* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
 
@@ -622,7 +622,7 @@
RETURN_FALSE;
}
 
-   if (mode[0] = 'c') {
+   if (mode[0] == 'c') {
php_stream_truncate_set_size(stream, 0);
}
 

-- 
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) / NEWS /ext/standard/tests/file bug43248.phpt TSRM tsrm_virtual_cwd.c

2007-11-13 Thread Jani Taskinen
What about PHP_5_3 branch??

--Jani

On Tue, 2007-11-13 at 09:46 +, Dmitry Stogov wrote:
 dmitryTue Nov 13 09:46:39 2007 UTC
 
   Added files: (Branch: PHP_5_2)
 /php-src/ext/standard/tests/file  bug43248.phpt 
 
   Modified files:  
 /php-src  NEWS 
 /TSRM tsrm_virtual_cwd.c 
   Log:
   Fixed Bug #43248 (backward compatibility break in realpath())
   
   
 http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1007r2=1.2027.2.547.2.1008diff_format=u
 Index: php-src/NEWS
 diff -u php-src/NEWS:1.2027.2.547.2.1007 php-src/NEWS:1.2027.2.547.2.1008
 --- php-src/NEWS:1.2027.2.547.2.1007  Mon Nov 12 19:00:04 2007
 +++ php-src/NEWS  Tue Nov 13 09:46:39 2007
 @@ -1,6 +1,7 @@
  PHP
 NEWS
  
 |||
  ?? ??? 2008, PHP 5.2.6
 +- Fixed bug #43248 (backward compatibility break in realpath()). (Dmitry)
  - Fixed bug #43221 (SimpleXML adding default namespace in addAttribute). 
 (Rob)
  - Fixed bug #43216 (stream_is_local() returns false on file://). (Dmitry)
  - Fixed bug #43201 (Crash on using unitialized vals and __get/__set). 
 (Dmitry)
 http://cvs.php.net/viewvc.cgi/TSRM/tsrm_virtual_cwd.c?r1=1.74.2.9.2.36r2=1.74.2.9.2.37diff_format=u
 Index: TSRM/tsrm_virtual_cwd.c
 diff -u TSRM/tsrm_virtual_cwd.c:1.74.2.9.2.36 
 TSRM/tsrm_virtual_cwd.c:1.74.2.9.2.37
 --- TSRM/tsrm_virtual_cwd.c:1.74.2.9.2.36 Tue Oct 23 05:57:35 2007
 +++ TSRM/tsrm_virtual_cwd.c   Tue Nov 13 09:46:39 2007
 @@ -17,7 +17,7 @@
 +--+
  */
  
 -/* $Id: tsrm_virtual_cwd.c,v 1.74.2.9.2.36 2007/10/23 05:57:35 dmitry Exp $ 
 */
 +/* $Id: tsrm_virtual_cwd.c,v 1.74.2.9.2.37 2007/11/13 09:46:39 dmitry Exp $ 
 */
  
  #include sys/types.h
  #include sys/stat.h
 @@ -712,22 +712,24 @@
   }
   ptr = tsrm_strtok_r(NULL, TOKENIZER_STRING, tok);
   }
 + free(free_path);
 +
 + if (use_realpath == CWD_REALPATH) {
 + if (ret) {
 + CWD_STATE_FREE(state);
 + *state = old_state; 
 
 + return 1;
 + }
 + } else {
  #if defined(TSRM_WIN32) || defined(NETWARE)
 - if (path[path_length-1] == '\\' || path[path_length-1] == '/') {
 + if (path[path_length-1] == '\\' || path[path_length-1] 
 == '/') {
  #else 
 - if (path[path_length-1] == '/') {
 + if (path[path_length-1] == '/') {
  #endif
 - state-cwd = (char*)realloc(state-cwd, 
 state-cwd_length + 2);
 - state-cwd[state-cwd_length++] = DEFAULT_SLASH;
 - state-cwd[state-cwd_length] = 0;
 - }
 -
 - free(free_path);
 -
 - if ((use_realpath == CWD_REALPATH)  ret) {
 - CWD_STATE_FREE(state);
 - *state = old_state; 
 - return 1;
 + state-cwd = (char*)realloc(state-cwd, 
 state-cwd_length + 2);
 + state-cwd[state-cwd_length++] = DEFAULT_SLASH;
 + state-cwd[state-cwd_length] = 0;
 + }
   }
  
   if (state-cwd_length == COPY_WHEN_ABSOLUTE(state-cwd)) {
 
 http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/bug43248.phpt?view=markuprev=1.1
 Index: php-src/ext/standard/tests/file/bug43248.phpt
 +++ php-src/ext/standard/tests/file/bug43248.phpt
 
-- 
Patches/Donations: http://pecl.php.net/~jani/

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



[PHP-CVS] cvs: php-src /ext/oci8 config.m4

2007-11-13 Thread Antony Dovgal
tony2001Tue Nov 13 11:09:30 2007 UTC

  Modified files:  
/php-src/ext/oci8   config.m4 
  Log:
  remove Oracle8 support (it should have been done long ago..)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/config.m4?r1=1.70r2=1.71diff_format=u
Index: php-src/ext/oci8/config.m4
diff -u php-src/ext/oci8/config.m4:1.70 php-src/ext/oci8/config.m4:1.71
--- php-src/ext/oci8/config.m4:1.70 Tue Aug 14 12:14:53 2007
+++ php-src/ext/oci8/config.m4  Tue Nov 13 11:09:30 2007
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.70 2007/08/14 12:14:53 tony2001 Exp $
+dnl $Id: config.m4,v 1.71 2007/11/13 11:09:30 tony2001 Exp $
 dnl
 
 if test -z $SED; then
@@ -202,48 +202,11 @@
 
   case $OCI8_VERSION in
 8.0)
-  PHP_ADD_LIBRARY_WITH_PATH(nlsrtl3, , OCI8_SHARED_LIBADD)
-  PHP_ADD_LIBRARY_WITH_PATH(core4, , OCI8_SHARED_LIBADD)
-  PHP_ADD_LIBRARY_WITH_PATH(psa, , OCI8_SHARED_LIBADD)
-  PHP_ADD_LIBRARY_WITH_PATH(clntsh, $OCI8_DIR/$OCI8_LIB_DIR, 
OCI8_SHARED_LIBADD)
-
-  PHP_CHECK_LIBRARY(clntsh, OCIEnvCreate,
-  [
-AC_DEFINE(HAVE_OCI_ENV_CREATE,1,[ ])
-  ], [], [
--L$OCI8_DIR/$OCI8_LIB_DIR $OCI8_SHARED_LIBADD
-  ])
-
-  PHP_CHECK_LIBRARY(clntsh, OCIStmtPrepare2,
-  [
-AC_DEFINE(HAVE_OCI_STMT_PREPARE2,1,[ ])
-  ], [], [
--L$OCI8_DIR/$OCI8_LIB_DIR $OCI8_SHARED_LIBADD
-  ])
+  AC_MSG_ERROR([Oracle client libraries  9.0 are not supported any more. 
Please consider upgrading.])
   ;;
 
 8.1)
-  PHP_ADD_LIBRARY(clntsh, 1, OCI8_SHARED_LIBADD)
-  PHP_ADD_LIBPATH($OCI8_DIR/$OCI8_LIB_DIR, OCI8_SHARED_LIBADD)
-
-  PHP_CHECK_LIBRARY(clntsh, OCIEnvCreate,
-  [
-AC_DEFINE(HAVE_OCI_ENV_CREATE,1,[ ])
-  ], [], [
--L$OCI8_DIR/$OCI8_LIB_DIR $OCI8_SHARED_LIBADD
-  ])
-
-  PHP_CHECK_LIBRARY(clntsh, OCIStmtPrepare2,
-  [
-AC_DEFINE(HAVE_OCI_STMT_PREPARE2,1,[ ])
-  ], [], [
--L$OCI8_DIR/$OCI8_LIB_DIR $OCI8_SHARED_LIBADD
-  ])
- 
-  dnl 
-  dnl OCI_ATTR_STATEMENT is not available in all 8.1.x versions
-  dnl 
-  PHP_OCI_IF_DEFINED(OCI_ATTR_STATEMENT, 
[AC_DEFINE(HAVE_OCI8_ATTR_STATEMENT,1,[ ])], $OCI8_INCLUDES)
+  AC_MSG_ERROR([Oracle client libraries  9.0 are not supported any more. 
Please consider upgrading.])
   ;;
 
 9.0)
@@ -300,7 +263,7 @@
   AC_DEFINE(PHP_OCI8_HAVE_COLLECTIONS,1,[ ])
   ;;
 *)
-  AC_MSG_ERROR([Unsupported Oracle version!])
+  AC_MSG_ERROR([Oracle version $OCI8_VERSION is not supported])
   ;;
   esac
 
@@ -399,7 +362,7 @@
   ;;
 
 *)
-  AC_MSG_ERROR([Unsupported Oracle Instant Client version])
+  AC_MSG_ERROR([Oracle Instant CLient version $PHP_OCI8_INSTANT_CLIENT is 
not supported])
   ;;
   esac
 

-- 
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/oci8 config.m4

2007-11-13 Thread Antony Dovgal
tony2001Tue Nov 13 11:09:42 2007 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/oci8   config.m4 
  Log:
  MFH: remove Oracle8 support
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/config.m4?r1=1.55.2.3.2.11r2=1.55.2.3.2.11.2.1diff_format=u
Index: php-src/ext/oci8/config.m4
diff -u php-src/ext/oci8/config.m4:1.55.2.3.2.11 
php-src/ext/oci8/config.m4:1.55.2.3.2.11.2.1
--- php-src/ext/oci8/config.m4:1.55.2.3.2.11Tue Aug 14 12:15:04 2007
+++ php-src/ext/oci8/config.m4  Tue Nov 13 11:09:42 2007
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.55.2.3.2.11 2007/08/14 12:15:04 tony2001 Exp $
+dnl $Id: config.m4,v 1.55.2.3.2.11.2.1 2007/11/13 11:09:42 tony2001 Exp $
 dnl
 
 if test -z $SED; then
@@ -202,48 +202,11 @@
 
   case $OCI8_VERSION in
 8.0)
-  PHP_ADD_LIBRARY_WITH_PATH(nlsrtl3, , OCI8_SHARED_LIBADD)
-  PHP_ADD_LIBRARY_WITH_PATH(core4, , OCI8_SHARED_LIBADD)
-  PHP_ADD_LIBRARY_WITH_PATH(psa, , OCI8_SHARED_LIBADD)
-  PHP_ADD_LIBRARY_WITH_PATH(clntsh, $OCI8_DIR/$OCI8_LIB_DIR, 
OCI8_SHARED_LIBADD)
-
-  PHP_CHECK_LIBRARY(clntsh, OCIEnvCreate,
-  [
-AC_DEFINE(HAVE_OCI_ENV_CREATE,1,[ ])
-  ], [], [
--L$OCI8_DIR/$OCI8_LIB_DIR $OCI8_SHARED_LIBADD
-  ])
-
-  PHP_CHECK_LIBRARY(clntsh, OCIStmtPrepare2,
-  [
-AC_DEFINE(HAVE_OCI_STMT_PREPARE2,1,[ ])
-  ], [], [
--L$OCI8_DIR/$OCI8_LIB_DIR $OCI8_SHARED_LIBADD
-  ])
+  AC_MSG_ERROR([Oracle client libraries  9.0 are not supported any more. 
Please consider upgrading.])
   ;;
 
 8.1)
-  PHP_ADD_LIBRARY(clntsh, 1, OCI8_SHARED_LIBADD)
-  PHP_ADD_LIBPATH($OCI8_DIR/$OCI8_LIB_DIR, OCI8_SHARED_LIBADD)
-
-  PHP_CHECK_LIBRARY(clntsh, OCIEnvCreate,
-  [
-AC_DEFINE(HAVE_OCI_ENV_CREATE,1,[ ])
-  ], [], [
--L$OCI8_DIR/$OCI8_LIB_DIR $OCI8_SHARED_LIBADD
-  ])
-
-  PHP_CHECK_LIBRARY(clntsh, OCIStmtPrepare2,
-  [
-AC_DEFINE(HAVE_OCI_STMT_PREPARE2,1,[ ])
-  ], [], [
--L$OCI8_DIR/$OCI8_LIB_DIR $OCI8_SHARED_LIBADD
-  ])
- 
-  dnl 
-  dnl OCI_ATTR_STATEMENT is not available in all 8.1.x versions
-  dnl 
-  PHP_OCI_IF_DEFINED(OCI_ATTR_STATEMENT, 
[AC_DEFINE(HAVE_OCI8_ATTR_STATEMENT,1,[ ])], $OCI8_INCLUDES)
+  AC_MSG_ERROR([Oracle client libraries  9.0 are not supported any more. 
Please consider upgrading.])
   ;;
 
 9.0)
@@ -300,7 +263,7 @@
   AC_DEFINE(PHP_OCI8_HAVE_COLLECTIONS,1,[ ])
   ;;
 *)
-  AC_MSG_ERROR([Unsupported Oracle version!])
+  AC_MSG_ERROR([Oracle version $OCI8_VERSION is not supported])
   ;;
   esac
 
@@ -399,7 +362,7 @@
   ;;
 
 *)
-  AC_MSG_ERROR([Unsupported Oracle Instant Client version])
+  AC_MSG_ERROR([Oracle Instant CLient version $PHP_OCI8_INSTANT_CLIENT is 
not supported])
   ;;
   esac
 

-- 
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/soap soap.c /ext/soap/tests/bugs bug42692.phpt bug42692.wsdl

2007-11-13 Thread Dmitry Stogov
dmitry  Tue Nov 13 15:10:05 2007 UTC

  Added files: (Branch: PHP_5_2)
/php-src/ext/soap/tests/bugsbug42692.phpt bug42692.wsdl 

  Modified files:  
/php-srcNEWS 
/php-src/ext/soap   soap.c 
  Log:
  Fixed bug #42692 (Procedure 'int1' not present with doc/lit SoapServer)
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1008r2=1.2027.2.547.2.1009diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1008 php-src/NEWS:1.2027.2.547.2.1009
--- php-src/NEWS:1.2027.2.547.2.1008Tue Nov 13 09:46:39 2007
+++ php-src/NEWSTue Nov 13 15:10:04 2007
@@ -12,6 +12,9 @@
 - Fixed bug #42937 (__call() method not invoked when methods are called on
   parent from child class). (Dmitry)
 - Fixed bug #42736 (xmlrpc_server_call_method() crashes). (Tony)
+- Fixed bug #42692 (Procedure 'int1' not present with doc/lit SoapServer).
+  (Dmitry)
+
 
 08 Nov 2007, PHP 5.2.5
 - Upgraded PCRE to version 7.3 (Nuno)
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/soap.c?r1=1.156.2.28.2.33r2=1.156.2.28.2.34diff_format=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.156.2.28.2.33 
php-src/ext/soap/soap.c:1.156.2.28.2.34
--- php-src/ext/soap/soap.c:1.156.2.28.2.33 Thu Nov  1 15:41:13 2007
+++ php-src/ext/soap/soap.c Tue Nov 13 15:10:04 2007
@@ -17,7 +17,7 @@
   |  Dmitry Stogov [EMAIL PROTECTED] |
   +--+
 */
-/* $Id: soap.c,v 1.156.2.28.2.33 2007/11/01 15:41:13 dmitry Exp $ */
+/* $Id: soap.c,v 1.156.2.28.2.34 2007/11/13 15:10:04 dmitry Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -4486,6 +4486,7 @@
break;
}

zend_hash_move_forward((*tmp)-requestParameters);
+   node = node-next;
}
if (ok /* node == NULL*/) {
return (*tmp);

http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/bug42692.phpt?view=markuprev=1.1
Index: php-src/ext/soap/tests/bugs/bug42692.phpt
+++ php-src/ext/soap/tests/bugs/bug42692.phpt

http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/bug42692.wsdl?view=markuprev=1.1
Index: php-src/ext/soap/tests/bugs/bug42692.wsdl
+++ php-src/ext/soap/tests/bugs/bug42692.wsdl

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



[PHP-CVS] cvs: php-src(PHP_5_3) /ext/soap soap.c /ext/soap/tests/bugs bug42692.phpt bug42692.wsdl

2007-11-13 Thread Dmitry Stogov
dmitry  Tue Nov 13 15:10:17 2007 UTC

  Added files: (Branch: PHP_5_3)
/php-src/ext/soap/tests/bugsbug42692.phpt bug42692.wsdl 

  Modified files:  
/php-src/ext/soap   soap.c 
  Log:
  Fixed bug #42692 (Procedure 'int1' not present with doc/lit SoapServer)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/soap.c?r1=1.156.2.28.2.30.2.6r2=1.156.2.28.2.30.2.7diff_format=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.156.2.28.2.30.2.6 
php-src/ext/soap/soap.c:1.156.2.28.2.30.2.7
--- php-src/ext/soap/soap.c:1.156.2.28.2.30.2.6 Thu Nov  1 15:41:25 2007
+++ php-src/ext/soap/soap.c Tue Nov 13 15:10:16 2007
@@ -17,7 +17,7 @@
   |  Dmitry Stogov [EMAIL PROTECTED] |
   +--+
 */
-/* $Id: soap.c,v 1.156.2.28.2.30.2.6 2007/11/01 15:41:25 dmitry Exp $ */
+/* $Id: soap.c,v 1.156.2.28.2.30.2.7 2007/11/13 15:10:16 dmitry Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -4487,6 +4487,7 @@
break;
}

zend_hash_move_forward((*tmp)-requestParameters);
+   node = node-next;
}
if (ok /* node == NULL*/) {
return (*tmp);

http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/bug42692.phpt?view=markuprev=1.1
Index: php-src/ext/soap/tests/bugs/bug42692.phpt
+++ php-src/ext/soap/tests/bugs/bug42692.phpt

http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/bug42692.wsdl?view=markuprev=1.1
Index: php-src/ext/soap/tests/bugs/bug42692.wsdl
+++ php-src/ext/soap/tests/bugs/bug42692.wsdl

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



[PHP-CVS] cvs: php-src /ext/soap soap.c /ext/soap/tests/bugs bug42692.phpt bug42692.wsdl

2007-11-13 Thread Dmitry Stogov
dmitry  Tue Nov 13 15:10:28 2007 UTC

  Modified files:  
/php-src/ext/soap   soap.c 
/php-src/ext/soap/tests/bugsbug42692.phpt bug42692.wsdl 
  Log:
  Fixed bug #42692 (Procedure 'int1' not present with doc/lit SoapServer)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/soap.c?r1=1.236r2=1.237diff_format=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.236 php-src/ext/soap/soap.c:1.237
--- php-src/ext/soap/soap.c:1.236   Thu Nov  1 15:43:17 2007
+++ php-src/ext/soap/soap.c Tue Nov 13 15:10:28 2007
@@ -17,7 +17,7 @@
   |  Dmitry Stogov [EMAIL PROTECTED] |
   +--+
 */
-/* $Id: soap.c,v 1.236 2007/11/01 15:43:17 dmitry Exp $ */
+/* $Id: soap.c,v 1.237 2007/11/13 15:10:28 dmitry Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -5000,6 +5000,7 @@
break;
}

zend_hash_move_forward((*tmp)-requestParameters);
+   node = node-next;
}
if (ok /* node == NULL*/) {
return (*tmp);
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/bug42692.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/soap/tests/bugs/bug42692.phpt
diff -u /dev/null php-src/ext/soap/tests/bugs/bug42692.phpt:1.2
--- /dev/null   Tue Nov 13 15:10:28 2007
+++ php-src/ext/soap/tests/bugs/bug42692.phpt   Tue Nov 13 15:10:28 2007
@@ -0,0 +1,37 @@
+--TEST--
+Bug #42692 (Procedure 'int1' not present with doc/lit SoapServer)
+--FILE--
+?php
+ini_set('soap.wsdl_cache_enabled','0');
+
+function checkAuth($peid,$auth) {
+   return $peid;
+}
+
+class TestSoap extends SoapClient {
+
+   function __construct($wsdl, $options) {
+   parent::__construct($wsdl, $options);
+   $this-server = new SoapServer($wsdl, $options);
+   $this-server-addFunction(checkAuth);
+   }
+
+   function __doRequest($request, $location, $action, $version) {
+   ob_start();
+   $this-server-handle($request);
+   $response = ob_get_contents();
+   ob_end_clean();
+   return $response;
+   }
+}
+
+$client = new TestSoap(dirname(__FILE__) . /bug42692.wsdl, 
array(trace=1));
+try {
+   $result = $client-checkAuth(1,two);
+   echo Auth for 1 is $result\n;
+} catch (Exception $e) {
+   echo $e-getMessage();
+}
+?
+--EXPECT--
+Auth for 1 is 1
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/bug42692.wsdl?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/soap/tests/bugs/bug42692.wsdl
diff -u /dev/null php-src/ext/soap/tests/bugs/bug42692.wsdl:1.2
--- /dev/null   Tue Nov 13 15:10:28 2007
+++ php-src/ext/soap/tests/bugs/bug42692.wsdl   Tue Nov 13 15:10:28 2007
@@ -0,0 +1,40 @@
+?xml version=1.0 encoding=UTF-8?
+definitions name=netDB
+targetNamespace=urn:netDB
+xmlns:typens=urn:netDB
+xmlns:xsd=http://www.w3.org/2001/XMLSchema;
+xmlns:soap=http://schemas.xmlsoap.org/wsdl/soap/;
+xmlns:soapenc=http://schemas.xmlsoap.org/soap/encoding/;
+xmlns:wsdl=http://schemas.xmlsoap.org/wsdl/;
+xmlns=http://schemas.xmlsoap.org/wsdl/;
+   message name=checkAuthIN
+   part name=peid type=xsd:integer /
+   part name=auth type=xsd:string /
+   /message
+   message name=checkAuthOUT
+   part name=peidx type=xsd:integer /
+   /message
+   portType name=netDB
+   operation name=checkAuth
+   input message=typens:checkAuthIN /
+   output message=typens:checkAuthOUT /
+   /operation
+   /portType
+   binding name=netDB type=typens:netDB
+   soap:binding type=rpc 
transport=http://schemas.xmlsoap.org/soap/http; /
+   operation name=checkAuth
+   soap:operation soapAction=urn:checkAuth /
+   input
+   soap:body use=encoded namespace=urn:netDB 
encodingStyle=http://schemas.xmlsoap.org/soap/encoding/; /
+   /input
+   output
+   soap:body use=encoded namespace=urn:netDB 
encodingStyle=http://schemas.xmlsoap.org/soap/encoding/; /
+   /output
+   /operation
+   /binding
+   service name=netDB
+   port name=netDBPort binding=typens:netDB
+   soap:address 
location=http://netdb.alphawest.com.au/xml/soap/server.php/
+   /port
+   /service
+/definitions

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

Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard file.c

2007-11-13 Thread Ilia Alshanetsky

Thanks for the typo catch  fix.


On 13-Nov-07, at 5:31 AM, Antony Dovgal wrote:


tony2001Tue Nov 13 10:31:25 2007 UTC

 Modified files:  (Branch: PHP_5_3)
   /php-src/ext/standardfile.c
 Log:
 fix typo (nice catch, Nuno!)


http://cvs.php.net/viewvc.cgi/php-src/ext/standard/file.c?r1=1.409.2.6.2.28.2.5r2=1.409.2.6.2.28.2.6diff_format=u
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.409.2.6.2.28.2.5 php-src/ext/ 
standard/file.c:1.409.2.6.2.28.2.6
--- php-src/ext/standard/file.c:1.409.2.6.2.28.2.5	Mon Nov 12  
18:44:18 2007

+++ php-src/ext/standard/file.c Tue Nov 13 10:31:24 2007
@@ -21,7 +21,7 @@

+ 
--+

*/

-/* $Id: file.c,v 1.409.2.6.2.28.2.5 2007/11/12 18:44:18 iliaa Exp $  
*/
+/* $Id: file.c,v 1.409.2.6.2.28.2.6 2007/11/13 10:31:24 tony2001  
Exp $ */


/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */

@@ -610,7 +610,7 @@
RETURN_FALSE;
}

-   if (mode[0] = 'c') {
+   if (mode[0] == 'c') {
php_stream_truncate_set_size(stream, 0);
}


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



Ilia Alshanetsky

--
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/pgsql pgsql.c

2007-11-13 Thread Ilia Alshanetsky
iliaa   Tue Nov 13 20:05:47 2007 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/pgsql  pgsql.c 
  Log:
  Fixed bug #43279 (pg_send_query_params() converts all elements in 'params' 
  to strings)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pgsql/pgsql.c?r1=1.331.2.13.2.24.2.3r2=1.331.2.13.2.24.2.4diff_format=u
Index: php-src/ext/pgsql/pgsql.c
diff -u php-src/ext/pgsql/pgsql.c:1.331.2.13.2.24.2.3 
php-src/ext/pgsql/pgsql.c:1.331.2.13.2.24.2.4
--- php-src/ext/pgsql/pgsql.c:1.331.2.13.2.24.2.3   Fri Oct  5 15:00:08 2007
+++ php-src/ext/pgsql/pgsql.c   Tue Nov 13 20:05:47 2007
@@ -20,7 +20,7 @@
+--+
  */
  
-/* $Id: pgsql.c,v 1.331.2.13.2.24.2.3 2007/10/05 15:00:08 jani Exp $ */
+/* $Id: pgsql.c,v 1.331.2.13.2.24.2.4 2007/11/13 20:05:47 iliaa Exp $ */
 
 #include stdlib.h
 
@@ -4084,6 +4084,7 @@
php_error_docref(NULL TSRMLS_CC, E_NOTICE, There are results 
on this connection. Call pg_get_result() until it returns FALSE);
}
 
+   SEPARATE_ZVAL(pv_param_arr);
zend_hash_internal_pointer_reset(Z_ARRVAL_PP(pv_param_arr));
num_params = zend_hash_num_elements(Z_ARRVAL_PP(pv_param_arr));
if (num_params  0) {
@@ -4098,7 +4099,8 @@
}
 
otype = (*tmp)-type;
-   convert_to_string(*tmp);
+   SEPARATE_ZVAL(tmp);
+   convert_to_string_ex(tmp);
if (Z_TYPE_PP(tmp) != IS_STRING) {
php_error_docref(NULL TSRMLS_CC, 
E_WARNING,Error converting parameter);
_php_pgsql_free_params(params, num_params);

-- 
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/pgsql pgsql.c

2007-11-13 Thread Ilia Alshanetsky
iliaa   Tue Nov 13 20:08:05 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/pgsql  pgsql.c 
/php-srcNEWS 
  Log:
  
  MFB: Fixed bug #43279 (pg_send_query_params() converts all elements in
  'params' to strings)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pgsql/pgsql.c?r1=1.331.2.13.2.25r2=1.331.2.13.2.26diff_format=u
Index: php-src/ext/pgsql/pgsql.c
diff -u php-src/ext/pgsql/pgsql.c:1.331.2.13.2.25 
php-src/ext/pgsql/pgsql.c:1.331.2.13.2.26
--- php-src/ext/pgsql/pgsql.c:1.331.2.13.2.25   Wed Oct  3 23:31:58 2007
+++ php-src/ext/pgsql/pgsql.c   Tue Nov 13 20:08:04 2007
@@ -20,7 +20,7 @@
+--+
  */
  
-/* $Id: pgsql.c,v 1.331.2.13.2.25 2007/10/03 23:31:58 iliaa Exp $ */
+/* $Id: pgsql.c,v 1.331.2.13.2.26 2007/11/13 20:08:04 iliaa Exp $ */
 
 #include stdlib.h
 
@@ -4083,6 +4083,7 @@
php_error_docref(NULL TSRMLS_CC, E_NOTICE, There are results 
on this connection. Call pg_get_result() until it returns FALSE);
}
 
+   SEPARATE_ZVAL(pv_param_arr);
zend_hash_internal_pointer_reset(Z_ARRVAL_PP(pv_param_arr));
num_params = zend_hash_num_elements(Z_ARRVAL_PP(pv_param_arr));
if (num_params  0) {
@@ -4097,7 +4098,8 @@
}
 
otype = (*tmp)-type;
-   convert_to_string(*tmp);
+   SEPARATE_ZVAL(tmp);
+   convert_to_string_ex(tmp);
if (Z_TYPE_PP(tmp) != IS_STRING) {
php_error_docref(NULL TSRMLS_CC, 
E_WARNING,Error converting parameter);
_php_pgsql_free_params(params, num_params);
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1009r2=1.2027.2.547.2.1010diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1009 php-src/NEWS:1.2027.2.547.2.1010
--- php-src/NEWS:1.2027.2.547.2.1009Tue Nov 13 15:10:04 2007
+++ php-src/NEWSTue Nov 13 20:08:04 2007
@@ -1,6 +1,8 @@
 PHPNEWS
 |||
 ?? ??? 2008, PHP 5.2.6
+- Fixed bug #43279 (pg_send_query_params() converts all elements in 'params' 
+  to strings). (Ilia)
 - Fixed bug #43248 (backward compatibility break in realpath()). (Dmitry)
 - Fixed bug #43221 (SimpleXML adding default namespace in addAttribute). (Rob)
 - Fixed bug #43216 (stream_is_local() returns false on file://). (Dmitry)

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



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

2007-11-13 Thread Ilia Alshanetsky
iliaa   Tue Nov 13 20:08:17 2007 UTC

  Modified files:  
/php-src/ext/pgsql  pgsql.c 
  Log:
  MFB: Fixed bug #43279 (pg_send_query_params() converts all elements in 
'params' 
  to strings)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pgsql/pgsql.c?r1=1.374r2=1.375diff_format=u
Index: php-src/ext/pgsql/pgsql.c
diff -u php-src/ext/pgsql/pgsql.c:1.374 php-src/ext/pgsql/pgsql.c:1.375
--- php-src/ext/pgsql/pgsql.c:1.374 Wed Oct  3 23:31:04 2007
+++ php-src/ext/pgsql/pgsql.c   Tue Nov 13 20:08:17 2007
@@ -20,7 +20,7 @@
+--+
  */
  
-/* $Id: pgsql.c,v 1.374 2007/10/03 23:31:04 iliaa Exp $ */
+/* $Id: pgsql.c,v 1.375 2007/11/13 20:08:17 iliaa Exp $ */
 
 #include stdlib.h
 
@@ -4061,6 +4061,7 @@
php_error_docref(NULL TSRMLS_CC, E_NOTICE, There are results 
on this connection. Call pg_get_result() until it returns FALSE);
}
 
+   SEPARATE_ZVAL(pv_param_arr);
zend_hash_internal_pointer_reset(Z_ARRVAL_PP(pv_param_arr));
num_params = zend_hash_num_elements(Z_ARRVAL_PP(pv_param_arr));
if (num_params  0) {
@@ -4075,7 +4076,8 @@
}
 
otype = (*tmp)-type;
-   convert_to_string(*tmp);
+   SEPARATE_ZVAL(tmp);
+   convert_to_string_ex(tmp);
if (Z_TYPE_PP(tmp) != IS_STRING) {
php_error_docref(NULL TSRMLS_CC, 
E_WARNING,Error converting parameter);
_php_pgsql_free_params(params, num_params);

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



Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/pgsql pgsql.c

2007-11-13 Thread Antony Dovgal
What happens if Postgres returns OUT parameters?

On 13.11.2007 23:05, Ilia Alshanetsky wrote:
 @@ -4084,6 +4084,7 @@
   php_error_docref(NULL TSRMLS_CC, E_NOTICE, There are results 
 on this connection. Call pg_get_result() until it returns FALSE);
   }
  
 + SEPARATE_ZVAL(pv_param_arr);
   zend_hash_internal_pointer_reset(Z_ARRVAL_PP(pv_param_arr));
   num_params = zend_hash_num_elements(Z_ARRVAL_PP(pv_param_arr));
   if (num_params  0) {
 @@ -4098,7 +4099,8 @@
   }
  
   otype = (*tmp)-type;
 - convert_to_string(*tmp);
 + SEPARATE_ZVAL(tmp);
 + convert_to_string_ex(tmp);
   if (Z_TYPE_PP(tmp) != IS_STRING) {
   php_error_docref(NULL TSRMLS_CC, 
 E_WARNING,Error converting parameter);
   _php_pgsql_free_params(params, num_params);
 


-- 
Wbr, 
Antony Dovgal

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



Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/pgsql pgsql.c

2007-11-13 Thread Ilia Alshanetsky
The function is designed for sending data allowing it to fetch bound  
params can lead to all kinds of undefined behaviors such as:


pg_send_query_params($dbconn, 'select count(*) from authors where city  
= $1', array('Perth'));


especially when the supplied value is a temp var.




On 13-Nov-07, at 3:48 PM, Antony Dovgal wrote:


What happens if Postgres returns OUT parameters?

On 13.11.2007 23:05, Ilia Alshanetsky wrote:

@@ -4084,6 +4084,7 @@
		php_error_docref(NULL TSRMLS_CC, E_NOTICE, There are results on  
this connection. Call pg_get_result() until it returns FALSE);

}

+   SEPARATE_ZVAL(pv_param_arr);
zend_hash_internal_pointer_reset(Z_ARRVAL_PP(pv_param_arr));
num_params = zend_hash_num_elements(Z_ARRVAL_PP(pv_param_arr));
if (num_params  0) {
@@ -4098,7 +4099,8 @@
}

otype = (*tmp)-type;
-   convert_to_string(*tmp);
+   SEPARATE_ZVAL(tmp);
+   convert_to_string_ex(tmp);
if (Z_TYPE_PP(tmp) != IS_STRING) {
php_error_docref(NULL TSRMLS_CC, E_WARNING,Error converting  
parameter);

_php_pgsql_free_params(params, num_params);




--
Wbr,
Antony Dovgal

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



Ilia Alshanetsky

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



[PHP-CVS] cvs: CVSROOT / avail

2007-11-13 Thread Derick Rethans
derick  Tue Nov 13 22:49:47 2007 UTC

  Modified files:  
/CVSROOTavail 
  Log:
  - Upgrade Etienne to full php-src.
  
  http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1324r2=1.1325diff_format=u
Index: CVSROOT/avail
diff -u CVSROOT/avail:1.1324 CVSROOT/avail:1.1325
--- CVSROOT/avail:1.1324Mon Nov 12 13:06:53 2007
+++ CVSROOT/avail   Tue Nov 13 22:49:46 2007
@@ -17,7 +17,7 @@
 # The PHP Developers have full access to the full source trees for
 # PHP, as well as the documentation.
 
-avail|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,bjori,nlopess,wrowe,shire,zoe,scottma!
 
c,t2man,dsp,davidw,ab5602,nicholsr,lsmith|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|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,bjori,nlopess,wrowe,shire,zoe,!
 
scottmac,t2man,dsp,davidw,ab5602,nicholsr,lsmith|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
 
 # fastcgi implementation for IIS
 avail|shane,wez,edink|fastcgi-isapi
@@ -44,7 +44,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!
 

[PHP-CVS] cvs: CVSROOT / avail

2007-11-13 Thread Marcus Boerger
helly   Tue Nov 13 22:53:55 2007 UTC

  Modified files:  
/CVSROOTavail 
  Log:
  - Upgrade the RM by enabling him to shed rights as necessary
  
http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1325r2=1.1326diff_format=u
Index: CVSROOT/avail
diff -u CVSROOT/avail:1.1325 CVSROOT/avail:1.1326
--- CVSROOT/avail:1.1325Tue Nov 13 22:49:46 2007
+++ CVSROOT/avail   Tue Nov 13 22:53:55 2007
@@ -12,7 +12,7 @@
 # Some people also have access to the configuration files in the
 # CVSROOT.
 
-avail|sterling,goba,imajes,wez,iliaa,derick,jon,cox,alan_k,jmcastagnetto,mj,pajoye,helly,philip,stas|CVSROOT
+avail|sterling,goba,imajes,wez,iliaa,derick,jon,cox,alan_k,jmcastagnetto,mj,pajoye,helly,philip,stas,johannes|CVSROOT
 
 # The PHP Developers have full access to the full source trees for
 # PHP, as well as the documentation.


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



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

2007-11-13 Thread Etienne Kneuss
colder  Tue Nov 13 23:37:09 2007 UTC

  Modified files:  
/php-src/ext/soap   soap.c 
  Log:
  Fix typos
  
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/soap.c?r1=1.237r2=1.238diff_format=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.237 php-src/ext/soap/soap.c:1.238
--- php-src/ext/soap/soap.c:1.237   Tue Nov 13 15:10:28 2007
+++ php-src/ext/soap/soap.c Tue Nov 13 23:37:09 2007
@@ -17,7 +17,7 @@
   |  Dmitry Stogov [EMAIL PROTECTED] |
   +--+
 */
-/* $Id: soap.c,v 1.237 2007/11/13 15:10:28 dmitry Exp $ */
+/* $Id: soap.c,v 1.238 2007/11/13 23:37:09 colder Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -2671,7 +2671,7 @@
client-uri = 
soap_unicode_to_string(Z_USTRVAL_PP(tmp), Z_USTRLEN_PP(tmp) TSRMLS_CC);
}
} else {
-   php_error_docref(NULL TSRMLS_CC, E_ERROR, 
'uri' option is requred in nonWSDL mode);
+   php_error_docref(NULL TSRMLS_CC, E_ERROR, 
'uri' option is required in nonWSDL mode);
return;
}
 
@@ -2701,7 +2701,7 @@
client-location = 
soap_unicode_to_string(Z_USTRVAL_PP(tmp), Z_USTRLEN_PP(tmp) TSRMLS_CC);
}
} else if (wsdl == NULL) {
-   php_error_docref(NULL TSRMLS_CC, E_ERROR, 'location' 
option is requred in nonWSDL mode);
+   php_error_docref(NULL TSRMLS_CC, E_ERROR, 'location' 
option is required in nonWSDL mode);
return;
}
 
@@ -2854,7 +2854,7 @@
}
 
} else if (wsdl == NULL) {
-   php_error_docref(NULL TSRMLS_CC, E_ERROR, 'location' and 'uri' 
options are requred in nonWSDL mode);
+   php_error_docref(NULL TSRMLS_CC, E_ERROR, 'location' and 'uri' 
options are required in nonWSDL mode);
return;
}
 

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



[PHP-CVS] cvs: php-src(PHP_5_3) /ext/soap soap.c

2007-11-13 Thread Etienne Kneuss
colder  Tue Nov 13 23:44:29 2007 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/soap   soap.c 
  Log:
  MFH: fix typos
  
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/soap.c?r1=1.156.2.28.2.30.2.7r2=1.156.2.28.2.30.2.8diff_format=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.156.2.28.2.30.2.7 
php-src/ext/soap/soap.c:1.156.2.28.2.30.2.8
--- php-src/ext/soap/soap.c:1.156.2.28.2.30.2.7 Tue Nov 13 15:10:16 2007
+++ php-src/ext/soap/soap.c Tue Nov 13 23:44:28 2007
@@ -17,7 +17,7 @@
   |  Dmitry Stogov [EMAIL PROTECTED] |
   +--+
 */
-/* $Id: soap.c,v 1.156.2.28.2.30.2.7 2007/11/13 15:10:16 dmitry Exp $ */
+/* $Id: soap.c,v 1.156.2.28.2.30.2.8 2007/11/13 23:44:28 colder Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -2310,7 +2310,7 @@
Z_TYPE_PP(tmp) == IS_STRING) {
add_property_stringl(this_ptr, uri, 
Z_STRVAL_PP(tmp), Z_STRLEN_PP(tmp), 1);
} else {
-   php_error_docref(NULL TSRMLS_CC, E_ERROR, 
'uri' option is requred in nonWSDL mode);
+   php_error_docref(NULL TSRMLS_CC, E_ERROR, 
'uri' option is required in nonWSDL mode);
return;
}
 
@@ -2336,7 +2336,7 @@
Z_TYPE_PP(tmp) == IS_STRING) {
add_property_stringl(this_ptr, location, 
Z_STRVAL_PP(tmp), Z_STRLEN_PP(tmp), 1);
} else if (wsdl == NULL) {
-   php_error_docref(NULL TSRMLS_CC, E_ERROR, 'location' 
option is requred in nonWSDL mode);
+   php_error_docref(NULL TSRMLS_CC, E_ERROR, 'location' 
option is required in nonWSDL mode);
return;
}
 
@@ -2464,7 +2464,7 @@
}
 
} else if (wsdl == NULL) {
-   php_error_docref(NULL TSRMLS_CC, E_ERROR, 'location' and 'uri' 
options are requred in nonWSDL mode);
+   php_error_docref(NULL TSRMLS_CC, E_ERROR, 'location' and 'uri' 
options are required in nonWSDL mode);
return;
}
 

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



[PHP-CVS] cvs: CVSROOT / avail

2007-11-13 Thread Philip Olson
philip  Wed Nov 14 00:16:30 2007 UTC

  Modified files:  
/CVSROOTavail 
  Log:
  phpdoc-ar karma for Saleh Nabeel Al-Saffar (salehcoder)
  
  
http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1326r2=1.1327diff_format=u
Index: CVSROOT/avail
diff -u CVSROOT/avail:1.1326 CVSROOT/avail:1.1327
--- CVSROOT/avail:1.1326Tue Nov 13 22:53:55 2007
+++ CVSROOT/avail   Wed Nov 14 00:16:30 2007
@@ -64,7 +64,7 @@
 
avail|ilia,jalal,zak,andre,lyric,jmoore,ronabop,sebastian,joey,jani,torben,hellekin,cnewbill,bate,yohgaki,jan,imajes,derick,msopacua,nohn,edink,iliaa,helly,sean,nlopess,tony2001,zoe|qaweb
 
 # Some people get only access to specific languages for phpdoc
-avail|diab,daif|phpdoc-ar
+avail|diab,daif,salehcoder|phpdoc-ar
 
avail|noihex,mfalgas,ereza,ebi,ait,jabro,eduardcapell,oriolm,yagooar,jeprubio,marctm|phpdoc-ca
 avail|mkoula|phpdoc-cs
 avail|penguin,tkxs|phpdoc-da

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



[PHP-CVS] cvs: php-src / buildconf.bat

2007-11-13 Thread Johannes Schl�ter
johannesWed Nov 14 01:42:01 2007 UTC

  Modified files:  
/php-srcbuildconf.bat 
  Log:
  - pass parameters to buildconf.bat over to buildconf.js (#43281)
  [DOC] install.windows.building.php currently reads like e.g. cscript /nologo 
win32/build/buildconf.js --add-modules-dir=../php-gtk2 [...]  that 
might be changed to buildconf.bat --add-modules-dir=../php-gtk2 [...]
  
  
http://cvs.php.net/viewvc.cgi/php-src/buildconf.bat?r1=1.1r2=1.2diff_format=u
Index: php-src/buildconf.bat
diff -u php-src/buildconf.bat:1.1 php-src/buildconf.bat:1.2
--- php-src/buildconf.bat:1.1   Tue Dec  2 23:16:47 2003
+++ php-src/buildconf.bat   Wed Nov 14 01:42:01 2007
@@ -1,2 +1,2 @@
 @echo off
-cscript /nologo win32\build\buildconf.js
+cscript /nologo win32\build\buildconf.js %*

-- 
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) / buildconf.bat

2007-11-13 Thread Johannes Schl�ter
johannesWed Nov 14 01:42:55 2007 UTC

  Modified files:  (Branch: PHP_5_3)
/php-srcbuildconf.bat 
  Log:
  - MFH: pass parameters to buildconf.bat over to buildconf.js (#43281)
  
  
http://cvs.php.net/viewvc.cgi/php-src/buildconf.bat?r1=1.1r2=1.1.8.1diff_format=u
Index: php-src/buildconf.bat
diff -u php-src/buildconf.bat:1.1 php-src/buildconf.bat:1.1.8.1
--- php-src/buildconf.bat:1.1   Tue Dec  2 23:16:47 2003
+++ php-src/buildconf.bat   Wed Nov 14 01:42:55 2007
@@ -1,2 +1,2 @@
 @echo off
-cscript /nologo win32\build\buildconf.js
+cscript /nologo win32\build\buildconf.js %*

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