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

2008-01-16 Thread changelog
changelog   Thu Jan 17 01:31:32 2008 UTC

  Modified files:  
/php-srcChangeLog 
  Log:
  ChangeLog update
  
http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.2929r2=1.2930diff_format=u
Index: php-src/ChangeLog
diff -u php-src/ChangeLog:1.2929 php-src/ChangeLog:1.2930
--- php-src/ChangeLog:1.2929Wed Jan 16 01:31:32 2008
+++ php-src/ChangeLog   Thu Jan 17 01:31:31 2008
@@ -1,3 +1,92 @@
+2008-01-16  Ilia Alshanetsky  [EMAIL PROTECTED]
+
+* (PHP_5_2)
+  NEWS
+  sapi/apache2handler/sapi_apache2.c
+  sapi/apache2handler/sapi_apache2.c:
+  
+  MFB: Fixed bug #42779 (Incorrect forcing from HTTP/1.0 request to 
HTTP/1.1
+  response)
+
+* (PHP_5_3)
+  sapi/apache2handler/sapi_apache2.c:
+  
+  Fixed bug #42779 (Incorrect forcing from HTTP/1.0 request to HTTP/1.1
+  response)
+
+2008-01-16  Marcus Boerger  [EMAIL PROTECTED]
+
+* (PHP_5_3)
+  NEWS
+  ext/reflection/php_reflection.c
+  ext/reflection/tests/bug37964.phpt:
+  - MFH Fixed Bug #37964 (Reflection shows private methods of parent class)
+([EMAIL PROTECTED])
+
+* ext/reflection/php_reflection.c
+  ext/reflection/tests/bug37964.phpt
+  ext/reflection/tests/bug37964.phpt:
+  - Fixed Bug #37964 (Reflection shows private methods of parent class)
+([EMAIL PROTECTED])
+
+2008-01-16  David Coallier  [EMAIL PROTECTED]
+
+* ext/standard/tests/strings/ucfirst1.phpt:
+  - run-tests.php -U
+  - The unicode test's error messages are working
+
+* ext/standard/tests/strings/ucfirst1.phpt:
+  - MFB
+  - Make sure to return the good error message with new parse parameters 
api
+of ucfirst()
+
+* (PHP_5_3)
+  ext/standard/tests/strings/ucfirst.phpt:
+  - Making sure the tests are not failing after modifications to the new
+zend-parsing-parameters in ucfirst()
+
+2008-01-16  Antony Dovgal  [EMAIL PROTECTED]
+
+* (PHP_5_2)
+  NEWS
+  ext/standard/string.c
+  ext/standard/string.c:
+  MFH: fix #43863 (str_word_count() breaks on cyrillic ya in locale 
cp1251)
+  patch by phprus at gmail dot com
+
+* ext/standard/string.c:
+  fix #43863 (str_word_count() breaks on cyrillic ya in locale cp1251)
+  patch by phprus at gmail dot com
+
+2008-01-16  Dmitry Stogov  [EMAIL PROTECTED]
+
+* ext/soap/soap.c
+  ext/soap/soap.c
+  ext/soap/soap.c:
+  Fixed wrong type cast
+
+2008-01-16  David Coallier  [EMAIL PROTECTED]
+
+* (PHP_5_3)
+  ext/standard/string.c:
+  - MFH
+  - Making sure this is also using the good zend parsing and added
+the php_ucfirst function
+
+* ext/standard/string.c:
+  - Make sure ucfirst is using the new zend-parse-parameters api
+  - added php_ucfirst for non-unicode calls
+
+2008-01-16  Christopher Jones  [EMAIL PROTECTED]
+
+* (PHP_5_2)
+  ext/oci8/config.m4
+  ext/oci8/config.m4:
+  MFH: fix #41941 (oci8 extension not lib64 savvy)
+
+* ext/oci8/config.m4:
+  fix #41941 (oci8 extension not lib64 savvy)
+
 2008-01-15  Christopher Jones  [EMAIL PROTECTED]
 
 * (PHP_5_3)


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

2008-01-16 Thread Antony Dovgal
tony2001Wed Jan 16 08:34:06 2008 UTC

  Modified files:  
/php-src/ext/standard   string.c 
  Log:
  fix #43863 (str_word_count() breaks on cyrillic ya in locale cp1251)
  patch by phprus at gmail dot com
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.661r2=1.662diff_format=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.661 php-src/ext/standard/string.c:1.662
--- php-src/ext/standard/string.c:1.661 Wed Jan 16 03:09:01 2008
+++ php-src/ext/standard/string.c   Wed Jan 16 08:34:06 2008
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: string.c,v 1.661 2008/01/16 03:09:01 davidc Exp $ */
+/* $Id: string.c,v 1.662 2008/01/16 08:34:06 tony2001 Exp $ */
 
 /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
 
@@ -7821,7 +7821,7 @@
 
while (p  e) {
s = p;
-   while (p  e  (isalpha(*p) || (char_list  ch[(unsigned 
char)*p]) || *p == '\'' || *p == '-')) {
+   while (p  e  (isalpha((unsigned char)*p) || (char_list  
ch[(unsigned char)*p]) || *p == '\'' || *p == '-')) {
p++;
}
if (p  s) {

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

2008-01-16 Thread Antony Dovgal
tony2001Wed Jan 16 08:34:34 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/standard   string.c 
  Log:
  MFH: fix #43863 (str_word_count() breaks on cyrillic ya in locale cp1251)
  patch by phprus at gmail dot com
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.445.2.14.2.69.2.9r2=1.445.2.14.2.69.2.10diff_format=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.445.2.14.2.69.2.9 
php-src/ext/standard/string.c:1.445.2.14.2.69.2.10
--- php-src/ext/standard/string.c:1.445.2.14.2.69.2.9   Wed Jan 16 03:11:26 2008
+++ php-src/ext/standard/string.c   Wed Jan 16 08:34:33 2008
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: string.c,v 1.445.2.14.2.69.2.9 2008/01/16 03:11:26 davidc Exp $ */
+/* $Id: string.c,v 1.445.2.14.2.69.2.10 2008/01/16 08:34:33 tony2001 Exp $ */
 
 /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
 
@@ -5142,7 +5142,7 @@
 
while (p  e) {
s = p;
-   while (p  e  (isalpha(*p) || (char_list  ch[(unsigned 
char)*p]) || *p == '\'' || *p == '-')) {
+   while (p  e  (isalpha((unsigned char)*p) || (char_list  
ch[(unsigned char)*p]) || *p == '\'' || *p == '-')) {
p++;
}
if (p  s) {

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

2008-01-16 Thread Antony Dovgal
tony2001Wed Jan 16 08:35:59 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
/php-src/ext/standard   string.c 
  Log:
  MFH: fix #43863 (str_word_count() breaks on cyrillic ya in locale cp1251)
  patch by phprus at gmail dot com
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1054r2=1.2027.2.547.2.1055diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1054 php-src/NEWS:1.2027.2.547.2.1055
--- php-src/NEWS:1.2027.2.547.2.1054Mon Jan 14 09:46:54 2008
+++ php-src/NEWSWed Jan 16 08:35:58 2008
@@ -10,6 +10,8 @@
 
 - Fixed faulty fix for bug #40189
(endless loop in zlib.inflate stream filter) (Greg)
+- Fixed bug #43863 (str_word_count() breaks on cyrillic ya in locale cp1251).
+  (phprus at gmail dot com, Tony)
 - Fixed bug #43793 (zlib filter is unable to auto-detect gzip/zlib file 
headers).
   (Greg)
 - Fixed bug #43703 (Signature compatibility check broken). (Dmitry)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.445.2.14.2.72r2=1.445.2.14.2.73diff_format=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.445.2.14.2.72 
php-src/ext/standard/string.c:1.445.2.14.2.73
--- php-src/ext/standard/string.c:1.445.2.14.2.72   Mon Dec 31 07:20:13 2007
+++ php-src/ext/standard/string.c   Wed Jan 16 08:35:59 2008
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: string.c,v 1.445.2.14.2.72 2007/12/31 07:20:13 sebastian Exp $ */
+/* $Id: string.c,v 1.445.2.14.2.73 2008/01/16 08:35:59 tony2001 Exp $ */
 
 /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
 
@@ -5133,7 +5133,7 @@
 
while (p  e) {
s = p;
-   while (p  e  (isalpha(*p) || (char_list  ch[(unsigned 
char)*p]) || *p == '\'' || *p == '-')) {
+   while (p  e  (isalpha((unsigned char)*p) || (char_list  
ch[(unsigned char)*p]) || *p == '\'' || *p == '-')) {
p++;
}
if (p  s) {

-- 
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/strings ucfirst.phpt

2008-01-16 Thread David Coallier
davidc  Wed Jan 16 12:56:20 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/standard/tests/strings ucfirst.phpt 
  Log:
  - Making sure the tests are not failing after modifications to the new
zend-parsing-parameters in ucfirst()
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/ucfirst.phpt?r1=1.1.2.3r2=1.1.2.3.2.1diff_format=u
Index: php-src/ext/standard/tests/strings/ucfirst.phpt
diff -u php-src/ext/standard/tests/strings/ucfirst.phpt:1.1.2.3 
php-src/ext/standard/tests/strings/ucfirst.phpt:1.1.2.3.2.1
--- php-src/ext/standard/tests/strings/ucfirst.phpt:1.1.2.3 Thu Apr 26 
23:30:00 2007
+++ php-src/ext/standard/tests/strings/ucfirst.phpt Wed Jan 16 12:56:20 2008
@@ -171,8 +171,8 @@
 
  Testing Miscelleneous inputs 
 --- Testing arrays ---
-Notice: Array to string conversion in %s on line %d
-string(5) Array
+Warning: ucfirst() expects parameter 1 to be string, array given in %s on line 
%d
+NULL
 
 --- Testing objects ---
 string(12) Hello, world
@@ -208,9 +208,9 @@
 string(5) Hello
 
  error conditions 
-Warning: Wrong parameter count for ucfirst() in %s on line %d
+Warning: ucfirst() expects exactly 1 parameter, 0 given in %s on line %d
 
-Warning: Wrong parameter count for ucfirst() in %s on line %d
+Warning: ucfirst() expects exactly 1 parameter, 2 given in %s on line %d
 
-Warning: Wrong parameter count for ucfirst() in %s on line %d
+Warning: ucfirst() expects exactly 1 parameter, 2 given in %s on line %d
 Done

-- 
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/strings ucfirst1.phpt

2008-01-16 Thread David Coallier
davidc  Wed Jan 16 13:12:52 2008 UTC

  Modified files:  
/php-src/ext/standard/tests/strings ucfirst1.phpt 
  Log:
  - MFB
  - Make sure to return the good error message with new parse parameters api
of ucfirst()
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/ucfirst1.phpt?r1=1.3r2=1.4diff_format=u
Index: php-src/ext/standard/tests/strings/ucfirst1.phpt
diff -u php-src/ext/standard/tests/strings/ucfirst1.phpt:1.3 
php-src/ext/standard/tests/strings/ucfirst1.phpt:1.4
--- php-src/ext/standard/tests/strings/ucfirst1.phpt:1.3Mon May 14 
13:05:29 2007
+++ php-src/ext/standard/tests/strings/ucfirst1.phptWed Jan 16 13:12:51 2008
@@ -171,8 +171,8 @@
 
  Testing Miscelleneous inputs 
 --- Testing arrays ---
-Notice: Array to string conversion in %s on line %d
-string(5) Array
+Warning: ucfirst() expects parameter 1 to be string (Unicode or binary), array 
given in %s on line %d
+NULL
 
 --- Testing objects ---
 string(12) Hello, world
@@ -208,12 +208,13 @@
 string(5) Hello
 
  error conditions 
-Warning: Wrong parameter count for ucfirst() in %s on line %d
+Warning: ucfirst() expects exactly 1 parameter, 0 given in %s on line %d
 
-Warning: Wrong parameter count for ucfirst() in %s on line %d
+Warning: ucfirst() expects exactly 1 parameter, 2 given in %s on line %d
 
-Warning: Wrong parameter count for ucfirst() in %s on line %d
+Warning: ucfirst() expects exactly 1 parameter, 2 given in %s on line %d
 Done
+
 --UEXPECTF--
  Basic and Various operations 
 

-- 
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/strings ucfirst1.phpt

2008-01-16 Thread David Coallier
davidc  Wed Jan 16 13:27:01 2008 UTC

  Modified files:  
/php-src/ext/standard/tests/strings ucfirst1.phpt 
  Log:
  - run-tests.php -U
  - The unicode test's error messages are working
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/ucfirst1.phpt?r1=1.4r2=1.5diff_format=u
Index: php-src/ext/standard/tests/strings/ucfirst1.phpt
diff -u php-src/ext/standard/tests/strings/ucfirst1.phpt:1.4 
php-src/ext/standard/tests/strings/ucfirst1.phpt:1.5
--- php-src/ext/standard/tests/strings/ucfirst1.phpt:1.4Wed Jan 16 
13:12:51 2008
+++ php-src/ext/standard/tests/strings/ucfirst1.phptWed Jan 16 13:27:01 2008
@@ -254,8 +254,8 @@
 
  Testing Miscelleneous inputs 
 --- Testing arrays ---
-Notice: Array to string conversion in %s on line %d
-unicode(5) Array
+Warning: ucfirst() expects parameter 1 to be string (Unicode or binary), array 
given in %s on line %d
+NULL
 
 --- Testing objects ---
 unicode(12) Hello, world
@@ -291,9 +291,9 @@
 unicode(5) Hello
 
  error conditions 
-Warning: Wrong parameter count for ucfirst() in %s on line %d
+Warning: ucfirst() expects exactly 1 parameter, 0 given in %s on line %d
 
-Warning: Wrong parameter count for ucfirst() in %s on line %d
+Warning: ucfirst() expects exactly 1 parameter, 2 given in %s on line %d
 
-Warning: Wrong parameter count for ucfirst() in %s on line %d
+Warning: ucfirst() expects exactly 1 parameter, 2 given in %s on line %d
 Done

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



[PHP-CVS] cvs: php-src /ext/reflection php_reflection.c /ext/reflection/tests bug37964.phpt

2008-01-16 Thread Marcus Boerger
helly   Wed Jan 16 14:19:07 2008 UTC

  Added files: 
/php-src/ext/reflection/tests   bug37964.phpt 

  Modified files:  
/php-src/ext/reflection php_reflection.c 
  Log:
  - Fixed Bug #37964 (Reflection shows private methods of parent class)
([EMAIL PROTECTED])
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/php_reflection.c?r1=1.289r2=1.290diff_format=u
Index: php-src/ext/reflection/php_reflection.c
diff -u php-src/ext/reflection/php_reflection.c:1.289 
php-src/ext/reflection/php_reflection.c:1.290
--- php-src/ext/reflection/php_reflection.c:1.289   Mon Dec 31 07:12:14 2007
+++ php-src/ext/reflection/php_reflection.c Wed Jan 16 14:19:07 2008
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: php_reflection.c,v 1.289 2007/12/31 07:12:14 sebastian Exp $ */
+/* $Id: php_reflection.c,v 1.290 2008/01/16 14:19:07 helly Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -519,7 +519,8 @@

zend_hash_internal_pointer_reset_ex(ce-function_table, pos);
 
while 
(zend_hash_get_current_data_ex(ce-function_table, (void **) mptr, pos) == 
SUCCESS) {
-   if (!(mptr-common.fn_flags  ZEND_ACC_STATIC)) 
{
+   if ((mptr-common.fn_flags  ZEND_ACC_STATIC) 
== 0 
+   ((mptr-common.fn_flags  
ZEND_ACC_PRIVATE) == 0 || mptr-common.scope == ce)) {
zstr key;
uint key_len;
ulong num_index;
@@ -541,6 +542,9 @@
zend_hash_move_forward_ex(ce-function_table, 
pos);
}
string_printf(str, \n%s  - Methods [%d] {, indent, 
count);
+   if (!count) {
+   string_printf(str, \n);
+   }
string_append(str, dyn);
string_free(dyn);
} else {
@@ -5028,7 +5032,7 @@
php_info_print_table_start();
php_info_print_table_header(2, Reflection, enabled);
 
-   php_info_print_table_row(2, Version, $Id: php_reflection.c,v 1.289 
2007/12/31 07:12:14 sebastian Exp $);
+   php_info_print_table_row(2, Version, $Id: php_reflection.c,v 1.290 
2008/01/16 14:19:07 helly Exp $);
 
php_info_print_table_end();
 } /* }}} */

http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/bug37964.phpt?view=markuprev=1.1
Index: php-src/ext/reflection/tests/bug37964.phpt
+++ php-src/ext/reflection/tests/bug37964.phpt
--TEST--
Reflection Bug #37964 (Reflection shows private methods of parent class)
--FILE--
?php

abstract class foobar {
private function test2() {
}   
}
class foo extends foobar {
private $foo = 1;
private function test() {
}
protected function test3() {
}
}
class bar extends foo {
private function foobar() {
}
}

Reflection::export(new ReflectionClass(new bar));

?
--EXPECTF--
Class [ user class bar extends foo ] {
  @@ %s %s

  - Constants [0] {
  }

  - Static properties [0] {
  }

  - Static methods [0] {
  }

  - Properties [0] {
  }

  - Methods [2] {
Method [ user private method foobar ] {
  @@ %s %d - %d
}

Method [ user, inherits foo protected method test3 ] {
  @@ %s %d - %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_3) / NEWS /ext/reflection php_reflection.c /ext/reflection/tests bug37964.phpt

2008-01-16 Thread Marcus Boerger
helly   Wed Jan 16 14:21:07 2008 UTC

  Added files: (Branch: PHP_5_3)
/php-src/ext/reflection/tests   bug37964.phpt 

  Modified files:  
/php-srcNEWS 
/php-src/ext/reflection php_reflection.c 
  Log:
  - MFH Fixed Bug #37964 (Reflection shows private methods of parent class)
([EMAIL PROTECTED])
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.71r2=1.2027.2.547.2.965.2.72diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.71 
php-src/NEWS:1.2027.2.547.2.965.2.72
--- php-src/NEWS:1.2027.2.547.2.965.2.71Mon Jan 14 13:46:34 2008
+++ php-src/NEWSWed Jan 16 14:21:07 2008
@@ -106,6 +106,8 @@
   segfault later on). (Dmitry)
 - Fixed bug #39056 (Interbase NUMERIC data type error). (Lars W)
 - Fixed bug #38468 (Unexpected creation of cycle). (Dmitry)
+- Fixed bug #37964 (Reflection shows private methods of parent class).
+  (Felipe, Marcus)
 - Fixed bug #37911 (preg_replace_callback() ignores named groups). (Nuno)
 - Fixed bug #36128 (Interbase PDO - timestamp columns return NULL). (Lars W)
 - Fixed bug #35386 (firebird: first row is null). (Lars W)
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/php_reflection.c?r1=1.164.2.33.2.45.2.6r2=1.164.2.33.2.45.2.7diff_format=u
Index: php-src/ext/reflection/php_reflection.c
diff -u php-src/ext/reflection/php_reflection.c:1.164.2.33.2.45.2.6 
php-src/ext/reflection/php_reflection.c:1.164.2.33.2.45.2.7
--- php-src/ext/reflection/php_reflection.c:1.164.2.33.2.45.2.6 Mon Dec 31 
07:17:13 2007
+++ php-src/ext/reflection/php_reflection.c Wed Jan 16 14:21:07 2008
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: php_reflection.c,v 1.164.2.33.2.45.2.6 2007/12/31 07:17:13 sebastian 
Exp $ */
+/* $Id: php_reflection.c,v 1.164.2.33.2.45.2.7 2008/01/16 14:21:07 helly Exp $ 
*/
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -519,7 +519,8 @@

zend_hash_internal_pointer_reset_ex(ce-function_table, pos);
 
while 
(zend_hash_get_current_data_ex(ce-function_table, (void **) mptr, pos) == 
SUCCESS) {
-   if (!(mptr-common.fn_flags  ZEND_ACC_STATIC)) 
{
+   if ((mptr-common.fn_flags  ZEND_ACC_STATIC) 
== 0 
+   ((mptr-common.fn_flags  
ZEND_ACC_PRIVATE) == 0 || mptr-common.scope == ce)) {
char *key;
uint key_len;
ulong num_index;
@@ -539,6 +540,9 @@
zend_hash_move_forward_ex(ce-function_table, 
pos);
}
string_printf(str, \n%s  - Methods [%d] {, indent, 
count);
+   if (!count) {
+   string_printf(str, \n);
+   }
string_append(str, dyn);
string_free(dyn);
} else {
@@ -4909,7 +4913,7 @@
php_info_print_table_start();
php_info_print_table_header(2, Reflection, enabled);
 
-   php_info_print_table_row(2, Version, $Id: php_reflection.c,v 
1.164.2.33.2.45.2.6 2007/12/31 07:17:13 sebastian Exp $);
+   php_info_print_table_row(2, Version, $Id: php_reflection.c,v 
1.164.2.33.2.45.2.7 2008/01/16 14:21:07 helly Exp $);
 
php_info_print_table_end();
 } /* }}} */

http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/bug37964.phpt?view=markuprev=1.1
Index: php-src/ext/reflection/tests/bug37964.phpt
+++ php-src/ext/reflection/tests/bug37964.phpt
--TEST--
Reflection Bug #37964 (Reflection shows private methods of parent class)
--FILE--
?php

abstract class foobar {
private function test2() {
}   
}
class foo extends foobar {
private $foo = 1;
private function test() {
}
protected function test3() {
}
}
class bar extends foo {
private function foobar() {
}
}

Reflection::export(new ReflectionClass(new bar));

?
--EXPECTF--
Class [ user class bar extends foo ] {
  @@ %s %s

  - Constants [0] {
  }

  - Static properties [0] {
  }

  - Static methods [0] {
  }

  - Properties [0] {
  }

  - Methods [2] {
Method [ user private method foobar ] {
  @@ %s %d - %d
}

Method [ user, inherits foo protected method test3 ] {
  @@ %s %d - %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_3) /sapi/apache2handler sapi_apache2.c

2008-01-16 Thread Ilia Alshanetsky
iliaa   Wed Jan 16 15:49:46 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/sapi/apache2handlersapi_apache2.c 
  Log:
  
  Fixed bug #42779 (Incorrect forcing from HTTP/1.0 request to HTTP/1.1
  response)
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.57.2.10.2.15.2.1r2=1.57.2.10.2.15.2.2diff_format=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.57.2.10.2.15.2.1 
php-src/sapi/apache2handler/sapi_apache2.c:1.57.2.10.2.15.2.2
--- php-src/sapi/apache2handler/sapi_apache2.c:1.57.2.10.2.15.2.1   Mon Dec 
31 07:17:18 2007
+++ php-src/sapi/apache2handler/sapi_apache2.c  Wed Jan 16 15:49:46 2008
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: sapi_apache2.c,v 1.57.2.10.2.15.2.1 2007/12/31 07:17:18 sebastian Exp 
$ */
+/* $Id: sapi_apache2.c,v 1.57.2.10.2.15.2.2 2008/01/16 15:49:46 iliaa Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -134,8 +134,6 @@
ctx-r-proto_num = 1000 + (sline[7]-'0');
if ((sline[7]-'0') == 0) {
apr_table_set(ctx-r-subprocess_env, 
force-response-1.0, true);
-   } else {
-   apr_table_set(ctx-r-subprocess_env, 
force-response-1.1, true);
}
}


-- 
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 /sapi/apache2handler sapi_apache2.c

2008-01-16 Thread Ilia Alshanetsky
iliaa   Wed Jan 16 15:50:38 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/sapi/apache2handlersapi_apache2.c 
/php-srcNEWS 
  Log:
  
  MFB: Fixed bug #42779 (Incorrect forcing from HTTP/1.0 request to HTTP/1.1
  response)
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.57.2.10.2.16r2=1.57.2.10.2.17diff_format=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.57.2.10.2.16 
php-src/sapi/apache2handler/sapi_apache2.c:1.57.2.10.2.17
--- php-src/sapi/apache2handler/sapi_apache2.c:1.57.2.10.2.16   Mon Dec 31 
07:20:16 2007
+++ php-src/sapi/apache2handler/sapi_apache2.c  Wed Jan 16 15:50:37 2008
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: sapi_apache2.c,v 1.57.2.10.2.16 2007/12/31 07:20:16 sebastian Exp $ */
+/* $Id: sapi_apache2.c,v 1.57.2.10.2.17 2008/01/16 15:50:37 iliaa Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -134,8 +134,6 @@
ctx-r-proto_num = 1000 + (sline[7]-'0');
if ((sline[7]-'0') == 0) {
apr_table_set(ctx-r-subprocess_env, 
force-response-1.0, true);
-   } else {
-   apr_table_set(ctx-r-subprocess_env, 
force-response-1.1, true);
}
}

http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1055r2=1.2027.2.547.2.1056diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1055 php-src/NEWS:1.2027.2.547.2.1056
--- php-src/NEWS:1.2027.2.547.2.1055Wed Jan 16 08:35:58 2008
+++ php-src/NEWSWed Jan 16 15:50:37 2008
@@ -72,6 +72,8 @@
 - Fixed bug #42945 (preg_split() swallows part of the string). (Nuno)
 - Fixed bug #42937 (__call() method not invoked when methods are called on
   parent from child class). (Dmitry)
+- Fixed bug #42779 (Incorrect forcing from HTTP/1.0 request to HTTP/1.1
+  response). (Ilia)
 - Fixed bug #42736 (xmlrpc_server_call_method() crashes). (Tony)
 - Fixed bug #42692 (Procedure 'int1' not present with doc/lit SoapServer).
   (Dmitry)

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



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

2008-01-16 Thread Ilia Alshanetsky
iliaa   Wed Jan 16 15:50:53 2008 UTC

  Modified files:  
/php-src/sapi/apache2handlersapi_apache2.c 
  Log:
  
  MFB: Fixed bug #42779 (Incorrect forcing from HTTP/1.0 request to HTTP/1.1
  response)
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.85r2=1.86diff_format=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.85 
php-src/sapi/apache2handler/sapi_apache2.c:1.86
--- php-src/sapi/apache2handler/sapi_apache2.c:1.85 Mon Dec 31 07:12:19 2007
+++ php-src/sapi/apache2handler/sapi_apache2.c  Wed Jan 16 15:50:53 2008
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: sapi_apache2.c,v 1.85 2007/12/31 07:12:19 sebastian Exp $ */
+/* $Id: sapi_apache2.c,v 1.86 2008/01/16 15:50:53 iliaa Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -134,8 +134,6 @@
ctx-r-proto_num = 1000 + (sline[7]-'0');
if ((sline[7]-'0') == 0) {
apr_table_set(ctx-r-subprocess_env, 
force-response-1.0, true);
-   } else {
-   apr_table_set(ctx-r-subprocess_env, 
force-response-1.1, true);
}
}


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