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

2009-07-07 Thread Pierre-Alain Joye
pajoye  Tue Jul  7 11:07:57 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
  Log:
  - #45905
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1578r2=1.2027.2.547.2.1579diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1578 php-src/NEWS:1.2027.2.547.2.1579
--- php-src/NEWS:1.2027.2.547.2.1578Sun Jul  5 16:07:24 2009
+++ php-src/NEWSTue Jul  7 11:07:50 2009
@@ -1,4 +1,4 @@
-PHPNEWS
+PHP
NEWS
 |||
 ?? ??? 2009, PHP 5.2.11
 - Fixed regression in cURL extension that prevented flush of data to output
@@ -27,6 +27,8 @@
 - Fixed bug #48276 (date(Y) on big endian machines produces the
   wrong result). (Scott)
 - Fixed bug #47351 (Memory leak in DateTime). (Derick, Tobias John)
+- Fixed bug #45905 (imagefilledrectangle() clipping error).
+  (markril at hotmail dot com, Pierre)
 - Fixed bug #45280 (Reflection of instantiated COM classes causes PHP to 
crash) 
   (Paul Richards, Kalle)
 



-- 
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

2009-07-07 Thread Jani Taskinen

Always add the news on fixing bugs also in PHP_5_3 NEWS file.

--Jani


Pierre-Alain Joye wrote:

pajoye  Tue Jul  7 11:07:57 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src	NEWS 
  Log:

  - #45905
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1578r2=1.2027.2.547.2.1579diff_format=u

Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1578 php-src/NEWS:1.2027.2.547.2.1579
--- php-src/NEWS:1.2027.2.547.2.1578Sun Jul  5 16:07:24 2009
+++ php-src/NEWSTue Jul  7 11:07:50 2009
@@ -1,4 +1,4 @@
-PHPNEWS
+PHP
NEWS
 |||
 ?? ??? 2009, PHP 5.2.11
 - Fixed regression in cURL extension that prevented flush of data to output
@@ -27,6 +27,8 @@
 - Fixed bug #48276 (date(Y) on big endian machines produces the
   wrong result). (Scott)
 - Fixed bug #47351 (Memory leak in DateTime). (Derick, Tobias John)
+- Fixed bug #45905 (imagefilledrectangle() clipping error).
+  (markril at hotmail dot com, Pierre)
 - Fixed bug #45280 (Reflection of instantiated COM classes causes PHP to crash) 
   (Paul Richards, Kalle)
 








--
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

2009-07-07 Thread Jani Taskinen
janiTue Jul  7 12:19:43 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
  Log:
  F*ckin bom
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1579r2=1.2027.2.547.2.1580diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1579 php-src/NEWS:1.2027.2.547.2.1580
--- php-src/NEWS:1.2027.2.547.2.1579Tue Jul  7 11:07:50 2009
+++ php-src/NEWSTue Jul  7 12:19:42 2009
@@ -1,4 +1,4 @@
-PHP
NEWS
+PHPNEWS
 |||
 ?? ??? 2009, PHP 5.2.11
 - Fixed regression in cURL extension that prevented flush of data to output



-- 
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

2009-07-07 Thread Pierre Joye
On Tue, Jul 7, 2009 at 2:17 PM, Jani Taskinenjani.taski...@sci.fi wrote:
 Always add the news on fixing bugs also in PHP_5_3 NEWS file.

Ah? That is new. I will do it.


-- 
Pierre

http://blog.thepimp.net | http://www.libgd.org

-- 
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

2009-07-07 Thread Jani Taskinen

Pierre Joye wrote:

On Tue, Jul 7, 2009 at 2:17 PM, Jani Taskinenjani.taski...@sci.fi wrote:

Always add the news on fixing bugs also in PHP_5_3 NEWS file.


Ah? That is new. I will do it.


Well, it's kinda logical: 5.3 got released. Now we have parallel 
releases of 5.2 and 5.3 branches so anything done in both needs note in 
both NEWS files. And please, fix that editor of yours not to add BOM 
everytime you edit the files.


--Jani



--
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

2009-07-07 Thread Pierre-Alain Joye
pajoye  Tue Jul  7 15:15:46 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
  Log:
  - #48116
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1580r2=1.2027.2.547.2.1581diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1580 php-src/NEWS:1.2027.2.547.2.1581
--- php-src/NEWS:1.2027.2.547.2.1580Tue Jul  7 12:19:42 2009
+++ php-src/NEWSTue Jul  7 15:15:46 2009
@@ -26,6 +26,8 @@
 - Fixed bug #48450 (Compile failure under IRIX 6.5.30 building gd.c). (Kalle)
 - Fixed bug #48276 (date(Y) on big endian machines produces the
   wrong result). (Scott)
+- Fixed #48116 (Fixed build with Openssl 1.0). (Pierre, 
+  Al dot Smith at aeschi dot ch dot eu dot org)
 - Fixed bug #47351 (Memory leak in DateTime). (Derick, Tobias John)
 - Fixed bug #45905 (imagefilledrectangle() clipping error).
   (markril at hotmail dot com, Pierre)



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



[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /main main.c

2009-07-07 Thread Jani Taskinen
janiTue Jul  7 16:43:35 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
/php-src/main   main.c 
  Log:
  MFH:- Fixed bug #48247 (Infinite loop and possible crash during startup with 
errors)
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1581r2=1.2027.2.547.2.1582diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1581 php-src/NEWS:1.2027.2.547.2.1582
--- php-src/NEWS:1.2027.2.547.2.1581Tue Jul  7 15:15:46 2009
+++ php-src/NEWSTue Jul  7 16:43:35 2009
@@ -26,7 +26,9 @@
 - Fixed bug #48450 (Compile failure under IRIX 6.5.30 building gd.c). (Kalle)
 - Fixed bug #48276 (date(Y) on big endian machines produces the
   wrong result). (Scott)
-- Fixed #48116 (Fixed build with Openssl 1.0). (Pierre, 
+- Fixed bug #48247 (Infinite loop and possible crash during startup with
+  errors when errors are logged). (Jani)
+- Fixed bug #48116 (Fixed build with Openssl 1.0). (Pierre, 
   Al dot Smith at aeschi dot ch dot eu dot org)
 - Fixed bug #47351 (Memory leak in DateTime). (Derick, Tobias John)
 - Fixed bug #45905 (imagefilledrectangle() clipping error).
http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.640.2.23.2.70r2=1.640.2.23.2.71diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.640.2.23.2.70 php-src/main/main.c:1.640.2.23.2.71
--- php-src/main/main.c:1.640.2.23.2.70 Mon May  4 19:55:42 2009
+++ php-src/main/main.c Tue Jul  7 16:43:35 2009
@@ -18,7 +18,7 @@
+--+
 */
 
-/* $Id: main.c,v 1.640.2.23.2.70 2009/05/04 19:55:42 derick Exp $ */
+/* $Id: main.c,v 1.640.2.23.2.71 2009/07/07 16:43:35 jani Exp $ */
 
 /* {{{ includes
  */
@@ -469,6 +469,20 @@
 static int module_startup = 1;
 static int module_shutdown = 0;
 
+/* {{{ php_during_module_startup */
+static int php_during_module_startup(void)
+{
+   return module_startup;
+}
+/* }}} */
+
+/* {{{ php_during_module_shutdown */
+static int php_during_module_shutdown(void)
+{
+   return module_shutdown;
+}
+/* }}} */
+
 /* {{{ php_log_err
  */
 PHPAPI void php_log_err(char *log_message TSRMLS_DC)
@@ -491,7 +505,7 @@
char *error_time_str;
 
time(error_time);
-   error_time_str = php_format_date(d-M-Y H:i:s, 11, 
error_time, 1 TSRMLS_CC);
+   error_time_str = php_format_date(d-M-Y H:i:s, 11, 
error_time, php_during_module_startup() TSRMLS_CC);
len = spprintf(tmp, 0, [%s] %s%s, error_time_str, 
log_message, PHP_EOL);
 #ifdef PHP_WIN32
php_flock(fd, 2);
@@ -540,24 +554,6 @@
 }
 /* }}} */
 
-/* {{{ php_verror helpers */
-
-/* {{{ php_during_module_startup */
-static int php_during_module_startup(void)
-{
-   return module_startup;
-}
-/* }}} */
-
-/* {{{ php_during_module_shutdown */
-static int php_during_module_shutdown(void)
-{
-   return module_shutdown;
-}
-/* }}} */
-
-/* }}} */
-
 /* {{{ php_verror */
 /* php_verror is called from php_error_docrefn functions.
  * Its purpose is to unify error messages and automatically generate clickable



-- 
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

2009-07-07 Thread Ilia Alshanetsky
iliaa   Wed Jul  8 03:10:32 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
  Log:
  
  BFN
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1582r2=1.2027.2.547.2.1583diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1582 php-src/NEWS:1.2027.2.547.2.1583
--- php-src/NEWS:1.2027.2.547.2.1582Tue Jul  7 16:43:35 2009
+++ php-src/NEWSWed Jul  8 03:10:32 2009
@@ -4,6 +4,8 @@
 - Fixed regression in cURL extension that prevented flush of data to output
   defined as a file handle. (Ilia)
 
+- Fixed bug #48788 (RecursiveDirectoryIterator doesn't descend into symlinked
+  directories). (Ilia)
 - Fixed bug #48733 (CURLOPT_WRITEHEADER|CURLOPT_FILE|CURLOPT_STDERR warns on
   files that have been opened with r+). (Ilia)
 - Fixed bug #48718 (FILTER_VALIDATE_EMAIL does not allow numbers in domain



-- 
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/filter logical_filters.c /ext/filter/tests 016.phpt

2009-07-05 Thread Ilia Alshanetsky
iliaa   Sun Jul  5 16:07:25 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/filter/tests   016.phpt 
/php-src/ext/filter logical_filters.c 
/php-srcNEWS 
  Log:
  
  Fixed bug #48718 (FILTER_VALIDATE_EMAIL does not allow numbers in domain  
  components).
  
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/tests/016.phpt?r1=1.4.2.5r2=1.4.2.6diff_format=u
Index: php-src/ext/filter/tests/016.phpt
diff -u php-src/ext/filter/tests/016.phpt:1.4.2.5 
php-src/ext/filter/tests/016.phpt:1.4.2.6
--- php-src/ext/filter/tests/016.phpt:1.4.2.5   Mon Feb  2 23:51:58 2009
+++ php-src/ext/filter/tests/016.phpt   Sun Jul  5 16:07:23 2009
@@ -14,7 +14,8 @@
 '@',   
 '[]()/@example.com',   
 'qwertyuiopasdfghjklzxcv...@qwertyuiopasdfghjklzxcvbnm.net',
-'e.x.a.m.p.l...@example.com'
+'e.x.a.m.p.l...@example.com',
+'firstname.lastn...@employee.2something.com'
 );
 foreach ($values as $value) {
var_dump(filter_var($value, FILTER_VALIDATE_EMAIL));
@@ -33,4 +34,5 @@
 bool(false)
 string(57) qwertyuiopasdfghjklzxcv...@qwertyuiopasdfghjklzxcvbnm.net
 string(26) e.x.a.m.p.l...@example.com
+string(42) firstname.lastn...@employee.2something.com
 Done
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/logical_filters.c?r1=1.1.2.34r2=1.1.2.35diff_format=u
Index: php-src/ext/filter/logical_filters.c
diff -u php-src/ext/filter/logical_filters.c:1.1.2.34 
php-src/ext/filter/logical_filters.c:1.1.2.35
--- php-src/ext/filter/logical_filters.c:1.1.2.34   Wed Jun 10 19:05:49 2009
+++ php-src/ext/filter/logical_filters.cSun Jul  5 16:07:24 2009
@@ -17,7 +17,7 @@
   +--+
 */
 
-/* $Id: logical_filters.c,v 1.1.2.34 2009/06/10 19:05:49 felipe Exp $ */
+/* $Id: logical_filters.c,v 1.1.2.35 2009/07/05 16:07:24 iliaa Exp $ */
 
 #include php_filter.h
 #include filter_private.h
@@ -472,7 +472,7 @@
 void php_filter_validate_email(PHP_INPUT_FILTER_PARAM_DECL) /* {{{ */
 {
/* From 
http://cvs.php.net/co.php/pear/HTML_QuickForm/QuickForm/Rule/Email.php?r=1.4 */
-   const char regexp[] = 
/^((\\\[^\f\\n\\r\\t\\b]+\\\)|([A-Za-z0-9_\\!\\#\\$\\%'\\*\\+\\-\\~\\/\\^\\`\\|\\{\\}]+(\\.[A-Za-z0-9_\\!\\#\\$\\%'\\*\\+\\-\\~\\/\\^\\`\\|\\{\\}]*)*))@((\\[(((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9])))\\])|(((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9])))|((([A-Za-z0-9])(([A-Za-z0-9\\-])*([A-Za-z0-9]))?(\\.(?=[A-Za-z\\-]))?)+[A-Za-z\\-]*))$/D;
+   const char regexp[] = 
/^((\\\[^\f\\n\\r\\t\\b]+\\\)|([A-Za-z0-9_\\!\\#\\$\\%'\\*\\+\\-\\~\\/\\^\\`\\|\\{\\}]+(\\.[A-Za-z0-9_\\!\\#\\$\\%'\\*\\+\\-\\~\\/\\^\\`\\|\\{\\}]*)*))@((\\[(((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9])))\\])|(((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9])))|((([A-Za-z0-9])(([A-Za-z0-9\\-])*([A-Za-z0-9]))?(\\.(?=[A-Za-z0-9\\-]))?)+[A-Za-z\\-]*))$/D;
 
pcre   *re = NULL;
pcre_extra *pcre_extra = NULL;
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1577r2=1.2027.2.547.2.1578diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1577 php-src/NEWS:1.2027.2.547.2.1578
--- php-src/NEWS:1.2027.2.547.2.1577Thu Jul  2 13:41:29 2009
+++ php-src/NEWSSun Jul  5 16:07:24 2009
@@ -1,4 +1,4 @@
-PHP
NEWS
+PHPNEWS
 |||
 ?? ??? 2009, PHP 5.2.11
 - Fixed regression in cURL extension that prevented flush of data to output
@@ -6,6 +6,8 @@
 
 - Fixed bug #48733 (CURLOPT_WRITEHEADER|CURLOPT_FILE|CURLOPT_STDERR warns on
   files that have been opened with r+). (Ilia)
+- Fixed bug #48718 (FILTER_VALIDATE_EMAIL does not allow numbers in domain
+  components). (Ilia)
 - Fixed bug #48709 (metaphone and 'wh'). (brettz9 at yahoo dot com, Felipe)
 - Fixed bug #48693 (Double declaration of __lambda_func when lambda wrongly
   formatted). (peter at lvp-media dot com, Felipe)



-- 
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/curl interface.c

2009-07-02 Thread Ilia Alshanetsky
iliaa   Thu Jul  2 13:41:29 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/curl   interface.c 
/php-srcNEWS 
  Log:
  
  Fixed bug #48733 (CURLOPT_WRITEHEADER|CURLOPT_FILE|CURLOPT_STDERR warns on
files that have been opened with r+).
  
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.58r2=1.62.2.14.2.59diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.58 
php-src/ext/curl/interface.c:1.62.2.14.2.59
--- php-src/ext/curl/interface.c:1.62.2.14.2.58 Sun Jun 28 10:00:28 2009
+++ php-src/ext/curl/interface.cThu Jul  2 13:41:29 2009
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.62.2.14.2.58 2009/06/28 10:00:28 pajoye Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.59 2009/07/02 13:41:29 iliaa Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -1436,7 +1436,7 @@
error = CURLE_OK;
switch (option) {
case CURLOPT_FILE:
-   if (((php_stream *) what)-mode[0] != 
'r') {
+   if (((php_stream *) what)-mode[0] != 
'r' || ((php_stream *) what)-mode[1] == '+') {

zend_list_addref(Z_LVAL_PP(zvalue));
ch-handlers-write-fp = fp;
ch-handlers-write-method = 
PHP_CURL_FILE;
@@ -1447,7 +1447,7 @@
}
break;
case CURLOPT_WRITEHEADER:
-   if (((php_stream *) what)-mode[0] != 
'r') {
+   if (((php_stream *) what)-mode[0] != 
'r' || ((php_stream *) what)-mode[1] == '+') {

zend_list_addref(Z_LVAL_PP(zvalue));
ch-handlers-write_header-fp 
= fp;

ch-handlers-write_header-method = PHP_CURL_FILE;
@@ -1463,7 +1463,7 @@
ch-handlers-read-fd = 
Z_LVAL_PP(zvalue);
break;
case CURLOPT_STDERR:
-   if (((php_stream *) what)-mode[0] != 
'r') {
+   if (((php_stream *) what)-mode[0] != 
'r' || ((php_stream *) what)-mode[1] == '+') {
if (ch-handlers-std_err) {

zval_ptr_dtor(ch-handlers-std_err);
}
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1576r2=1.2027.2.547.2.1577diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1576 php-src/NEWS:1.2027.2.547.2.1577
--- php-src/NEWS:1.2027.2.547.2.1576Wed Jul  1 18:46:53 2009
+++ php-src/NEWSThu Jul  2 13:41:29 2009
@@ -4,6 +4,8 @@
 - Fixed regression in cURL extension that prevented flush of data to output
   defined as a file handle. (Ilia)
 
+- Fixed bug #48733 (CURLOPT_WRITEHEADER|CURLOPT_FILE|CURLOPT_STDERR warns on
+  files that have been opened with r+). (Ilia)
 - Fixed bug #48709 (metaphone and 'wh'). (brettz9 at yahoo dot com, Felipe)
 - Fixed bug #48693 (Double declaration of __lambda_func when lambda wrongly
   formatted). (peter at lvp-media dot com, Felipe)



-- 
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

2009-07-01 Thread Kalle Sommer Nielsen
kalle   Wed Jul  1 18:46:53 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
  Log:
  BFN #45280
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1575r2=1.2027.2.547.2.1576diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1575 php-src/NEWS:1.2027.2.547.2.1576
--- php-src/NEWS:1.2027.2.547.2.1575Tue Jun 30 16:18:34 2009
+++ php-src/NEWSWed Jul  1 18:46:53 2009
@@ -1,4 +1,4 @@
-PHPNEWS
+PHP
NEWS
 |||
 ?? ??? 2009, PHP 5.2.11
 - Fixed regression in cURL extension that prevented flush of data to output
@@ -23,6 +23,8 @@
 - Fixed bug #48276 (date(Y) on big endian machines produces the
   wrong result). (Scott)
 - Fixed bug #47351 (Memory leak in DateTime). (Derick, Tobias John)
+- Fixed bug #45280 (Reflection of instantiated COM classes causes PHP to 
crash) 
+  (Paul Richards, Kalle)
 
 17 Jun 2009, PHP 5.2.10
 - Updated timezone database to version 2009.9 (2009i) (Derick)



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



[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/date php_date.c

2009-06-30 Thread Derick Rethans
derick  Tue Jun 30 16:18:34 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/date   php_date.c 
/php-srcNEWS 
  Log:
  - MFH: Fixed bug #47351 (Memory leak in DateTime).
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.43.2.45.2.73r2=1.43.2.45.2.74diff_format=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.43.2.45.2.73 
php-src/ext/date/php_date.c:1.43.2.45.2.74
--- php-src/ext/date/php_date.c:1.43.2.45.2.73  Mon Jun 22 13:42:28 2009
+++ php-src/ext/date/php_date.c Tue Jun 30 16:18:33 2009
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_date.c,v 1.43.2.45.2.73 2009/06/22 13:42:28 iliaa Exp $ */
+/* $Id: php_date.c,v 1.43.2.45.2.74 2009/06/30 16:18:33 derick Exp $ */
 
 #include php.h
 #include php_streams.h
@@ -1752,7 +1752,7 @@
}
timelib_unixtime2local(now, (timelib_sll) time(NULL));
 
-   timelib_fill_holes(dateobj-time, now, 0);
+   timelib_fill_holes(dateobj-time, now, TIMELIB_NO_CLONE);
timelib_update_ts(dateobj-time, tzi);
 
dateobj-time-have_weekday_relative = dateobj-time-have_relative = 0;
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1574r2=1.2027.2.547.2.1575diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1574 php-src/NEWS:1.2027.2.547.2.1575
--- php-src/NEWS:1.2027.2.547.2.1574Sun Jun 28 18:44:28 2009
+++ php-src/NEWSTue Jun 30 16:18:34 2009
@@ -22,6 +22,7 @@
 - Fixed bug #48450 (Compile failure under IRIX 6.5.30 building gd.c). (Kalle)
 - Fixed bug #48276 (date(Y) on big endian machines produces the
   wrong result). (Scott)
+- Fixed bug #47351 (Memory leak in DateTime). (Derick, Tobias John)
 
 17 Jun 2009, PHP 5.2.10
 - Updated timezone database to version 2009.9 (2009i) (Derick)



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



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

2009-06-28 Thread Ilia Alshanetsky
iliaa   Sun Jun 28 14:15:33 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
  Log:
  FN
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1571r2=1.2027.2.547.2.1572diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1571 php-src/NEWS:1.2027.2.547.2.1572
--- php-src/NEWS:1.2027.2.547.2.1571Sun Jun 28 02:09:50 2009
+++ php-src/NEWSSun Jun 28 14:15:32 2009
@@ -1,6 +1,9 @@
 PHP
NEWS
 |||
 ?? ??? 2009, PHP 5.2.11
+- Fixed regerssion in curl that prevented flush of data to output defined as
+  a file handle. (Ilia)
+
 - Fixed bug #48693 (Double declaration of __lambda_func when lambda wrongly
   formatted). (peter at lvp-media dot com, Felipe)
 - Fixed bug #48661 (phpize is broken with non-bash shells). (Jani)



-- 
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

2009-06-28 Thread Jani Taskinen
janiSun Jun 28 15:40:00 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
  Log:
  - Typo, removed BOM (this file was supposed to be just ascii..right? :)
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1572r2=1.2027.2.547.2.1573diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1572 php-src/NEWS:1.2027.2.547.2.1573
--- php-src/NEWS:1.2027.2.547.2.1572Sun Jun 28 14:15:32 2009
+++ php-src/NEWSSun Jun 28 15:40:00 2009
@@ -1,8 +1,8 @@
-PHP
NEWS
+PHPNEWS
 |||
 ?? ??? 2009, PHP 5.2.11
-- Fixed regerssion in curl that prevented flush of data to output defined as
-  a file handle. (Ilia)
+- Fixed regression in cURL extension that prevented flush of data to output
+  defined as a file handle. (Ilia)
 
 - Fixed bug #48693 (Double declaration of __lambda_func when lambda wrongly
   formatted). (peter at lvp-media dot com, Felipe)



-- 
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 metaphone.c /ext/standard/tests/strings bug48709.phpt

2009-06-28 Thread Felipe Pena
felipe  Sun Jun 28 18:44:28 2009 UTC

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

  Modified files:  
/php-src/ext/standard   metaphone.c 
/php-srcNEWS 
  Log:
  - MFH: Fixed bug #48709 (metaphone and 'wh')
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/metaphone.c?r1=1.28.2.1.2.8r2=1.28.2.1.2.9diff_format=u
Index: php-src/ext/standard/metaphone.c
diff -u php-src/ext/standard/metaphone.c:1.28.2.1.2.8 
php-src/ext/standard/metaphone.c:1.28.2.1.2.9
--- php-src/ext/standard/metaphone.c:1.28.2.1.2.8   Wed Dec 31 11:17:45 2008
+++ php-src/ext/standard/metaphone.cSun Jun 28 18:44:28 2009
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: metaphone.c,v 1.28.2.1.2.8 2008/12/31 11:17:45 sebastian Exp $ */
+/* $Id: metaphone.c,v 1.28.2.1.2.9 2009/06/28 18:44:28 felipe Exp $ */
 
 /*
Based on CPANs Text-Metaphone-1.96 by Michael G Schwern 
schw...@pobox.com 
@@ -225,15 +225,14 @@
w_idx += 2;
}
break;
-   /* WH becomes H, 
+   /* WH becomes W, 
   WR becomes R 
   W if followed by a vowel */
case 'W':
-   if (Next_Letter == 'H' ||
-   Next_Letter == 'R') {
+   if (Next_Letter == 'R') {
Phonize(Next_Letter);
w_idx += 2;
-   } else if (isvowel(Next_Letter)) {
+   } else if (Next_Letter == 'H' || isvowel(Next_Letter)) {
Phonize('W');
w_idx += 2;
}
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1573r2=1.2027.2.547.2.1574diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1573 php-src/NEWS:1.2027.2.547.2.1574
--- php-src/NEWS:1.2027.2.547.2.1573Sun Jun 28 15:40:00 2009
+++ php-src/NEWSSun Jun 28 18:44:28 2009
@@ -4,6 +4,7 @@
 - Fixed regression in cURL extension that prevented flush of data to output
   defined as a file handle. (Ilia)
 
+- Fixed bug #48709 (metaphone and 'wh'). (brettz9 at yahoo dot com, Felipe)
 - Fixed bug #48693 (Double declaration of __lambda_func when lambda wrongly
   formatted). (peter at lvp-media dot com, Felipe)
 - Fixed bug #48661 (phpize is broken with non-bash shells). (Jani)

http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/bug48709.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/strings/bug48709.phpt
+++ php-src/ext/standard/tests/strings/bug48709.phpt
--TEST--
Bug #48709 (metaphone and 'wh')
--FILE--
?php

/* Initial letter exceptions */
$exceptions = array(
'kn', // Drop first letter
'gn', // ditto
'pn', // ditto
'ae', // ditto
'wr', // ditto
'x',  // s
'wh', // w
'wa'  // w
);  

foreach ($exceptions as $letter) {
printf(%s = %s\n, $letter, metaphone($letter));
}

?
--EXPECT--
kn = N
gn = N
pn = N
ae = E
wr = R
x = S
wh = W
wa = W



-- 
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/pdo_dblib dblib_driver.c

2009-06-27 Thread Felipe Pena
felipe  Sun Jun 28 02:09:51 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/pdo_dblib  dblib_driver.c 
/php-srcNEWS 
  Log:
  - MFH: Fixed bug #48539 (pdo_dblib fails to connect, throws empty 
PDOException SQLSTATE[] (null))
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_dblib/dblib_driver.c?r1=1.9.2.2.2.5r2=1.9.2.2.2.6diff_format=u
Index: php-src/ext/pdo_dblib/dblib_driver.c
diff -u php-src/ext/pdo_dblib/dblib_driver.c:1.9.2.2.2.5 
php-src/ext/pdo_dblib/dblib_driver.c:1.9.2.2.2.6
--- php-src/ext/pdo_dblib/dblib_driver.c:1.9.2.2.2.5Fri Mar 20 22:14:17 2009
+++ php-src/ext/pdo_dblib/dblib_driver.cSun Jun 28 02:09:50 2009
@@ -17,7 +17,7 @@
   +--+
 */
 
-/* $Id: dblib_driver.c,v 1.9.2.2.2.5 2009/03/20 22:14:17 sfox Exp $ */
+/* $Id: dblib_driver.c,v 1.9.2.2.2.6 2009/06/28 02:09:50 felipe Exp $ */
 
 #ifdef HAVE_CONFIG_H
 # include config.h
@@ -230,9 +230,11 @@
goto cleanup;
}
 
+#if PHP_DBLIB_IS_MSSQL
if (DBSETOPT(H-link, DBTEXTLIMIT, 2147483647) == FAIL) {
goto cleanup;
}
+#endif
 
if (vars[3].optval  FAIL == dbuse(H-link, vars[3].optval)) {
goto cleanup;
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1570r2=1.2027.2.547.2.1571diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1570 php-src/NEWS:1.2027.2.547.2.1571
--- php-src/NEWS:1.2027.2.547.2.1570Sun Jun 28 01:16:36 2009
+++ php-src/NEWSSun Jun 28 02:09:50 2009
@@ -11,6 +11,8 @@
 - Fixed bug #48619 (imap_search ALL segfaults). (Pierre)
 - Fixed bug #48555 (ImageFTBBox() differs from previous versions for texts
   with new lines) (Takeshi Abe)
+- Fixed bug #48539 (pdo_dblib fails to connect, throws empty PDOException
+  SQLSTATE[] (null)). (Felipe)
 - Fixed bug #48465 (sys_get_temp_dir() possibly inconsistent when using
   TMPDIR). (Ilia)
 - Fixed bug #48450 (Compile failure under IRIX 6.5.30 building gd.c). (Kalle)



-- 
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 /scripts phpize.in

2009-06-24 Thread Jani Taskinen
janiWed Jun 24 07:43:18 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
/php-src/scriptsphpize.in 
  Log:
  MFH:- Fixed bug #48661 (phpize broken with non-bash shells)
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1567r2=1.2027.2.547.2.1568diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1567 php-src/NEWS:1.2027.2.547.2.1568
--- php-src/NEWS:1.2027.2.547.2.1567Tue Jun 23 01:02:03 2009
+++ php-src/NEWSWed Jun 24 07:43:18 2009
@@ -1,6 +1,7 @@
 PHP
NEWS
 |||
 ?? ??? 2009, PHP 5.2.11
+- Fixed bug #48661 (phpize is broken with non-bash shells). (Jani)
 - Fixed bug #48636 (Error compiling of ext/date on netware). (guenter at
   php.net, Ilia)
 - Fixed bug #48629 (get_defined_constants() ignores categorize parameter).
http://cvs.php.net/viewvc.cgi/php-src/scripts/phpize.in?r1=1.28.2.3.2.2r2=1.28.2.3.2.3diff_format=u
Index: php-src/scripts/phpize.in
diff -u php-src/scripts/phpize.in:1.28.2.3.2.2 
php-src/scripts/phpize.in:1.28.2.3.2.3
--- php-src/scripts/phpize.in:1.28.2.3.2.2  Mon Apr 20 15:03:57 2009
+++ php-src/scripts/phpize.in   Wed Jun 24 07:43:18 2009
@@ -121,7 +121,7 @@
   test -z $PHP_AUTOCONF  PHP_AUTOCONF=autoconf
   test -z $PHP_AUTOHEADER  PHP_AUTOHEADER=autoheader
   
-  if ! test -x $PHP_AUTOCONF  ! test -x `$php_shtool path 
$PHP_AUTOCONF`; then
+  if test ! -x $PHP_AUTOCONF  test ! -x `$php_shtool path 
$PHP_AUTOCONF`; then
 cat EOF
 Cannot find autoconf. Please check your autoconf installation and the
 \$PHP_AUTOCONF environment variable. Then, rerun this script.
@@ -129,7 +129,7 @@
 EOF
 exit 1
   fi
-  if ! test -x $PHP_AUTOHEADER  ! test -x `$php_shtool path 
$PHP_AUTOHEADER`; then
+  if test ! -x $PHP_AUTOHEADER  test ! -x `$php_shtool path 
$PHP_AUTOHEADER`; then
 cat EOF
 Cannot find autoheader. Please check your autoconf installation and the
 \$PHP_AUTOHEADER environment variable. Then, rerun this script.



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



[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /main php_open_temporary_file.c

2009-06-24 Thread Ilia Alshanetsky
iliaa   Wed Jun 24 12:21:21 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
/php-src/main   php_open_temporary_file.c 
  Log:
  
  Fixed bug #48465 (sys_get_temp_dir() possibly inconsistent when using
  TMPDIR).
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1568r2=1.2027.2.547.2.1569diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1568 php-src/NEWS:1.2027.2.547.2.1569
--- php-src/NEWS:1.2027.2.547.2.1568Wed Jun 24 07:43:18 2009
+++ php-src/NEWSWed Jun 24 12:21:19 2009
@@ -9,6 +9,8 @@
 - Fixed bug #48619 (imap_search ALL segfaults). (Pierre)
 - Fixed bug #48555 (ImageFTBBox() differs from previous versions for texts
   with new lines) (Takeshi Abe)
+- Fixed bug #48465 (sys_get_temp_dir() possibly inconsistent when using
+  TMPDIR). (Ilia)
 - Fixed bug #48450 (Compile failure under IRIX 6.5.30 building gd.c). (Kalle)
 - Fixed bug #48276 (date(Y) on big endian machines produces the
   wrong result). (Scott)
http://cvs.php.net/viewvc.cgi/php-src/main/php_open_temporary_file.c?r1=1.34.2.1.2.12r2=1.34.2.1.2.13diff_format=u
Index: php-src/main/php_open_temporary_file.c
diff -u php-src/main/php_open_temporary_file.c:1.34.2.1.2.12 
php-src/main/php_open_temporary_file.c:1.34.2.1.2.13
--- php-src/main/php_open_temporary_file.c:1.34.2.1.2.12Wed Dec 31 
11:17:47 2008
+++ php-src/main/php_open_temporary_file.c  Wed Jun 24 12:21:20 2009
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_open_temporary_file.c,v 1.34.2.1.2.12 2008/12/31 11:17:47 
sebastian Exp $ */
+/* $Id: php_open_temporary_file.c,v 1.34.2.1.2.13 2009/06/24 12:21:20 iliaa 
Exp $ */
 
 #include php.h
 
@@ -200,7 +200,14 @@
{
char* s = getenv(TMPDIR);
if (s) {
-   temporary_directory = strdup(s);
+   int len = strlen(s);
+
+   if (s[len - 1] == DEFAULT_SLASH) {
+   temporary_directory = zend_strndup(s, len - 1);
+   } else {
+   temporary_directory = zend_strndup(s, len);
+   }
+
return temporary_directory;
}
}



-- 
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/date php_date.c

2009-06-22 Thread Ilia Alshanetsky
iliaa   Mon Jun 22 13:42:30 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/date   php_date.c 
/php-srcNEWS 
  Log:
  
  Fixed bug #48636 (Error compiling of ext/date on netware).
  
http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.43.2.45.2.72r2=1.43.2.45.2.73diff_format=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.43.2.45.2.72 
php-src/ext/date/php_date.c:1.43.2.45.2.73
--- php-src/ext/date/php_date.c:1.43.2.45.2.72  Sun Jun 21 22:19:19 2009
+++ php-src/ext/date/php_date.c Mon Jun 22 13:42:28 2009
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_date.c,v 1.43.2.45.2.72 2009/06/21 22:19:19 scottmac Exp $ */
+/* $Id: php_date.c,v 1.43.2.45.2.73 2009/06/22 13:42:28 iliaa Exp $ */
 
 #include php.h
 #include php_streams.h
@@ -38,6 +38,10 @@
 static __inline __int64_t llabs( __int64_t i ) { return i = 0 ? i : -i; }
 #endif
 
+#if defined(NETWARE)  defined(__MWERKS__)
+static __inline long long llabs( long long i ) { return i = 0 ? i : -i; }
+#endif
+
 /* {{{ arginfo */
 static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_date, 0, 0, 1)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1563r2=1.2027.2.547.2.1564diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1563 php-src/NEWS:1.2027.2.547.2.1564
--- php-src/NEWS:1.2027.2.547.2.1563Mon Jun 22 00:03:24 2009
+++ php-src/NEWSMon Jun 22 13:42:29 2009
@@ -1,6 +1,8 @@
 PHPNEWS
 |||
 ?? ??? 2009, PHP 5.2.11
+- Fixed bug #48636 (Error compiling of ext/date on netware). (guenter at
+  php.net, Ilia)
 - Fixed bug #48629 (get_defined_constants() ignores categorize parameter).
   (Felipe)
 - Fixed bug #48276 (date(Y) on big endian machines produces the



-- 
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/gd/libgd gdft.c /ext/gd/tests Tuffy.ttf bug48555.phpt

2009-06-22 Thread Takeshi Abe
tabeMon Jun 22 15:50:18 2009 UTC

  Added files: (Branch: PHP_5_2)
/php-src/ext/gd/tests   bug48555.phpt Tuffy.ttf 

  Modified files:  
/php-srcNEWS 
/php-src/ext/gd/libgd   gdft.c 
  Log:
  MFH: fixed bug #48555 (ImageFTBBox() differs from previous versions for texts 
with new lines)
  http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1564r2=1.2027.2.547.2.1565diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1564 php-src/NEWS:1.2027.2.547.2.1565
--- php-src/NEWS:1.2027.2.547.2.1564Mon Jun 22 13:42:29 2009
+++ php-src/NEWSMon Jun 22 15:50:17 2009
@@ -5,6 +5,8 @@
   php.net, Ilia)
 - Fixed bug #48629 (get_defined_constants() ignores categorize parameter).
   (Felipe)
+- Fixed bug #48555 (ImageFTBBox() differs from previous versions for texts
+  with new lines) (Takeshi Abe)
 - Fixed bug #48276 (date(Y) on big endian machines produces the
   wrong result). (Scott)
 
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/libgd/gdft.c?r1=1.36.4.11r2=1.36.4.12diff_format=u
Index: php-src/ext/gd/libgd/gdft.c
diff -u php-src/ext/gd/libgd/gdft.c:1.36.4.11 
php-src/ext/gd/libgd/gdft.c:1.36.4.12
--- php-src/ext/gd/libgd/gdft.c:1.36.4.11   Wed Mar 18 08:15:27 2009
+++ php-src/ext/gd/libgd/gdft.c Mon Jun 22 15:50:17 2009
@@ -784,6 +784,7 @@
double cos_a = cos (angle);
int len, i = 0, ch;
int x1 = 0, y1 = 0;
+   int xb = x, yb = y;
font_t *font;
fontkey_t fontkey;
char *next;
@@ -924,8 +925,8 @@
/* carriage returns */
if (ch == '\r') {
penf.x = 0;
-   x1 = (int)(penf.x * cos_a - penf.y * sin_a + 32) / 64;
-   y1 = (int)(penf.x * sin_a + penf.y * cos_a + 32) / 64;
+   x1 = (int)(- penf.y * sin_a + 32) / 64;
+   y1 = (int)(- penf.y * cos_a + 32) / 64;
pen.x = pen.y = 0;
previous = 0;   /* clear kerning flag */
next++;
@@ -937,8 +938,10 @@
penf.x = 0;
  penf.y -= (long)(face-size-metrics.height * 
linespace);
  penf.y = (penf.y - 32)  -64; /* round to 
next pixel row */
- x1 = (int)(penf.x * cos_a - penf.y * sin_a + 32) / 64;
- y1 = (int)(penf.x * sin_a + penf.y * cos_a + 32) / 64;
+ x1 = (int)(- penf.y * sin_a + 32) / 64;
+ y1 = (int)(- penf.y * cos_a + 32) / 64;
+ xb = x + x1;
+ yb = y + y1;
  pen.x = pen.y = 0;
  previous = 0; /* clear kerning flag */
  next++;
@@ -1088,7 +1091,7 @@
 
/* now, draw to our target surface */
bm = (FT_BitmapGlyph) image;
-   gdft_draw_bitmap(tc_cache, im, fg, bm-bitmap, x + x1 + 
((pen.x + 31)  6) + bm-left, y - y1 + ((pen.y + 31)  6) - bm-top);
+   gdft_draw_bitmap(tc_cache, im, fg, bm-bitmap, x + x1 + 
((pen.x + 31)  6) + bm-left, y + y1 + ((pen.y + 31)  6) - bm-top);
}
 
/* record current glyph index for kerning */
@@ -1127,14 +1130,14 @@
brect[7] = (int) (normbox.xMin * sin_a + normbox.yMax * cos_a);
 
/* scale, round and offset brect */
-   brect[0] = x + gdroundupdown(brect[0], d2  0);
-   brect[1] = y - gdroundupdown(brect[1], d1  0);
-   brect[2] = x + gdroundupdown(brect[2], d1  0);
-   brect[3] = y - gdroundupdown(brect[3], d2  0);
-   brect[4] = x + gdroundupdown(brect[4], d2  0);
-   brect[5] = y - gdroundupdown(brect[5], d1  0);
-   brect[6] = x + gdroundupdown(brect[6], d1  0);
-   brect[7] = y - gdroundupdown(brect[7], d2  0);
+   brect[0] = xb + gdroundupdown(brect[0], d2  0);
+   brect[1] = yb - gdroundupdown(brect[1], d1  0);
+   brect[2] = xb + gdroundupdown(brect[2], d1  0);
+   brect[3] = yb - gdroundupdown(brect[3], d2  0);
+   brect[4] = xb + gdroundupdown(brect[4], d2  0);
+   brect[5] = yb - gdroundupdown(brect[5], d1  0);
+   brect[6] = xb + gdroundupdown(brect[6], d1  0);
+   brect[7] = yb - gdroundupdown(brect[7], d2  0);
}
 
if (tmpstr) {

http://cvs.php.net/viewvc.cgi/php-src/ext/gd/tests/bug48555.phpt?view=markuprev=1.1
Index: php-src/ext/gd/tests/bug48555.phpt
+++ php-src/ext/gd/tests/bug48555.phpt
--TEST--
Bug #48555 (ImageFTBBox() differs from previous versions for texts with new 
lines)
--SKIPIF--
?php
if(!extension_loaded('gd')){ die('skip gd extension not available'); }
?
--FILE--
?php
$cwd = dirname(__FILE__);
$font = 

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

2009-06-22 Thread Pierre-Alain Joye
pajoye  Mon Jun 22 20:43:24 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
  Log:
  - news for #48619
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1565r2=1.2027.2.547.2.1566diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1565 php-src/NEWS:1.2027.2.547.2.1566
--- php-src/NEWS:1.2027.2.547.2.1565Mon Jun 22 15:50:17 2009
+++ php-src/NEWSMon Jun 22 20:43:24 2009
@@ -1,10 +1,11 @@
-PHPNEWS
+PHP
NEWS
 |||
 ?? ??? 2009, PHP 5.2.11
 - Fixed bug #48636 (Error compiling of ext/date on netware). (guenter at
   php.net, Ilia)
 - Fixed bug #48629 (get_defined_constants() ignores categorize parameter).
   (Felipe)
+- Fixed bug #48619 (imap_search ALL segfaults). (Pierre)
 - Fixed bug #48555 (ImageFTBBox() differs from previous versions for texts
   with new lines) (Takeshi Abe)
 - Fixed bug #48276 (date(Y) on big endian machines produces the



-- 
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

2009-06-22 Thread Kalle Sommer Nielsen
kalle   Tue Jun 23 01:02:04 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
  Log:
  BFN
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1566r2=1.2027.2.547.2.1567diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1566 php-src/NEWS:1.2027.2.547.2.1567
--- php-src/NEWS:1.2027.2.547.2.1566Mon Jun 22 20:43:24 2009
+++ php-src/NEWSTue Jun 23 01:02:03 2009
@@ -8,6 +8,7 @@
 - Fixed bug #48619 (imap_search ALL segfaults). (Pierre)
 - Fixed bug #48555 (ImageFTBBox() differs from previous versions for texts
   with new lines) (Takeshi Abe)
+- Fixed bug #48450 (Compile failure under IRIX 6.5.30 building gd.c). (Kalle)
 - Fixed bug #48276 (date(Y) on big endian machines produces the
   wrong result). (Scott)
 



-- 
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

2009-06-21 Thread Scott MacVicar
scottmacSun Jun 21 22:33:49 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
  Log:
  BFN
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1561r2=1.2027.2.547.2.1562diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1561 php-src/NEWS:1.2027.2.547.2.1562
--- php-src/NEWS:1.2027.2.547.2.1561Wed Jun 17 12:31:58 2009
+++ php-src/NEWSSun Jun 21 22:33:48 2009
@@ -1,6 +1,8 @@
 PHPNEWS
 |||
 ?? ??? 2009, PHP 5.2.11
+- Fixed bug #48276 (date(Y) on big endian machines produces the
+  wrong result). (Scott)
 
 17 Jun 2009, PHP 5.2.10
 - Updated timezone database to version 2009.9 (2009i) (Derick)



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



[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS configure.in /main php_version.h

2009-06-17 Thread Ilia Alshanetsky
iliaa   Wed Jun 17 12:22:41 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS configure.in 
/php-src/main   php_version.h 
  Log:
  
  5.2.10
  http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1559r2=1.2027.2.547.2.1560diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1559 php-src/NEWS:1.2027.2.547.2.1560
--- php-src/NEWS:1.2027.2.547.2.1559Tue Jun 16 02:59:09 2009
+++ php-src/NEWSWed Jun 17 12:22:41 2009
@@ -1,102 +1,81 @@
 PHPNEWS
 |||
-?? Jun 2009, PHP 5.2.10
-- Fixed bug #48562 (Reference recursion causes segfault when used in 
-  wddx_serialize_vars()). (Felipe)
-- Fixed bug #48557 (Numeric string keys in Apache Hashmaps are not cast to
-  integers). (David Zuelke)
-- Fixed bug #48514 (cURL extension uses same resource name for simple and
-  multi APIs). (Felipe)
-- Fixed bug #48441 (ldap_search() sizelimit, timelimit and deref options 
-  persist). (Patrick)
-- Fixed missing erealloc() in fix for Bug #40091 in spl_autoload_register.
-  (Greg)
-
-11 Jun 2009, PHP 5.2.10RC2
+17 Jun 2009, PHP 5.2.10
 - Updated timezone database to version 2009.9 (2009i) (Derick)
-- Added ignore_errors option to http fopen wrapper. (David Zulke, Sara)
 
-- Fixed bug #48518 (curl crashes when writing into invalid file handle). (Tony)
-- Fixed bug #48469 (ldap_get_entries() leaks memory on empty search results).
-  (Patrick)
-- Fixed bug #48456 (CPPFLAGS not restored properly in phpize.m4).
-  (Jani, spisek at kerio dot com)
-- Fixed bug #48448 (Compile failure under IRIX 6.5.30 building cast.c). 
-  (Kalle)
-- Fixed bug #48434 (Improve memory_get_usage() accuracy). (Arnaud)
-- Fixed bug #48416 (Force a cache limit in ereg() to stop excessive memory 
usage).
-  (Scott)
-- Fixed bug #48409 (Crash when exception is thrown while passing function 
-  arguments). (Arnaud)
-- Fixed bug #48378 (exif_read_data() segfaults on certain corrupted .jpeg 
-  files). (Pierre)
-- Fixed bug #48359 (Script hangs on snmprealwalk if OID is not
-  increasing). (Ilia, simonov at gmail dot com)
-- Fixed bug #48273 (snmp*_real_walk() returns SNMP errors as values).
-  (Ilia, lytboris at gmail dot com)
-- Fixed bug #48247 (Crash on errors during startup). (Stas)
-- Fixed bug #47836 (array operator [] inconsistency when the array has
-  PHP_INT_MAX index value). (Matt)
-- Fixed bug #47042 (cgi sapi is incorrectly removing SCRIPT_FILENAME).
-  (Sriram Natarajan, David Soria Parra)
-- Fixed bug #46386 (Digest authentication with SOAP module fails against MSSQL 
-  SOAP services). (Ilia, lordelph at gmail dot com)
-- Fixed bug #46109 (Memory leak when mysqli::init() is called multiple times).
-  (Andrey)
-- Fixed bug #44827 (define() is missing error checks for class constants).
-  (Ilia)
-- Fixed bug #44214 (Crash using preg_replace_callback() and global variables).
-  (Nuno, Scott)
-- Fixed bug #42143 (The constant NAN is reported as 0 on Windows)
-  (Kanwaljeet Singla, Venkat Raman Don)
-
-
-
-27 May 2009, PHP 5.2.10RC1
-- Updated timezone database to version 2009.8 (2009h) (Derick)
+- Added ignore_errors option to http fopen wrapper. (David Zulke, Sara)
+- Added new CURL options CURLOPT_REDIR_PROTOCOLS, CURLOPT_PROTOCOLS,
+  and CURLPROTO_* for redirect fixes in CURL 7.19.4. (Yoram Bar Haim, Stas)
+- Added support for Sun CC (FR #46595 and FR #46513). (David Soria Parra)
 
 - Changed default value of array_unique()'s optional sorting type parameter
   back to SORT_STRING to fix backwards compatibility breakage introduced in 
   PHP 5.2.9. (Moriyoshi)
 
-- Added new CURL options CURLOPT_REDIR_PROTOCOLS, CURLOPT_PROTOCOLS,
-  and CURLPROTO_* for redirect fixes in CURL 7.19.4. (Yoram Bar Haim, Stas)
-- Added support for Sun CC (FR #46595 and FR #46513). (David Soria Parra)
-
 - Fixed memory corruptions while reading properties of zip files. (Ilia)
 - Fixed memory leak in ob_get_clean/ob_get_flush. (Christian)
 - Fixed segfault on invalid session.save_path. (Hannes)
 - Fixed leaks in imap when a mail_criteria is used. (Pierre)
+- Fixed missing erealloc() in fix for Bug #40091 in spl_autoload_register. 
(Greg)
 
-- Fixed bug #48336 (ReflectionProperty::getDeclaringClass() does not work with
-  redeclared property). (patch by Markus dot Lidel at shadowconnect dot com)
+- Fixed bug #48562 (Reference recursion causes segfault when used in
+  wddx_serialize_vars()). (Felipe)
+- Fixed bug #48557 (Numeric string keys in Apache Hashmaps are not cast to
+  integers). (David Zuelke)
+- Fixed bug #48518 (curl crashes when writing into invalid file handle). (Tony)
+- Fixed bug #48514 (cURL extension uses same resource name for simple and
+  multi APIs). (Felipe)
+- Fixed bug #48469 (ldap_get_entries() leaks memory on empty search
+  results). (Patrick)
+- Fixed bug #48456 (CPPFLAGS not restored properly in phpize.m4). (Jani,
+  

[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS configure.in /main php_version.h

2009-06-17 Thread Ilia Alshanetsky
iliaa   Wed Jun 17 12:31:59 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS configure.in 
/php-src/main   php_version.h 
  Log:
  
  Back to dev
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1560r2=1.2027.2.547.2.1561diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1560 php-src/NEWS:1.2027.2.547.2.1561
--- php-src/NEWS:1.2027.2.547.2.1560Wed Jun 17 12:22:41 2009
+++ php-src/NEWSWed Jun 17 12:31:58 2009
@@ -1,5 +1,7 @@
 PHPNEWS
 |||
+?? ??? 2009, PHP 5.2.11
+
 17 Jun 2009, PHP 5.2.10
 - Updated timezone database to version 2009.9 (2009i) (Derick)
 
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.139r2=1.579.2.52.2.140diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.579.2.52.2.139 
php-src/configure.in:1.579.2.52.2.140
--- php-src/configure.in:1.579.2.52.2.139   Wed Jun 17 12:22:41 2009
+++ php-src/configure.inWed Jun 17 12:31:58 2009
@@ -1,4 +1,4 @@
-## $Id: configure.in,v 1.579.2.52.2.139 2009/06/17 12:22:41 iliaa Exp $ -*- 
autoconf -*-
+## $Id: configure.in,v 1.579.2.52.2.140 2009/06/17 12:31:58 iliaa Exp $ -*- 
autoconf -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -41,8 +41,8 @@
 
 PHP_MAJOR_VERSION=5
 PHP_MINOR_VERSION=2
-PHP_RELEASE_VERSION=10
-PHP_EXTRA_VERSION=
+PHP_RELEASE_VERSION=11
+PHP_EXTRA_VERSION=-dev
 
PHP_VERSION=$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION
 PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 1 + [$]PHP_MINOR_VERSION \* 
100 + [$]PHP_RELEASE_VERSION`
 
http://cvs.php.net/viewvc.cgi/php-src/main/php_version.h?r1=1.112.2.37.2.97r2=1.112.2.37.2.98diff_format=u
Index: php-src/main/php_version.h
diff -u php-src/main/php_version.h:1.112.2.37.2.97 
php-src/main/php_version.h:1.112.2.37.2.98
--- php-src/main/php_version.h:1.112.2.37.2.97  Wed Jun 17 12:22:41 2009
+++ php-src/main/php_version.h  Wed Jun 17 12:31:58 2009
@@ -2,7 +2,7 @@
 /* edit configure.in to change version number */
 #define PHP_MAJOR_VERSION 5
 #define PHP_MINOR_VERSION 2
-#define PHP_RELEASE_VERSION 10
-#define PHP_EXTRA_VERSION 
-#define PHP_VERSION 5.2.10
-#define PHP_VERSION_ID 50210
+#define PHP_RELEASE_VERSION 11
+#define PHP_EXTRA_VERSION -dev
+#define PHP_VERSION 5.2.11-dev
+#define PHP_VERSION_ID 50211



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

2009-06-15 Thread Felipe Pena
felipe  Mon Jun 15 17:36:01 2009 UTC

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

  Modified files:  
/php-srcNEWS 
/php-src/ext/soap   php_encoding.c 
  Log:
  - MFH: Fixed bug #48557 (Numeric string keys in Apache Hashmaps are not cast 
to integers) patch by David Zülke david.zuelke at bitextender.com
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1556r2=1.2027.2.547.2.1557diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1556 php-src/NEWS:1.2027.2.547.2.1557
--- php-src/NEWS:1.2027.2.547.2.1556Sat Jun 13 17:35:37 2009
+++ php-src/NEWSMon Jun 15 17:35:59 2009
@@ -1,6 +1,8 @@
 PHPNEWS
 |||
 ?? Jun 2009, PHP 5.2.10
+- Fixed bug #48557 (Numeric string keys in Apache Hashmaps are not cast to
+  integers). (David Zülke)
 - Fixed bug #48514 (cURL extension uses same resource name for simple and
   multi APIs). (Felipe)
 - Fixed missing erealloc() in fix for Bug #40091 in spl_autoload_register.
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_encoding.c?r1=1.103.2.21.2.46r2=1.103.2.21.2.47diff_format=u
Index: php-src/ext/soap/php_encoding.c
diff -u php-src/ext/soap/php_encoding.c:1.103.2.21.2.46 
php-src/ext/soap/php_encoding.c:1.103.2.21.2.47
--- php-src/ext/soap/php_encoding.c:1.103.2.21.2.46 Mon Jan 26 11:09:13 2009
+++ php-src/ext/soap/php_encoding.c Mon Jun 15 17:36:00 2009
@@ -17,7 +17,7 @@
   |  Dmitry Stogov dmi...@zend.com |
   +--+
 */
-/* $Id: php_encoding.c,v 1.103.2.21.2.46 2009/01/26 11:09:13 dmitry Exp $ */
+/* $Id: php_encoding.c,v 1.103.2.21.2.47 2009/06/15 17:36:00 felipe Exp $ */
 
 #include time.h
 
@@ -2726,7 +2726,7 @@
value = master_to_zval(NULL, xmlValue);
 
if (Z_TYPE_P(key) == IS_STRING) {
-   zend_hash_update(Z_ARRVAL_P(ret), 
Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, value, sizeof(zval *), NULL);
+   zend_symtable_update(Z_ARRVAL_P(ret), 
Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, value, sizeof(zval *), NULL);
} else if (Z_TYPE_P(key) == IS_LONG) {
zend_hash_index_update(Z_ARRVAL_P(ret), 
Z_LVAL_P(key), value, sizeof(zval *), NULL);
} else {

http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bug48557.phpt?view=markuprev=1.1
Index: php-src/ext/soap/tests/bug48557.phpt
+++ php-src/ext/soap/tests/bug48557.phpt
--TEST--
Bug #48557 (Numeric string keys in Apache Hashmaps are not cast to integers)
--FILE--
?php
error_reporting(E_ALL);
ini_set('display_errors', 1);
ini_set(soap.wsdl_cache_enabled, 0);

function test($map) {
var_dump($map, $map[1], $map[2]);die;
if(isset($map[2])) {
die(Success\n);
} else {
die(Fail\n);
}
}

$y = new SoapServer(dirname(__FILE__) . '/bug48557.wsdl');
$y-addfunction(test);
$request = XML
?xml version=1.0?
SOAP-ENV:Envelope xmlns:SOAP-ENV=http://schemas.xmlsoap.org/soap/envelope/; 
xmlns:ns1=http://test-uri/; 
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; 
xmlns:xsd=http://www.w3.org/2001/XMLSchema; 
xmlns:ns2=http://xml.apache.org/xml-soap; 
xmlns:SOAP-ENC=http://schemas.xmlsoap.org/soap/encoding/; 
SOAP-ENV:encodingStyle=http://schemas.xmlsoap.org/soap/encoding/;
SOAP-ENV:Body
ns1:test
testParam xsi:type=ns2:Map
item
key xsi:type=xsd:int1/key
value xsi:type=xsd:int123/value
/item
item
key xsi:type=xsd:int-1000/key
value xsi:type=xsd:string123/value
/item
item
key xsi:type=xsd:string2/key
value 
xsi:type=xsd:float123.5/value
/item
item
key xsi:type=xsd:string-2000/key
value 
xsi:type=xsd:float123.5/value
/item
item
key xsi:type=xsd:string011/key
value 
xsi:type=xsd:float123.5/value
/item
item
key xsi:type=xsd:int012/key
value 

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

2009-06-15 Thread Pierre-Alain Joye
pajoye  Mon Jun 15 22:11:47 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
  Log:
  - #48441 and encoding
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1557r2=1.2027.2.547.2.1558diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1557 php-src/NEWS:1.2027.2.547.2.1558
--- php-src/NEWS:1.2027.2.547.2.1557Mon Jun 15 17:35:59 2009
+++ php-src/NEWSMon Jun 15 22:11:47 2009
@@ -2,9 +2,11 @@
 |||
 ?? Jun 2009, PHP 5.2.10
 - Fixed bug #48557 (Numeric string keys in Apache Hashmaps are not cast to
-  integers). (David Zülke)
+  integers). (David Zuelke)
 - Fixed bug #48514 (cURL extension uses same resource name for simple and
   multi APIs). (Felipe)
+- Fixed bug #48441 (ldap_search() sizelimit, timelimit and deref options 
+  persist). (Patrick)
 - Fixed missing erealloc() in fix for Bug #40091 in spl_autoload_register.
   (Greg)
 



-- 
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/wddx wddx.c /ext/wddx/tests bug48562.phpt

2009-06-15 Thread Felipe Pena
felipe  Tue Jun 16 02:59:10 2009 UTC

  Added files: (Branch: PHP_5_2)
/php-src/ext/wddx/tests bug48562.phpt 

  Modified files:  
/php-srcNEWS 
/php-src/ext/wddx   wddx.c 
  Log:
  - MFH: Fixed bug #48562 (Reference recursion causes segfault when used in 
wddx_serialize_vars())
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1558r2=1.2027.2.547.2.1559diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1558 php-src/NEWS:1.2027.2.547.2.1559
--- php-src/NEWS:1.2027.2.547.2.1558Mon Jun 15 22:11:47 2009
+++ php-src/NEWSTue Jun 16 02:59:09 2009
@@ -1,6 +1,8 @@
 PHPNEWS
 |||
 ?? Jun 2009, PHP 5.2.10
+- Fixed bug #48562 (Reference recursion causes segfault when used in 
+  wddx_serialize_vars()). (Felipe)
 - Fixed bug #48557 (Numeric string keys in Apache Hashmaps are not cast to
   integers). (David Zuelke)
 - Fixed bug #48514 (cURL extension uses same resource name for simple and
http://cvs.php.net/viewvc.cgi/php-src/ext/wddx/wddx.c?r1=1.119.2.10.2.22r2=1.119.2.10.2.23diff_format=u
Index: php-src/ext/wddx/wddx.c
diff -u php-src/ext/wddx/wddx.c:1.119.2.10.2.22 
php-src/ext/wddx/wddx.c:1.119.2.10.2.23
--- php-src/ext/wddx/wddx.c:1.119.2.10.2.22 Wed Dec 31 11:17:46 2008
+++ php-src/ext/wddx/wddx.c Tue Jun 16 02:59:10 2009
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: wddx.c,v 1.119.2.10.2.22 2008/12/31 11:17:46 sebastian Exp $ */
+/* $Id: wddx.c,v 1.119.2.10.2.23 2009/06/16 02:59:10 felipe Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -672,13 +672,27 @@
}
else if (Z_TYPE_P(name_var) == IS_ARRAY || Z_TYPE_P(name_var) == 
IS_OBJECT)
{
+   int is_array = Z_TYPE_P(name_var) == IS_ARRAY;
+   
target_hash = HASH_OF(name_var);
+
+   if (is_array  target_hash-nApplyCount  1) {
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, recursion 
detected);
+   return;
+   }

zend_hash_internal_pointer_reset(target_hash);
 
while(zend_hash_get_current_data(target_hash, (void**)val) == 
SUCCESS) {
+   if (is_array) {
+   target_hash-nApplyCount++;
+   }
+   
php_wddx_add_var(packet, *val);
-   
+
+   if (is_array) {
+   target_hash-nApplyCount--;
+   }
zend_hash_move_forward(target_hash);
}
}

http://cvs.php.net/viewvc.cgi/php-src/ext/wddx/tests/bug48562.phpt?view=markuprev=1.1
Index: php-src/ext/wddx/tests/bug48562.phpt
+++ php-src/ext/wddx/tests/bug48562.phpt
--TEST--
Bug #48562 (Reference recursion causes segfault when used in 
wddx_serialize_vars())
--FILE--
?php

$foo = 'bar';

$a['x'] = 'foo';
$a['x'] = $a;

var_dump(wddx_serialize_vars($a));

$a['x'] = 'foo';
$a['x'] = $a;

var_dump(wddx_serialize_vars($a));

?
--EXPECTF--
Warning: wddx_serialize_vars(): recursion detected in %s on line %d
string(78) wddxPacket 
version='1.0'header/datastruct/struct/data/wddxPacket
string(120) wddxPacket version='1.0'header/datastructvar 
name='foo'stringbar/string/var/struct/data/wddxPacket



-- 
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/spl php_spl.c

2009-06-13 Thread Greg Beaver
cellog  Sat Jun 13 17:35:38 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
/php-src/ext/splphp_spl.c 
  Log:
  fix missing erealloc in fix for bug #40091, spl_autoload_register of more 
than 1 copy of the same method in different objects
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1555r2=1.2027.2.547.2.1556diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1555 php-src/NEWS:1.2027.2.547.2.1556
--- php-src/NEWS:1.2027.2.547.2.1555Fri Jun 12 20:50:58 2009
+++ php-src/NEWSSat Jun 13 17:35:37 2009
@@ -3,6 +3,8 @@
 ?? Jun 2009, PHP 5.2.10
 - Fixed bug #48514 (cURL extension uses same resource name for simple and
   multi APIs). (Felipe)
+- Fixed missing erealloc() in fix for Bug #40091 in spl_autoload_register.
+  (Greg)
 
 11 Jun 2009, PHP 5.2.10RC2
 - Updated timezone database to version 2009.9 (2009i) (Derick)
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/php_spl.c?r1=1.52.2.28.2.20r2=1.52.2.28.2.21diff_format=u
Index: php-src/ext/spl/php_spl.c
diff -u php-src/ext/spl/php_spl.c:1.52.2.28.2.20 
php-src/ext/spl/php_spl.c:1.52.2.28.2.21
--- php-src/ext/spl/php_spl.c:1.52.2.28.2.20Wed Dec 31 11:17:43 2008
+++ php-src/ext/spl/php_spl.c   Sat Jun 13 17:35:37 2009
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_spl.c,v 1.52.2.28.2.20 2008/12/31 11:17:43 sebastian Exp $ */
+/* $Id: php_spl.c,v 1.52.2.28.2.21 2009/06/13 17:35:37 cellog Exp $ */
 
 #ifdef HAVE_CONFIG_H
#include config.h
@@ -464,6 +464,7 @@
 
if (obj_ptr  !(alfi.func_ptr-common.fn_flags  
ZEND_ACC_STATIC)) {
/* add object id to the hash to ensure uniqueness, for 
more reference look at bug #40091 */
+   lc_name = erealloc(lc_name, func_name_len + 2 + 
sizeof(zend_object_handle));
memcpy(lc_name + func_name_len, 
Z_OBJ_HANDLE_PP(obj_ptr), sizeof(zend_object_handle));
func_name_len += sizeof(zend_object_handle);
lc_name[func_name_len] = '\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) / NEWS /ext/curl interface.c /ext/curl/tests bug48514.phpt

2009-06-12 Thread Felipe Pena
felipe  Fri Jun 12 20:50:58 2009 UTC

  Added files: (Branch: PHP_5_2)
/php-src/ext/curl/tests bug48514.phpt 

  Modified files:  
/php-srcNEWS 
/php-src/ext/curl   interface.c 
  Log:
  - MFH: Fixed bug #48514 (cURL extension uses same resource name for simple 
and multi APIs)
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1554r2=1.2027.2.547.2.1555diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1554 php-src/NEWS:1.2027.2.547.2.1555
--- php-src/NEWS:1.2027.2.547.2.1554Thu Jun 11 12:13:54 2009
+++ php-src/NEWSFri Jun 12 20:50:58 2009
@@ -1,6 +1,8 @@
 PHPNEWS
 |||
 ?? Jun 2009, PHP 5.2.10
+- Fixed bug #48514 (cURL extension uses same resource name for simple and
+  multi APIs). (Felipe)
 
 11 Jun 2009, PHP 5.2.10RC2
 - Updated timezone database to version 2009.9 (2009i) (Derick)
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.55r2=1.62.2.14.2.56diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.55 
php-src/ext/curl/interface.c:1.62.2.14.2.56
--- php-src/ext/curl/interface.c:1.62.2.14.2.55 Thu Jun 11 09:49:57 2009
+++ php-src/ext/curl/interface.cFri Jun 12 20:50:58 2009
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.62.2.14.2.55 2009/06/11 09:49:57 tony2001 Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.56 2009/06/12 20:50:58 felipe Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -367,7 +367,7 @@
 PHP_MINIT_FUNCTION(curl)
 {
le_curl = zend_register_list_destructors_ex(_php_curl_close, NULL, 
curl, module_number);
-   le_curl_multi_handle = 
zend_register_list_destructors_ex(_php_curl_multi_close, NULL, curl, 
module_number);
+   le_curl_multi_handle = 
zend_register_list_destructors_ex(_php_curl_multi_close, NULL, curl_multi, 
module_number);
 
/* See http://curl.haxx.se/lxr/source/docs/libcurl/symbols-in-versions
   or curl src/docs/libcurl/symbols-in-versions for a (almost) complete 
list

http://cvs.php.net/viewvc.cgi/php-src/ext/curl/tests/bug48514.phpt?view=markuprev=1.1
Index: php-src/ext/curl/tests/bug48514.phpt
+++ php-src/ext/curl/tests/bug48514.phpt
--TEST--
Bug #48514 (cURL extension uses same resource name for simple and multi APIs)
--FILE--
?php

$ch1 = curl_init();
var_dump($ch1);
var_dump(get_resource_type($ch1));

$ch2 = curl_multi_init();
var_dump($ch2);
var_dump(get_resource_type($ch2));

?
--EXPECTF--
resource(4) of type (curl)
%string|unicode%(4) curl
resource(5) of type (curl_multi)
%string|unicode%(10) curl_multi



-- 
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/curl interface.c

2009-06-11 Thread Antony Dovgal
tony2001Thu Jun 11 09:49:57 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
/php-src/ext/curl   interface.c 
  Log:
  MFH: fix bug #48518 (curl crashes when writing into invalid file handle)
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1550r2=1.2027.2.547.2.1551diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1550 php-src/NEWS:1.2027.2.547.2.1551
--- php-src/NEWS:1.2027.2.547.2.1550Tue Jun  9 14:04:28 2009
+++ php-src/NEWSThu Jun 11 09:49:57 2009
@@ -4,6 +4,7 @@
 - Updated timezone database to version 2009.9 (2009i) (Derick)
 - Added ignore_errors option to http fopen wrapper. (David Zulke, Sara)
 
+- Fixed bug #48518 (curl crashes when writing into invalid file handle). (Tony)
 - Fixed bug #48469 (ldap_get_entries() leaks memory on empty search results).
   (Patrick)
 - Fixed bug #48456 (CPPFLAGS not restored properly in phpize.m4).
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.54r2=1.62.2.14.2.55diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.54 
php-src/ext/curl/interface.c:1.62.2.14.2.55
--- php-src/ext/curl/interface.c:1.62.2.14.2.54 Wed Jun 10 11:10:19 2009
+++ php-src/ext/curl/interface.cThu Jun 11 09:49:57 2009
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.62.2.14.2.54 2009/06/10 11:10:19 tony2001 Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.55 2009/06/11 09:49:57 tony2001 Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -1437,6 +1437,7 @@
switch (option) {
case CURLOPT_FILE:
if (((php_stream *) what)-mode[0] != 
'r') {
+   
zend_list_addref(Z_LVAL_PP(zvalue));
ch-handlers-write-fp = fp;
ch-handlers-write-method = 
PHP_CURL_FILE;
} else {
@@ -1447,6 +1448,7 @@
break;
case CURLOPT_WRITEHEADER:
if (((php_stream *) what)-mode[0] != 
'r') {
+   
zend_list_addref(Z_LVAL_PP(zvalue));
ch-handlers-write_header-fp 
= fp;

ch-handlers-write_header-method = PHP_CURL_FILE;
} else {



-- 
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 configure.in /main php_version.h

2009-06-11 Thread Ilia Alshanetsky
iliaa   Thu Jun 11 12:10:43 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS configure.in 
/php-src/main   php_version.h 
  Log:
  
  5.2.10RC2
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1551r2=1.2027.2.547.2.1552diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1551 php-src/NEWS:1.2027.2.547.2.1552
--- php-src/NEWS:1.2027.2.547.2.1551Thu Jun 11 09:49:57 2009
+++ php-src/NEWSThu Jun 11 12:10:43 2009
@@ -1,6 +1,6 @@
-PHP
NEWS
+PHPNEWS
 |||
-?? Jun 2009, PHP 5.2.10
+11 Jun 2009, PHP 5.2.10
 - Updated timezone database to version 2009.9 (2009i) (Derick)
 - Added ignore_errors option to http fopen wrapper. (David Zulke, Sara)
 
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.136r2=1.579.2.52.2.137diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.579.2.52.2.136 
php-src/configure.in:1.579.2.52.2.137
--- php-src/configure.in:1.579.2.52.2.136   Wed May 27 13:51:16 2009
+++ php-src/configure.inThu Jun 11 12:10:43 2009
@@ -1,4 +1,4 @@
-## $Id: configure.in,v 1.579.2.52.2.136 2009/05/27 13:51:16 iliaa Exp $ -*- 
autoconf -*-
+## $Id: configure.in,v 1.579.2.52.2.137 2009/06/11 12:10:43 iliaa Exp $ -*- 
autoconf -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -42,7 +42,7 @@
 PHP_MAJOR_VERSION=5
 PHP_MINOR_VERSION=2
 PHP_RELEASE_VERSION=10
-PHP_EXTRA_VERSION=RC2-dev
+PHP_EXTRA_VERSION=RC2
 
PHP_VERSION=$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION
 PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 1 + [$]PHP_MINOR_VERSION \* 
100 + [$]PHP_RELEASE_VERSION`
 
http://cvs.php.net/viewvc.cgi/php-src/main/php_version.h?r1=1.112.2.37.2.94r2=1.112.2.37.2.95diff_format=u
Index: php-src/main/php_version.h
diff -u php-src/main/php_version.h:1.112.2.37.2.94 
php-src/main/php_version.h:1.112.2.37.2.95
--- php-src/main/php_version.h:1.112.2.37.2.94  Wed May 27 13:51:16 2009
+++ php-src/main/php_version.h  Thu Jun 11 12:10:43 2009
@@ -3,6 +3,6 @@
 #define PHP_MAJOR_VERSION 5
 #define PHP_MINOR_VERSION 2
 #define PHP_RELEASE_VERSION 10
-#define PHP_EXTRA_VERSION RC2-dev
-#define PHP_VERSION 5.2.10RC2-dev
+#define PHP_EXTRA_VERSION RC2
+#define PHP_VERSION 5.2.10RC2
 #define PHP_VERSION_ID 50210



-- 
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

2009-06-11 Thread Ilia Alshanetsky
iliaa   Thu Jun 11 12:12:43 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
  Log:
  
  RC2 not final
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1552r2=1.2027.2.547.2.1553diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1552 php-src/NEWS:1.2027.2.547.2.1553
--- php-src/NEWS:1.2027.2.547.2.1552Thu Jun 11 12:10:43 2009
+++ php-src/NEWSThu Jun 11 12:12:43 2009
@@ -1,6 +1,6 @@
 PHPNEWS
 |||
-11 Jun 2009, PHP 5.2.10
+11 Jun 2009, PHP 5.2.10RC2
 - Updated timezone database to version 2009.9 (2009i) (Derick)
 - Added ignore_errors option to http fopen wrapper. (David Zulke, Sara)
 



-- 
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 configure.in /main php_version.h

2009-06-11 Thread Ilia Alshanetsky
iliaa   Thu Jun 11 12:13:55 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS configure.in 
/php-src/main   php_version.h 
  Log:
  
  Back to dev
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1553r2=1.2027.2.547.2.1554diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1553 php-src/NEWS:1.2027.2.547.2.1554
--- php-src/NEWS:1.2027.2.547.2.1553Thu Jun 11 12:12:43 2009
+++ php-src/NEWSThu Jun 11 12:13:54 2009
@@ -1,5 +1,7 @@
 PHPNEWS
 |||
+?? Jun 2009, PHP 5.2.10
+
 11 Jun 2009, PHP 5.2.10RC2
 - Updated timezone database to version 2009.9 (2009i) (Derick)
 - Added ignore_errors option to http fopen wrapper. (David Zulke, Sara)
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.137r2=1.579.2.52.2.138diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.579.2.52.2.137 
php-src/configure.in:1.579.2.52.2.138
--- php-src/configure.in:1.579.2.52.2.137   Thu Jun 11 12:10:43 2009
+++ php-src/configure.inThu Jun 11 12:13:54 2009
@@ -1,4 +1,4 @@
-## $Id: configure.in,v 1.579.2.52.2.137 2009/06/11 12:10:43 iliaa Exp $ -*- 
autoconf -*-
+## $Id: configure.in,v 1.579.2.52.2.138 2009/06/11 12:13:54 iliaa Exp $ -*- 
autoconf -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -42,7 +42,7 @@
 PHP_MAJOR_VERSION=5
 PHP_MINOR_VERSION=2
 PHP_RELEASE_VERSION=10
-PHP_EXTRA_VERSION=RC2
+PHP_EXTRA_VERSION=RC3-dev
 
PHP_VERSION=$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION
 PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 1 + [$]PHP_MINOR_VERSION \* 
100 + [$]PHP_RELEASE_VERSION`
 
http://cvs.php.net/viewvc.cgi/php-src/main/php_version.h?r1=1.112.2.37.2.95r2=1.112.2.37.2.96diff_format=u
Index: php-src/main/php_version.h
diff -u php-src/main/php_version.h:1.112.2.37.2.95 
php-src/main/php_version.h:1.112.2.37.2.96
--- php-src/main/php_version.h:1.112.2.37.2.95  Thu Jun 11 12:10:43 2009
+++ php-src/main/php_version.h  Thu Jun 11 12:13:55 2009
@@ -3,6 +3,6 @@
 #define PHP_MAJOR_VERSION 5
 #define PHP_MINOR_VERSION 2
 #define PHP_RELEASE_VERSION 10
-#define PHP_EXTRA_VERSION RC2
-#define PHP_VERSION 5.2.10RC2
+#define PHP_EXTRA_VERSION RC3-dev
+#define PHP_VERSION 5.2.10RC3-dev
 #define PHP_VERSION_ID 50210



-- 
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

2009-06-09 Thread Ilia Alshanetsky
iliaa   Tue Jun  9 12:16:31 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
  Log:
  TZ update news
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1547r2=1.2027.2.547.2.1548diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1547 php-src/NEWS:1.2027.2.547.2.1548
--- php-src/NEWS:1.2027.2.547.2.1547Tue Jun  9 01:09:28 2009
+++ php-src/NEWSTue Jun  9 12:16:31 2009
@@ -1,6 +1,7 @@
 PHP
NEWS
 |||
 ?? Jun 2009, PHP 5.2.10
+- Updated timezone database to version 2009.9 (2009i) (Derick)
 - Added ignore_errors option to http fopen wrapper. (David Zulke, Sara)
 
 - Fixed bug #48469 (ldap_get_entries() leaks memory on empty search results).



-- 
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/cgi cgi_main.c

2009-06-09 Thread David Soria Parra
dsp Tue Jun  9 13:29:40 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/sapi/cgi   cgi_main.c 
/php-srcNEWS 
  Log:
  Fix bug #47042 (cgi sapi is incorrectly removing the SCRIPT_FILENAME for non 
apache).
  The fix was provided by Sriram Natarajan.
  
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/cgi_main.c?r1=1.267.2.15.2.70r2=1.267.2.15.2.71diff_format=u
Index: php-src/sapi/cgi/cgi_main.c
diff -u php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.70 
php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.71
--- php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.70 Thu Jun  4 11:53:38 2009
+++ php-src/sapi/cgi/cgi_main.c Tue Jun  9 13:29:39 2009
@@ -21,7 +21,7 @@
+--+
 */
 
-/* $Id: cgi_main.c,v 1.267.2.15.2.70 2009/06/04 11:53:38 jani Exp $ */
+/* $Id: cgi_main.c,v 1.267.2.15.2.71 2009/06/09 13:29:39 dsp Exp $ */
 
 #include php.h
 #include php_globals.h
@@ -964,7 +964,8 @@
}
 
if (env_path_translated != NULL  env_redirect_url != 
NULL 
-   orig_script_filename != NULL  
script_path_translated != NULL) {
+   env_path_translated != script_path_translated 
+   strcmp(env_path_translated, script_path_translated) 
!= 0) {
/* 
   pretty much apache specific.  If we have a 
redirect_url
   then our script_filename and script_name 
point to the
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1548r2=1.2027.2.547.2.1549diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1548 php-src/NEWS:1.2027.2.547.2.1549
--- php-src/NEWS:1.2027.2.547.2.1548Tue Jun  9 12:16:31 2009
+++ php-src/NEWSTue Jun  9 13:29:39 2009
@@ -34,6 +34,8 @@
   (Nuno, Scott)
 - Fixed bug #42143 (The constant NAN is reported as 0 on Windows)
   (Kanwaljeet Singla, Venkat Raman Don)
+- Fixed bug #47042 (cgi sapi is incorrectly removing SCRIPT_FILENAME).
+  (Sriram Natarajan, David Soria Parra)
 
 
 27 May 2009, PHP 5.2.10RC1



-- 
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

2009-06-09 Thread Pierre-Alain Joye
pajoye  Tue Jun  9 14:04:28 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
  Log:
  - fix NEWS
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1549r2=1.2027.2.547.2.1550diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1549 php-src/NEWS:1.2027.2.547.2.1550
--- php-src/NEWS:1.2027.2.547.2.1549Tue Jun  9 13:29:39 2009
+++ php-src/NEWSTue Jun  9 14:04:28 2009
@@ -24,6 +24,8 @@
 - Fixed bug #48247 (Crash on errors during startup). (Stas)
 - Fixed bug #47836 (array operator [] inconsistency when the array has
   PHP_INT_MAX index value). (Matt)
+- Fixed bug #47042 (cgi sapi is incorrectly removing SCRIPT_FILENAME).
+  (Sriram Natarajan, David Soria Parra)
 - Fixed bug #46386 (Digest authentication with SOAP module fails against MSSQL 
   SOAP services). (Ilia, lordelph at gmail dot com)
 - Fixed bug #46109 (Memory leak when mysqli::init() is called multiple times).
@@ -34,8 +36,7 @@
   (Nuno, Scott)
 - Fixed bug #42143 (The constant NAN is reported as 0 on Windows)
   (Kanwaljeet Singla, Venkat Raman Don)
-- Fixed bug #47042 (cgi sapi is incorrectly removing SCRIPT_FILENAME).
-  (Sriram Natarajan, David Soria Parra)
+
 
 
 27 May 2009, PHP 5.2.10RC1



-- 
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

2009-06-08 Thread Pierre-Alain Joye
pajoye  Mon Jun  8 08:39:25 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
  Log:
  - #48469
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1543r2=1.2027.2.547.2.1544diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1543 php-src/NEWS:1.2027.2.547.2.1544
--- php-src/NEWS:1.2027.2.547.2.1543Mon Jun  8 01:26:53 2009
+++ php-src/NEWSMon Jun  8 08:39:25 2009
@@ -3,6 +3,8 @@
 ?? Jun 2009, PHP 5.2.10
 - Added ignore_errors option to http fopen wrapper. (David Zulke, Sara)
 
+- Fixed bug #48469 (ldap_get_entries() memory leaks on empty search results)
+  (Patrick)
 - Fixed bug #48456 (CPPFLAGS not restored properly in phpize.m4).
   (Jani, spisek at kerio dot com)
 - Fixed bug #48448 (Compile failure under IRIX 6.5.30 building cast.c). 



-- 
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

2009-06-08 Thread Jani Taskinen
janiMon Jun  8 10:39:26 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
  Log:
  fix news
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1544r2=1.2027.2.547.2.1545diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1544 php-src/NEWS:1.2027.2.547.2.1545
--- php-src/NEWS:1.2027.2.547.2.1544Mon Jun  8 08:39:25 2009
+++ php-src/NEWSMon Jun  8 10:39:25 2009
@@ -3,7 +3,7 @@
 ?? Jun 2009, PHP 5.2.10
 - Added ignore_errors option to http fopen wrapper. (David Zulke, Sara)
 
-- Fixed bug #48469 (ldap_get_entries() memory leaks on empty search results)
+- Fixed bug #48469 (ldap_get_entries() leaks memory on empty search results).
   (Patrick)
 - Fixed bug #48456 (CPPFLAGS not restored properly in phpize.m4).
   (Jani, spisek at kerio dot com)



-- 
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

2009-06-08 Thread Scott MacVicar
scottmacTue Jun  9 00:43:05 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
  Log:
  BFN
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1545r2=1.2027.2.547.2.1546diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1545 php-src/NEWS:1.2027.2.547.2.1546
--- php-src/NEWS:1.2027.2.547.2.1545Mon Jun  8 10:39:25 2009
+++ php-src/NEWSTue Jun  9 00:43:04 2009
@@ -27,6 +27,8 @@
   SOAP services). (Ilia, lordelph at gmail dot com)
 - Fixed bug #44827 (define() is missing error checks for class constants).
   (Ilia)
+- Fixed bug #44214 (Crash using preg_replace_callback() and global variable).
+  (Nuno, Scott)
 - Fixed bug #42143 (The constant NAN is reported as 0 on Windows)
   (Kanwaljeet Singla, Venkat Raman Don)
 



-- 
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

2009-06-08 Thread Scott MacVicar
scottmacTue Jun  9 01:09:28 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
  Log:
  BFN
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1546r2=1.2027.2.547.2.1547diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1546 php-src/NEWS:1.2027.2.547.2.1547
--- php-src/NEWS:1.2027.2.547.2.1546Tue Jun  9 00:43:04 2009
+++ php-src/NEWSTue Jun  9 01:09:28 2009
@@ -9,10 +9,10 @@
   (Jani, spisek at kerio dot com)
 - Fixed bug #48448 (Compile failure under IRIX 6.5.30 building cast.c). 
   (Kalle)
-- Fixed bug #48434 (memory_get_usage() accuracy). (Arnaud)
+- Fixed bug #48434 (Improve memory_get_usage() accuracy). (Arnaud)
 - Fixed bug #48416 (Force a cache limit in ereg() to stop excessive memory 
usage).
   (Scott)
-- Fixed bug #48409 (crash when exception is thrown while passing function 
+- Fixed bug #48409 (Crash when exception is thrown while passing function 
   arguments). (Arnaud)
 - Fixed bug #48378 (exif_read_data() segfaults on certain corrupted .jpeg 
   files). (Pierre)
@@ -25,9 +25,11 @@
   PHP_INT_MAX index value). (Matt)
 - Fixed bug #46386 (Digest authentication with SOAP module fails against MSSQL 
   SOAP services). (Ilia, lordelph at gmail dot com)
+- Fixed bug #46109 (Memory leak when mysqli::init() is called multiple times).
+  (Andrey)
 - Fixed bug #44827 (define() is missing error checks for class constants).
   (Ilia)
-- Fixed bug #44214 (Crash using preg_replace_callback() and global variable).
+- Fixed bug #44214 (Crash using preg_replace_callback() and global variables).
   (Nuno, Scott)
 - Fixed bug #42143 (The constant NAN is reported as 0 on Windows)
   (Kanwaljeet Singla, Venkat Raman Don)



-- 
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/tests/array array_push_error2.phpt ZendEngine2 zend_hash.c ZendEngine2/tests bug47836.phpt

2009-06-07 Thread Matt Wilmas
mattwil Sun Jun  7 19:28:33 2009 UTC

  Added files: (Branch: PHP_5_2)
/ZendEngine2/tests  bug47836.phpt 

  Modified files:  
/php-srcNEWS 
/ZendEngine2zend_hash.c 
/php-src/ext/standard/tests/array   array_push_error2.phpt 
  Log:
  MFH: Fixed bug #47836 (array operator [] inconsistency when the array has 
PHP_INT_MAX index value)
  Also simplified related array_push() test
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1541r2=1.2027.2.547.2.1542diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1541 php-src/NEWS:1.2027.2.547.2.1542
--- php-src/NEWS:1.2027.2.547.2.1541Wed Jun  3 12:41:46 2009
+++ php-src/NEWSSun Jun  7 19:28:32 2009
@@ -19,6 +19,8 @@
 - Fixed bug #48273 (snmp*_real_walk() returns SNMP errors as values).
   (Ilia, lytboris at gmail dot com)
 - Fixed bug #48247 (Crash on errors during startup). (Stas)
+- Fixed bug #47836 (array operator [] inconsistency when the array has
+  PHP_INT_MAX index value). (Matt)
 - Fixed bug #46386 (Digest authentication with SOAP module fails against MSSQL 
   SOAP services). (Ilia, lordelph at gmail dot com)
 - Fixed bug #42143 (The constant NAN is reported as 0 on Windows)
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_hash.c?r1=1.121.2.4.2.10r2=1.121.2.4.2.11diff_format=u
Index: ZendEngine2/zend_hash.c
diff -u ZendEngine2/zend_hash.c:1.121.2.4.2.10 
ZendEngine2/zend_hash.c:1.121.2.4.2.11
--- ZendEngine2/zend_hash.c:1.121.2.4.2.10  Wed Dec 31 11:17:33 2008
+++ ZendEngine2/zend_hash.c Sun Jun  7 19:28:32 2009
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: zend_hash.c,v 1.121.2.4.2.10 2008/12/31 11:17:33 sebastian Exp $ */
+/* $Id: zend_hash.c,v 1.121.2.4.2.11 2009/06/07 19:28:32 mattwil Exp $ */
 
 #include zend.h
 
@@ -376,7 +376,7 @@
UPDATE_DATA(ht, p, pData, nDataSize);
HANDLE_UNBLOCK_INTERRUPTIONS();
if ((long)h = (long)ht-nNextFreeElement) {
-   ht-nNextFreeElement = h + 1;
+   ht-nNextFreeElement = h  LONG_MAX ? h + 1 : 
LONG_MAX;
}
if (pDest) {
*pDest = p-pData;
@@ -404,7 +404,7 @@
HANDLE_UNBLOCK_INTERRUPTIONS();
 
if ((long)h = (long)ht-nNextFreeElement) {
-   ht-nNextFreeElement = h + 1;
+   ht-nNextFreeElement = h  LONG_MAX ? h + 1 : LONG_MAX;
}
ht-nNumOfElements++;
ZEND_HASH_IF_FULL_DO_RESIZE(ht);
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_push_error2.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u
Index: php-src/ext/standard/tests/array/array_push_error2.phpt
diff -u php-src/ext/standard/tests/array/array_push_error2.phpt:1.1.2.2 
php-src/ext/standard/tests/array/array_push_error2.phpt:1.1.2.3
--- php-src/ext/standard/tests/array/array_push_error2.phpt:1.1.2.2 Fri Mar 
14 23:13:07 2008
+++ php-src/ext/standard/tests/array/array_push_error2.phpt Sun Jun  7 
19:28:33 2009
@@ -1,9 +1,5 @@
 --TEST--
-Test array_push() function : error conditions - min and max int values as keys
---SKIPIF--
-?php
-if (PHP_INT_SIZE != 4) die(skip this test is for 32bit platform only);
-?
+Test array_push() function : error conditions - max int value as key
 --FILE--
 ?php
 /* Prototype  : int array_push(array $stack, mixed $var [, mixed $...])
@@ -12,42 +8,27 @@
  */
 
 /*
- * Use PHP's minimum and maximum integer values as array keys
+ * Use PHP's maximum integer value as array key
  * then try and push new elements onto the array
  */
 
 echo *** Testing array_push() : error conditions ***\n;
 
-$array = array(-PHP_INT_MAX = 'min', PHP_INT_MAX = 'max');
+$array = array(PHP_INT_MAX = 'max');
 
 var_dump(array_push($array, 'new'));
 var_dump($array);
-var_dump(array_push($array, 'var'));
-var_dump($array);
 
 echo Done;
 ?
 
 --EXPECTF--
 *** Testing array_push() : error conditions ***
-int(3)
-array(3) {
-  [-2147483647]=
-  string(3) min
-  [2147483647]=
-  string(3) max
-  [-2147483648]=
-  string(3) new
-}
 
 Warning: array_push(): Cannot add element to the array as the next element is 
already occupied in %s on line %d
 bool(false)
-array(3) {
-  [-2147483647]=
-  string(3) min
-  [2147483647]=
+array(1) {
+  [%d]=
   string(3) max
-  [-2147483648]=
-  string(3) new
 }
 Done

http://cvs.php.net/viewvc.cgi/ZendEngine2/tests/bug47836.phpt?view=markuprev=1.1
Index: ZendEngine2/tests/bug47836.phpt
+++ ZendEngine2/tests/bug47836.phpt
--TEST--
Bug #47836 (array operator [] inconsistency when the array has PHP_INT_MAX 
index value)
--FILE--
?php

$arr[PHP_INT_MAX] = 1;
$arr[] = 2;

var_dump($arr);
?
--EXPECTF--
Warning: Cannot add element to the array as the next element is already 
occupied in %s on line 4
array(1) {
  [%d]=
  int(1)
}



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

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

2009-06-07 Thread Ilia Alshanetsky
iliaa   Mon Jun  8 01:26:54 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
  Log:
  BFN
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1542r2=1.2027.2.547.2.1543diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1542 php-src/NEWS:1.2027.2.547.2.1543
--- php-src/NEWS:1.2027.2.547.2.1542Sun Jun  7 19:28:32 2009
+++ php-src/NEWSMon Jun  8 01:26:53 2009
@@ -23,6 +23,8 @@
   PHP_INT_MAX index value). (Matt)
 - Fixed bug #46386 (Digest authentication with SOAP module fails against MSSQL 
   SOAP services). (Ilia, lordelph at gmail dot com)
+- Fixed bug #44827 (define() is missing error checks for class constants).
+  (Ilia)
 - Fixed bug #42143 (The constant NAN is reported as 0 on Windows)
   (Kanwaljeet Singla, Venkat Raman Don)
 



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



[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /main/streams cast.c

2009-06-03 Thread Kalle Sommer Nielsen
kalle   Wed Jun  3 08:59:19 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
/php-src/main/streams   cast.c 
  Log:
  Fixed #48448 (Compile failure under IRIX 6.5.30 building cast.c)
  
  # Only in this branch, looks like a missing merge compared to PHP_5_3/HEAD
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1539r2=1.2027.2.547.2.1540diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1539 php-src/NEWS:1.2027.2.547.2.1540
--- php-src/NEWS:1.2027.2.547.2.1539Tue Jun  2 19:55:07 2009
+++ php-src/NEWSWed Jun  3 08:59:19 2009
@@ -1,10 +1,12 @@
-PHPNEWS
+PHP
NEWS
 |||
 ?? Jun 2009, PHP 5.2.10
 - Added ignore_errors option to http fopen wrapper. (David Zulke, Sara)
 
 - Fixed bug #48456 (CPPFLAGS not restored properly in phpize.m4).
   (Jani, spisek at kerio dot com)
+- Fixed bug #48448 (Compile failure under IRIX 6.5.30 building cast.c). 
+  (Kalle)
 - Fixed bug #48434 (memory_get_usage() accuracy). (Arnaud)
 - Fixed bug #48416 (Force a cache limit in ereg() to stop excessive memory 
usage).
   (Scott)
http://cvs.php.net/viewvc.cgi/php-src/main/streams/cast.c?r1=1.12.2.1.2.5r2=1.12.2.1.2.6diff_format=u
Index: php-src/main/streams/cast.c
diff -u php-src/main/streams/cast.c:1.12.2.1.2.5 
php-src/main/streams/cast.c:1.12.2.1.2.6
--- php-src/main/streams/cast.c:1.12.2.1.2.5Sun Apr 19 17:10:52 2009
+++ php-src/main/streams/cast.c Wed Jun  3 08:59:19 2009
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: cast.c,v 1.12.2.1.2.5 2009/04/19 17:10:52 lbarnaud Exp $ */
+/* $Id: cast.c,v 1.12.2.1.2.6 2009/06/03 08:59:19 kalle Exp $ */
 
 #define _GNU_SOURCE
 #include php.h
@@ -219,7 +219,7 @@
if (ret != SUCCESS) {
php_stream_close(newstream);
} else {
-   int retcode = 
php_stream_cast(newstream, castas | flags, ret, show_err);
+   int retcode = 
php_stream_cast(newstream, castas | flags, (void **)ret, show_err);
 
if (retcode == SUCCESS)
rewind(*(FILE**)ret);



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

2009-06-03 Thread Ilia Alshanetsky
iliaa   Wed Jun  3 12:41:47 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/soap   php_http.c 
/php-srcNEWS 
  Log:
  
  MFB: Fixed bug #46386 (Digest authentication with SOAP module fails against
  MSSQL SOAP services)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_http.c?r1=1.77.2.11.2.17r2=1.77.2.11.2.18diff_format=u
Index: php-src/ext/soap/php_http.c
diff -u php-src/ext/soap/php_http.c:1.77.2.11.2.17 
php-src/ext/soap/php_http.c:1.77.2.11.2.18
--- php-src/ext/soap/php_http.c:1.77.2.11.2.17  Mon Jan 19 21:57:45 2009
+++ php-src/ext/soap/php_http.c Wed Jun  3 12:41:46 2009
@@ -17,7 +17,7 @@
   |  Dmitry Stogov dmi...@zend.com |
   +--+
 */
-/* $Id: php_http.c,v 1.77.2.11.2.17 2009/01/19 21:57:45 iliaa Exp $ */
+/* $Id: php_http.c,v 1.77.2.11.2.18 2009/06/03 12:41:46 iliaa Exp $ */
 
 #include php_soap.h
 #include ext/standard/base64.h
@@ -614,6 +614,11 @@

smart_str_append_const(soap_headers, \, opaque=\);

smart_str_appendl(soap_headers, Z_STRVAL_PP(tmp), Z_STRLEN_PP(tmp));
}
+   if (zend_hash_find(Z_ARRVAL_PP(digest), 
algorithm, sizeof(algorithm), (void **)tmp) == SUCCESS 
+   Z_TYPE_PP(tmp) == IS_STRING) {
+   
smart_str_append_const(soap_headers, \, algorithm=\);
+   
smart_str_appendl(soap_headers, Z_STRVAL_PP(tmp), Z_STRLEN_PP(tmp));
+   }
smart_str_append_const(soap_headers, 
\\r\n);
}
} else {
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1540r2=1.2027.2.547.2.1541diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1540 php-src/NEWS:1.2027.2.547.2.1541
--- php-src/NEWS:1.2027.2.547.2.1540Wed Jun  3 08:59:19 2009
+++ php-src/NEWSWed Jun  3 12:41:46 2009
@@ -19,6 +19,8 @@
 - Fixed bug #48273 (snmp*_real_walk() returns SNMP errors as values).
   (Ilia, lytboris at gmail dot com)
 - Fixed bug #48247 (Crash on errors during startup). (Stas)
+- Fixed bug #46386 (Digest authentication with SOAP module fails against MSSQL 
+  SOAP services). (Ilia, lordelph at gmail dot com)
 - Fixed bug #42143 (The constant NAN is reported as 0 on Windows)
   (Kanwaljeet Singla, Venkat Raman Don)
 



-- 
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

2009-06-02 Thread Jani Taskinen
janiTue Jun  2 19:55:08 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
  Log:
  bfn
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1538r2=1.2027.2.547.2.1539diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1538 php-src/NEWS:1.2027.2.547.2.1539
--- php-src/NEWS:1.2027.2.547.2.1538Mon Jun  1 13:10:57 2009
+++ php-src/NEWSTue Jun  2 19:55:07 2009
@@ -3,6 +3,8 @@
 ?? Jun 2009, PHP 5.2.10
 - Added ignore_errors option to http fopen wrapper. (David Zulke, Sara)
 
+- Fixed bug #48456 (CPPFLAGS not restored properly in phpize.m4).
+  (Jani, spisek at kerio dot com)
 - Fixed bug #48434 (memory_get_usage() accuracy). (Arnaud)
 - Fixed bug #48416 (Force a cache limit in ereg() to stop excessive memory 
usage).
   (Scott)



-- 
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

2009-06-01 Thread Jani Taskinen
janiMon Jun  1 09:00:55 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
  Log:
  fix news
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1536r2=1.2027.2.547.2.1537diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1536 php-src/NEWS:1.2027.2.547.2.1537
--- php-src/NEWS:1.2027.2.547.2.1536Sun May 31 21:31:15 2009
+++ php-src/NEWSMon Jun  1 09:00:54 2009
@@ -12,7 +12,7 @@
   files). (Pierre)
 - Fixed bug #48359 (Script hangs on snmprealwalk if OID is not
   increasing). (Ilia, simonov at gmail dot com)
-- Fixed bug #48247 PHP crashes on errors during startup. (Stas)
+- Fixed bug #48247 (Crash on errors during startup). (Stas)
 - Fixed bug #42143 (The constant NAN is reported as 0 on Windows)
   (Kanwaljeet Singla, Venkat Raman Don)
 



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

2009-06-01 Thread Ilia Alshanetsky
iliaa   Mon Jun  1 13:10:57 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/snmp   snmp.c 
/php-srcNEWS 
  Log:
  
  Fixed bug #48273 (snmp*_real_walk() returns SNMP errors as values).
  
http://cvs.php.net/viewvc.cgi/php-src/ext/snmp/snmp.c?r1=1.106.2.2.2.9r2=1.106.2.2.2.10diff_format=u
Index: php-src/ext/snmp/snmp.c
diff -u php-src/ext/snmp/snmp.c:1.106.2.2.2.9 
php-src/ext/snmp/snmp.c:1.106.2.2.2.10
--- php-src/ext/snmp/snmp.c:1.106.2.2.2.9   Sun May 31 14:14:07 2009
+++ php-src/ext/snmp/snmp.c Mon Jun  1 13:10:56 2009
@@ -20,7 +20,7 @@
+--+
  */
 
-/* $Id: snmp.c,v 1.106.2.2.2.9 2009/05/31 14:14:07 iliaa Exp $ */
+/* $Id: snmp.c,v 1.106.2.2.2.10 2009/06/01 13:10:56 iliaa Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -479,7 +479,7 @@
return;
} else if (st == SNMP_CMD_WALK) {

add_next_index_zval(return_value,snmpval); /* Add to returned array */
-   } else if (st == SNMP_CMD_REALWALK)  {
+   } else if (st == SNMP_CMD_REALWALK  
vars-type != SNMP_ENDOFMIBVIEW  vars-type != SNMP_NOSUCHOBJECT  
vars-type != SNMP_NOSUCHINSTANCE) {
 #ifdef HAVE_NET_SNMP
snprint_objid(buf2, 
sizeof(buf2), vars-name, vars-name_length);
 #else
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1537r2=1.2027.2.547.2.1538diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1537 php-src/NEWS:1.2027.2.547.2.1538
--- php-src/NEWS:1.2027.2.547.2.1537Mon Jun  1 09:00:54 2009
+++ php-src/NEWSMon Jun  1 13:10:57 2009
@@ -12,6 +12,8 @@
   files). (Pierre)
 - Fixed bug #48359 (Script hangs on snmprealwalk if OID is not
   increasing). (Ilia, simonov at gmail dot com)
+- Fixed bug #48273 (snmp*_real_walk() returns SNMP errors as values).
+  (Ilia, lytboris at gmail dot com)
 - Fixed bug #48247 (Crash on errors during startup). (Stas)
 - Fixed bug #42143 (The constant NAN is reported as 0 on Windows)
   (Kanwaljeet Singla, Venkat Raman Don)



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

2009-05-31 Thread Ilia Alshanetsky
iliaa   Sun May 31 14:14:08 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/snmp   snmp.c 
/php-srcNEWS 
  Log:
  
  MFB: Fixed bug #48359 (Script hangs on snmprealwalk if OID is not
  increasing)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/snmp/snmp.c?r1=1.106.2.2.2.8r2=1.106.2.2.2.9diff_format=u
Index: php-src/ext/snmp/snmp.c
diff -u php-src/ext/snmp/snmp.c:1.106.2.2.2.8 
php-src/ext/snmp/snmp.c:1.106.2.2.2.9
--- php-src/ext/snmp/snmp.c:1.106.2.2.2.8   Wed Dec 31 11:17:43 2008
+++ php-src/ext/snmp/snmp.c Sun May 31 14:14:07 2009
@@ -20,7 +20,7 @@
+--+
  */
 
-/* $Id: snmp.c,v 1.106.2.2.2.8 2008/12/31 11:17:43 sebastian Exp $ */
+/* $Id: snmp.c,v 1.106.2.2.2.9 2009/05/31 14:14:07 iliaa Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -490,9 +490,14 @@
if (st = SNMP_CMD_WALK  st != 
SNMP_CMD_SET) {
if (vars-type != 
SNMP_ENDOFMIBVIEW  
vars-type != 
SNMP_NOSUCHOBJECT  vars-type != SNMP_NOSUCHINSTANCE) {
-   memmove((char *)name, 
(char *)vars-name,vars-name_length * sizeof(oid));
-   name_length = 
vars-name_length;
-   keepwalking = 1;
+   if 
(snmp_oid_compare(name, name_length, vars-name, vars-name_length) = 0) {
+   
php_error_docref(NULL TSRMLS_CC, E_WARNING, Error: OID not increasing: 
%s,name);
+   keepwalking = 0;
+   } else {
+   memmove((char 
*)name, (char *)vars-name,vars-name_length * sizeof(oid));
+   name_length = 
vars-name_length;
+   keepwalking = 1;
+   }
}
}
}   
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1534r2=1.2027.2.547.2.1535diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1534 php-src/NEWS:1.2027.2.547.2.1535
--- php-src/NEWS:1.2027.2.547.2.1534Sat May 30 16:42:50 2009
+++ php-src/NEWSSun May 31 14:14:07 2009
@@ -10,9 +10,12 @@
   arguments). (Arnaud)
 - Fixed bug #48378 (exif_read_data() segfaults on certain corrupted .jpeg 
   files). (Pierre)
+- Fixed bug #48359 (Script hangs on snmprealwalk if OID is not
+  increasing). (Ilia, simonov at gmail dot com)
 - Fixed bug #42143 (The constant NAN is reported as 0 on Windows)
   (Kanwaljeet Singla, Venkat Raman Don)
 
+
 27 May 2009, PHP 5.2.10RC1
 - Updated timezone database to version 2009.8 (2009h) (Derick)
 



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



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

2009-05-31 Thread Stanislav Malyshev
stasSun May 31 21:31:16 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
  Log:
  fix for #48247
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1535r2=1.2027.2.547.2.1536diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1535 php-src/NEWS:1.2027.2.547.2.1536
--- php-src/NEWS:1.2027.2.547.2.1535Sun May 31 14:14:07 2009
+++ php-src/NEWSSun May 31 21:31:15 2009
@@ -12,6 +12,7 @@
   files). (Pierre)
 - Fixed bug #48359 (Script hangs on snmprealwalk if OID is not
   increasing). (Ilia, simonov at gmail dot com)
+- Fixed bug #48247 PHP crashes on errors during startup. (Stas)
 - Fixed bug #42143 (The constant NAN is reported as 0 on Windows)
   (Kanwaljeet Singla, Venkat Raman Don)
 



-- 
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

2009-05-30 Thread Arnaud Le Blanc
lbarnaudSat May 30 16:36:02 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
  Log:
  BFN
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1532r2=1.2027.2.547.2.1533diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1532 php-src/NEWS:1.2027.2.547.2.1533
--- php-src/NEWS:1.2027.2.547.2.1532Fri May 29 07:29:20 2009
+++ php-src/NEWSSat May 30 16:36:01 2009
@@ -5,6 +5,8 @@
 
 - Fixed bug #48416 (Force a cache limit in ereg() to stop excessive memory 
usage).
   (Scott)
+- Fixed bug #48409 (crash when exception is thrown while passing function 
+  arguments). (Arnaud)
 - Fixed bug #48378 (exif_read_data() segfaults on certain corrupted .jpeg 
   files). (Pierre)
 - Fixed bug #42143 (The constant NAN is reported as 0 on Windows)



-- 
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

2009-05-30 Thread Arnaud Le Blanc
lbarnaudSat May 30 16:42:51 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
  Log:
  BFN
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1533r2=1.2027.2.547.2.1534diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1533 php-src/NEWS:1.2027.2.547.2.1534
--- php-src/NEWS:1.2027.2.547.2.1533Sat May 30 16:36:01 2009
+++ php-src/NEWSSat May 30 16:42:50 2009
@@ -3,6 +3,7 @@
 ?? Jun 2009, PHP 5.2.10
 - Added ignore_errors option to http fopen wrapper. (David Zulke, Sara)
 
+- Fixed bug #48434 (memory_get_usage() accuracy). (Arnaud)
 - Fixed bug #48416 (Force a cache limit in ereg() to stop excessive memory 
usage).
   (Scott)
 - Fixed bug #48409 (crash when exception is thrown while passing function 



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

2009-05-28 Thread Arnaud Le Blanc
lbarnaudThu May 28 13:20:23 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/standard   http_fopen_wrapper.c 
/php-srcNEWS 
  Log:
  MFH: merged http ignore_errors context option
  # [DOC] since 5.2.10. See also bug #38802.
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/http_fopen_wrapper.c?r1=1.99.2.12.2.18r2=1.99.2.12.2.19diff_format=u
Index: php-src/ext/standard/http_fopen_wrapper.c
diff -u php-src/ext/standard/http_fopen_wrapper.c:1.99.2.12.2.18 
php-src/ext/standard/http_fopen_wrapper.c:1.99.2.12.2.19
--- php-src/ext/standard/http_fopen_wrapper.c:1.99.2.12.2.18Sun May 24 
16:02:22 2009
+++ php-src/ext/standard/http_fopen_wrapper.c   Thu May 28 13:20:22 2009
@@ -19,7 +19,7 @@
|  Sara Golemon poll...@php.net  |
+--+
  */
-/* $Id: http_fopen_wrapper.c,v 1.99.2.12.2.18 2009/05/24 16:02:22 iliaa Exp $ 
*/ 
+/* $Id: http_fopen_wrapper.c,v 1.99.2.12.2.19 2009/05/28 13:20:22 lbarnaud Exp 
$ */ 
 
 #include php.h
 #include php_globals.h
@@ -104,7 +104,7 @@
size_t chunk_size = 0, file_size = 0;
int eol_detect = 0;
char *transport_string, *errstr = NULL;
-   int transport_len, have_header = 0, request_fulluri = 0;
+   int transport_len, have_header = 0, request_fulluri = 0, ignore_errors 
= 0;
char *protocol_version = NULL;
int protocol_version_len = 3; /* Default: 1.0 */
struct timeval timeout;
@@ -552,9 +552,11 @@
} else {
response_code = 0;
}
+   if (context  
SUCCESS==php_stream_context_get_option(context, http, ignore_errors, 
tmpzval)) {
+   ignore_errors = zend_is_true(*tmpzval);
+   }
/* when we request only the header, don't fail even on 
error codes */
-   if ((options  STREAM_ONLY_GET_HEADERS) ||
-   (context  
php_stream_context_get_option(context, http, ignore_errors,  tmpzval) == 
SUCCESS  zend_is_true(*tmpzval)) ) {
+   if ((options  STREAM_ONLY_GET_HEADERS) || 
ignore_errors) {
reqok = 1;
}
switch(response_code) {
@@ -632,7 +634,7 @@
}

if (!reqok || location[0] != '\0') {
-   if (options  STREAM_ONLY_GET_HEADERS  redirect_max = 1) {
+   if (((options  STREAM_ONLY_GET_HEADERS) || ignore_errors)  
redirect_max = 1) {
goto out;
}
 
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1526r2=1.2027.2.547.2.1527diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1526 php-src/NEWS:1.2027.2.547.2.1527
--- php-src/NEWS:1.2027.2.547.2.1526Wed May 27 13:51:15 2009
+++ php-src/NEWSThu May 28 13:20:22 2009
@@ -12,6 +12,7 @@
 - Added new CURL options CURLOPT_REDIR_PROTOCOLS, CURLOPT_PROTOCOLS,
   and CURLPROTO_* for redirect fixes in CURL 7.19.4. (Yoram Bar Haim, Stas)
 - Added support for Sun CC (FR #46595 and FR #46513). (David Soria Parra)
+- Added ignore_errors option to http fopen wrapper. (David Zulke, Sara)
 
 - Fixed memory corruptions while reading properties of zip files. (Ilia)
 - Fixed memory leak in ob_get_clean/ob_get_flush. (Christian)



-- 
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

2009-05-28 Thread Pierre-Alain Joye
pajoye  Thu May 28 14:04:20 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
  Log:
  - #48738
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1527r2=1.2027.2.547.2.1528diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1527 php-src/NEWS:1.2027.2.547.2.1528
--- php-src/NEWS:1.2027.2.547.2.1527Thu May 28 13:20:22 2009
+++ php-src/NEWSThu May 28 14:04:19 2009
@@ -19,6 +19,8 @@
 - Fixed segfault on invalid session.save_path. (Hannes)
 - Fixed leaks in imap when a mail_criteria is used. (Pierre)
 
+- Fixed bug #48738 (exif_read_data() segfaults on certain corrupted .jpeg 
+  files). (Pierre)
 - Fixed bug #48336 (ReflectionProperty::getDeclaringClass() does not work with
   redeclared property). (patch by Markus dot Lidel at shadowconnect dot com)
 - Fixed bug #48326 (constant MSG_DONTWAIT not defined). (Arnaud)



-- 
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

2009-05-28 Thread Scott MacVicar
scottmacFri May 29 00:05:56 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
  Log:
  BFN
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1528r2=1.2027.2.547.2.1529diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1528 php-src/NEWS:1.2027.2.547.2.1529
--- php-src/NEWS:1.2027.2.547.2.1528Thu May 28 14:04:19 2009
+++ php-src/NEWSFri May 29 00:05:56 2009
@@ -1,6 +1,8 @@
 PHPNEWS
 |||
 ?? Jun 2009, PHP 5.2.10
+- Fixed bug #48416 (Force a cache limit in ereg() to stop excessive memory 
usage).
+  (Scott)
 
 27 May 2009, PHP 5.2.10RC1
 - Updated timezone database to version 2009.8 (2009h) (Derick)



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



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

2009-05-28 Thread Ilia Alshanetsky
iliaa   Fri May 29 01:32:00 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
  Log:
  Adjust news order
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1529r2=1.2027.2.547.2.1530diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1529 php-src/NEWS:1.2027.2.547.2.1530
--- php-src/NEWS:1.2027.2.547.2.1529Fri May 29 00:05:56 2009
+++ php-src/NEWSFri May 29 01:31:58 2009
@@ -1,6 +1,10 @@
 PHPNEWS
 |||
 ?? Jun 2009, PHP 5.2.10
+- Added ignore_errors option to http fopen wrapper. (David Zulke, Sara)
+
+- Fixed bug #48738 (exif_read_data() segfaults on certain corrupted .jpeg 
+  files). (Pierre)
 - Fixed bug #48416 (Force a cache limit in ereg() to stop excessive memory 
usage).
   (Scott)
 
@@ -14,15 +18,12 @@
 - Added new CURL options CURLOPT_REDIR_PROTOCOLS, CURLOPT_PROTOCOLS,
   and CURLPROTO_* for redirect fixes in CURL 7.19.4. (Yoram Bar Haim, Stas)
 - Added support for Sun CC (FR #46595 and FR #46513). (David Soria Parra)
-- Added ignore_errors option to http fopen wrapper. (David Zulke, Sara)
 
 - Fixed memory corruptions while reading properties of zip files. (Ilia)
 - Fixed memory leak in ob_get_clean/ob_get_flush. (Christian)
 - Fixed segfault on invalid session.save_path. (Hannes)
 - Fixed leaks in imap when a mail_criteria is used. (Pierre)
 
-- Fixed bug #48738 (exif_read_data() segfaults on certain corrupted .jpeg 
-  files). (Pierre)
 - Fixed bug #48336 (ReflectionProperty::getDeclaringClass() does not work with
   redeclared property). (patch by Markus dot Lidel at shadowconnect dot com)
 - Fixed bug #48326 (constant MSG_DONTWAIT not defined). (Arnaud)



-- 
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

2009-05-28 Thread Scott MacVicar
scottmacFri May 29 02:35:56 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
  Log:
  Bug number was wrong.
  
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1530r2=1.2027.2.547.2.1531diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1530 php-src/NEWS:1.2027.2.547.2.1531
--- php-src/NEWS:1.2027.2.547.2.1530Fri May 29 01:31:58 2009
+++ php-src/NEWSFri May 29 02:35:56 2009
@@ -3,10 +3,10 @@
 ?? Jun 2009, PHP 5.2.10
 - Added ignore_errors option to http fopen wrapper. (David Zulke, Sara)
 
-- Fixed bug #48738 (exif_read_data() segfaults on certain corrupted .jpeg 
-  files). (Pierre)
 - Fixed bug #48416 (Force a cache limit in ereg() to stop excessive memory 
usage).
   (Scott)
+- Fixed bug #48378 (exif_read_data() segfaults on certain corrupted .jpeg 
+  files). (Pierre)
 
 27 May 2009, PHP 5.2.10RC1
 - Updated timezone database to version 2009.8 (2009h) (Derick)



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



[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS configure.in /main php_version.h

2009-05-27 Thread Ilia Alshanetsky
iliaa   Wed May 27 13:47:34 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS configure.in 
/php-src/main   php_version.h 
  Log:
  
  5.2.10RC1
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1524r2=1.2027.2.547.2.1525diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1524 php-src/NEWS:1.2027.2.547.2.1525
--- php-src/NEWS:1.2027.2.547.2.1524Tue May 26 15:50:43 2009
+++ php-src/NEWSWed May 27 13:47:32 2009
@@ -1,6 +1,6 @@
 PHPNEWS
 |||
-?? ??? 2009, PHP 5.2.10
+27 May 2009, PHP 5.2.10RC1
 - Updated timezone database to version 2009.8 (2009h) (Derick)
 
 - Changed default value of array_unique()'s optional sorting type parameter
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.134r2=1.579.2.52.2.135diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.579.2.52.2.134 
php-src/configure.in:1.579.2.52.2.135
--- php-src/configure.in:1.579.2.52.2.134   Sat May  9 20:36:35 2009
+++ php-src/configure.inWed May 27 13:47:32 2009
@@ -1,4 +1,4 @@
-## $Id: configure.in,v 1.579.2.52.2.134 2009/05/09 20:36:35 jani Exp $ -*- 
autoconf -*-
+## $Id: configure.in,v 1.579.2.52.2.135 2009/05/27 13:47:32 iliaa Exp $ -*- 
autoconf -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -42,7 +42,7 @@
 PHP_MAJOR_VERSION=5
 PHP_MINOR_VERSION=2
 PHP_RELEASE_VERSION=10
-PHP_EXTRA_VERSION=-dev
+PHP_EXTRA_VERSION=RC1
 
PHP_VERSION=$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION
 PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 1 + [$]PHP_MINOR_VERSION \* 
100 + [$]PHP_RELEASE_VERSION`
 
http://cvs.php.net/viewvc.cgi/php-src/main/php_version.h?r1=1.112.2.37.2.92r2=1.112.2.37.2.93diff_format=u
Index: php-src/main/php_version.h
diff -u php-src/main/php_version.h:1.112.2.37.2.92 
php-src/main/php_version.h:1.112.2.37.2.93
--- php-src/main/php_version.h:1.112.2.37.2.92  Wed Feb 25 15:34:33 2009
+++ php-src/main/php_version.h  Wed May 27 13:47:34 2009
@@ -3,6 +3,6 @@
 #define PHP_MAJOR_VERSION 5
 #define PHP_MINOR_VERSION 2
 #define PHP_RELEASE_VERSION 10
-#define PHP_EXTRA_VERSION -dev
-#define PHP_VERSION 5.2.10-dev
+#define PHP_EXTRA_VERSION RC1
+#define PHP_VERSION 5.2.10RC1
 #define PHP_VERSION_ID 50210



-- 
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 configure.in /main php_version.h

2009-05-27 Thread Ilia Alshanetsky
iliaa   Wed May 27 13:51:16 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS configure.in 
/php-src/main   php_version.h 
  Log:
  
  Back to dev
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1525r2=1.2027.2.547.2.1526diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1525 php-src/NEWS:1.2027.2.547.2.1526
--- php-src/NEWS:1.2027.2.547.2.1525Wed May 27 13:47:32 2009
+++ php-src/NEWSWed May 27 13:51:15 2009
@@ -1,5 +1,7 @@
 PHPNEWS
 |||
+?? Jun 2009, PHP 5.2.10
+
 27 May 2009, PHP 5.2.10RC1
 - Updated timezone database to version 2009.8 (2009h) (Derick)
 
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.135r2=1.579.2.52.2.136diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.579.2.52.2.135 
php-src/configure.in:1.579.2.52.2.136
--- php-src/configure.in:1.579.2.52.2.135   Wed May 27 13:47:32 2009
+++ php-src/configure.inWed May 27 13:51:16 2009
@@ -1,4 +1,4 @@
-## $Id: configure.in,v 1.579.2.52.2.135 2009/05/27 13:47:32 iliaa Exp $ -*- 
autoconf -*-
+## $Id: configure.in,v 1.579.2.52.2.136 2009/05/27 13:51:16 iliaa Exp $ -*- 
autoconf -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -42,7 +42,7 @@
 PHP_MAJOR_VERSION=5
 PHP_MINOR_VERSION=2
 PHP_RELEASE_VERSION=10
-PHP_EXTRA_VERSION=RC1
+PHP_EXTRA_VERSION=RC2-dev
 
PHP_VERSION=$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION
 PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 1 + [$]PHP_MINOR_VERSION \* 
100 + [$]PHP_RELEASE_VERSION`
 
http://cvs.php.net/viewvc.cgi/php-src/main/php_version.h?r1=1.112.2.37.2.93r2=1.112.2.37.2.94diff_format=u
Index: php-src/main/php_version.h
diff -u php-src/main/php_version.h:1.112.2.37.2.93 
php-src/main/php_version.h:1.112.2.37.2.94
--- php-src/main/php_version.h:1.112.2.37.2.93  Wed May 27 13:47:34 2009
+++ php-src/main/php_version.h  Wed May 27 13:51:16 2009
@@ -3,6 +3,6 @@
 #define PHP_MAJOR_VERSION 5
 #define PHP_MINOR_VERSION 2
 #define PHP_RELEASE_VERSION 10
-#define PHP_EXTRA_VERSION RC1
-#define PHP_VERSION 5.2.10RC1
+#define PHP_EXTRA_VERSION RC2-dev
+#define PHP_VERSION 5.2.10RC2-dev
 #define PHP_VERSION_ID 50210



-- 
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/pcntl pcntl.c /ext/pcntl/tests 001.phpt bug47566.phpt

2009-05-26 Thread Arnaud Le Blanc
lbarnaudTue May 26 14:02:34 2009 UTC

  Added files: (Branch: PHP_5_2)
/php-src/ext/pcntl/testsbug47566.phpt 

  Modified files:  
/php-srcNEWS 
/php-src/ext/pcntl  pcntl.c 
/php-src/ext/pcntl/tests001.phpt 
  Log:
  MFH: Fix return value of pcntl_wexitstatus() (fixes #47566,
  patch by james at jamesreno dot com)
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1521r2=1.2027.2.547.2.1522diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1521 php-src/NEWS:1.2027.2.547.2.1522
--- php-src/NEWS:1.2027.2.547.2.1521Tue May 26 05:57:40 2009
+++ php-src/NEWSTue May 26 14:02:33 2009
@@ -85,6 +85,8 @@
   literal). (Ilia)
 - Fixed bug #47616 (curl keeps crashing). (Felipe)
 - Fixed bug #47598 (FILTER_VALIDATE_EMAIL is locale aware). (Ilia)
+- Fixed bug #47566 (pcntl_wexitstatus() returns signed status).
+  (patch by james at jamesreno dot com)
 - Fixed bug #47564 (unpacking unsigned long 32bit bit endian returns wrong
   result). (Ilia)
 - Fixed bug #47487 (performance degraded when reading large chunks after fix of
http://cvs.php.net/viewvc.cgi/php-src/ext/pcntl/pcntl.c?r1=1.48.2.2.2.7r2=1.48.2.2.2.8diff_format=u
Index: php-src/ext/pcntl/pcntl.c
diff -u php-src/ext/pcntl/pcntl.c:1.48.2.2.2.7 
php-src/ext/pcntl/pcntl.c:1.48.2.2.2.8
--- php-src/ext/pcntl/pcntl.c:1.48.2.2.2.7  Wed Dec 31 11:17:41 2008
+++ php-src/ext/pcntl/pcntl.c   Tue May 26 14:02:34 2009
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: pcntl.c,v 1.48.2.2.2.7 2008/12/31 11:17:41 sebastian Exp $ */
+/* $Id: pcntl.c,v 1.48.2.2.2.8 2009/05/26 14:02:34 lbarnaud Exp $ */
 
 #define PCNTL_DEBUG 0
 
@@ -374,9 +374,7 @@

status_word = (int) Z_LVAL_PP(status);
 
-   /* WEXITSTATUS only returns 8 bits so we *MUST* cast this to signed char
-  if you want to have valid negative exit codes */
-   RETURN_LONG((signed char) WEXITSTATUS(status_word));
+   RETURN_LONG(WEXITSTATUS(status_word));
 #else
RETURN_FALSE;
 #endif
http://cvs.php.net/viewvc.cgi/php-src/ext/pcntl/tests/001.phpt?r1=1.8r2=1.8.4.1diff_format=u
Index: php-src/ext/pcntl/tests/001.phpt
diff -u php-src/ext/pcntl/tests/001.phpt:1.8 
php-src/ext/pcntl/tests/001.phpt:1.8.4.1
--- php-src/ext/pcntl/tests/001.phpt:1.8Thu Dec 16 12:34:31 2004
+++ php-src/ext/pcntl/tests/001.phptTue May 26 14:02:34 2009
@@ -73,7 +73,7 @@
 Staring wait.h tests
 
 Testing pcntl_wifexited and wexitstatus
-Exited With: -1
+Exited With: 255
 
 Testing pcntl_wifsignaled
 Process was terminated by signal : SIGTERM

http://cvs.php.net/viewvc.cgi/php-src/ext/pcntl/tests/bug47566.phpt?view=markuprev=1.1
Index: php-src/ext/pcntl/tests/bug47566.phpt
+++ php-src/ext/pcntl/tests/bug47566.phpt
--TEST--
Bug #47566 (return value of pcntl_wexitstatus())
--SKIPIF--
?php if (!extension_loaded(pcntl)) print skip; ?
--FILE--
?
$pid = pcntl_fork();
if ($pid == -1) {
 echo Unable to fork;
 exit;
} elseif ($pid) {
 $epid = pcntl_waitpid(-1,$status);
 var_dump(pcntl_wexitstatus($status));
} else {
 exit(128);
}
?
--EXPECT--
int(128)



-- 
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/pcntl pcntl.c /ext/pcntl/tests 001.phpt bug47566.phpt

2009-05-26 Thread Antony Dovgal
On 26.05.2009 18:02, Arnaud Le Blanc wrote:
 - /* WEXITSTATUS only returns 8 bits so we *MUST* cast this to signed char
 -if you want to have valid negative exit codes */
 - RETURN_LONG((signed char) WEXITSTATUS(status_word));
 + RETURN_LONG(WEXITSTATUS(status_word));

Okay, now you CAN return 254, but you CAN'T return -2 anymore.
I'd say this needs to be reverted just to be consistent with previous versions.

-- 
Wbr, 
Antony Dovgal
---
http://pinba.org - realtime statistics for PHP

-- 
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/curl interface.c php_curl.h

2009-05-26 Thread Jani Taskinen
janiTue May 26 15:50:44 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
/php-src/ext/curl   interface.c php_curl.h 
  Log:
  MFH:- Fixed bug #48203 (Crash when CURLOPT_STDERR is set to regular file)
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1523r2=1.2027.2.547.2.1524diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1523 php-src/NEWS:1.2027.2.547.2.1524
--- php-src/NEWS:1.2027.2.547.2.1523Tue May 26 14:38:34 2009
+++ php-src/NEWSTue May 26 15:50:43 2009
@@ -37,6 +37,7 @@
   with RecursiveIteratorIterator leads to a segfault). (Scott)
 - Fixed bug #48204 (xmlwriter_open_uri() does not emit warnings on invalid
   paths). (Ilia)
+- Fixed bug #48203 (Crash when CURLOPT_STDERR is set to regular file). (Jani)
 - Fixed bug #48202 (Out of Memory error message when passing invalid file path)
   (Pierre)
 - Fixed bug #48156 (Added support for lcov v1.7). (Ilia)
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.50r2=1.62.2.14.2.51diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.50 
php-src/ext/curl/interface.c:1.62.2.14.2.51
--- php-src/ext/curl/interface.c:1.62.2.14.2.50 Thu May 21 12:53:24 2009
+++ php-src/ext/curl/interface.cTue May 26 15:50:44 2009
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.62.2.14.2.50 2009/05/21 12:53:24 iliaa Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.51 2009/05/26 15:50:44 jani Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -370,7 +370,7 @@
le_curl_multi_handle = 
zend_register_list_destructors_ex(_php_curl_multi_close, NULL, curl, 
module_number);
 
/* See http://curl.haxx.se/lxr/source/docs/libcurl/symbols-in-versions
-  or curl src/docs/libcurl/symbols-in-versions for a (almost) complete 
list 
+  or curl src/docs/libcurl/symbols-in-versions for a (almost) complete 
list
   of options and which version they were introduced */
 
/* Constants for curl_setopt() */
@@ -1460,6 +1460,20 @@
ch-handlers-read-fp = fp;
ch-handlers-read-fd = 
Z_LVAL_PP(zvalue);
break;
+   case CURLOPT_STDERR:
+   if (((php_stream *) what)-mode[0] != 
'r') {
+   if (ch-handlers-stderr) {
+   
zval_ptr_dtor(ch-handlers-stderr);
+   }
+   zval_add_ref(zvalue);
+   ch-handlers-stderr = *zvalue;
+   
zend_list_addref(Z_LVAL_PP(zvalue));
+   } else {
+   php_error_docref(NULL 
TSRMLS_CC, E_WARNING, the provided file handle is not writable);
+   RETVAL_FALSE;
+   return 1;
+   }
+   /* break omitted intentionally */
default:
error = curl_easy_setopt(ch-cp, 
option, fp);
break;
@@ -2046,6 +2060,11 @@
fprintf(stderr, DTOR CALLED, ch = %x\n, ch);
 #endif
 
+   /* Prevent crash inside cURL if passed file has already been closed */
+   if (ch-handlers-stderr  Z_REFCOUNT_P(ch-handlers-stderr) = 0) {
+   curl_easy_setopt(ch-cp, CURLOPT_STDERR, stderr);
+   }
+
curl_easy_cleanup(ch-cp);
 #if LIBCURL_VERSION_NUM  0x071101
zend_llist_clean(ch-to_free.str);
@@ -2068,6 +2087,9 @@
if (ch-handlers-passwd) {
zval_ptr_dtor(ch-handlers-passwd);
}
+   if (ch-handlers-stderr) {
+   zval_ptr_dtor(ch-handlers-stderr);
+   }
if (ch-header.str_len  0) {
efree(ch-header.str);
}
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/php_curl.h?r1=1.44.2.2.2.5r2=1.44.2.2.2.6diff_format=u
Index: php-src/ext/curl/php_curl.h
diff -u php-src/ext/curl/php_curl.h:1.44.2.2.2.5 
php-src/ext/curl/php_curl.h:1.44.2.2.2.6
--- php-src/ext/curl/php_curl.h:1.44.2.2.2.5Wed Dec 31 11:17:36 2008
+++ php-src/ext/curl/php_curl.h Tue May 26 15:50:44 2009
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: php_curl.h,v 1.44.2.2.2.5 2008/12/31 11:17:36 sebastian Exp $ */
+/* $Id: php_curl.h,v 1.44.2.2.2.6 2009/05/26 15:50:44 jani Exp $ */
 
 #ifndef _PHP_CURL_H
 #define _PHP_CURL_H
@@ -101,6 +101,7 @@
php_curl_write *write_header;
php_curl_read  *read;
  

Re: [PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/pcntl pcntl.c /ext/pcntl/tests 001.phpt bug47566.phpt

2009-05-26 Thread Arnaud Le Blanc
Hi,

On Tue, 2009-05-26 at 19:09 +0400, Antony Dovgal wrote:
 On 26.05.2009 18:02, Arnaud Le Blanc wrote:
  -   /* WEXITSTATUS only returns 8 bits so we *MUST* cast this to signed char
  -  if you want to have valid negative exit codes */
  -   RETURN_LONG((signed char) WEXITSTATUS(status_word));
  +   RETURN_LONG(WEXITSTATUS(status_word));
 
 Okay, now you CAN return 254, but you CAN'T return -2 anymore.
 I'd say this needs to be reverted just to be consistent with previous 
 versions.
 

proc_get_status() would return 254. A shell would say the script
returned 254 too. C functions which return a process status would say
254 too. This was a bug and this should be fixed. I can revert this in
5.2, but IMO this should be left in other branches.

Regards,

Arnaud


-- 
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

2009-05-26 Thread Ilia Alshanetsky
iliaa   Tue May 26 14:38:34 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
  Log:
  
  timezone update news
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1522r2=1.2027.2.547.2.1523diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1522 php-src/NEWS:1.2027.2.547.2.1523
--- php-src/NEWS:1.2027.2.547.2.1522Tue May 26 14:02:33 2009
+++ php-src/NEWSTue May 26 14:38:34 2009
@@ -1,7 +1,7 @@
 PHPNEWS
 |||
 ?? ??? 2009, PHP 5.2.10
-- Updated timezone database to version 2009.7 (2009g) (Derick)
+- Updated timezone database to version 2009.8 (2009h) (Derick)
 
 - Changed default value of array_unique()'s optional sorting type parameter
   back to SORT_STRING to fix backwards compatibility breakage introduced in 



-- 
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/curl interface.c php_curl.h

2009-05-26 Thread Ilia Alshanetsky

On 26-May-09, at 11:50 AM, Jani Taskinen wrote:


janiTue May 26 15:50:44 2009 UTC

 Modified files:  (Branch: PHP_5_2)
   /php-src NEWS
   /php-src/ext/curlinterface.c php_curl.h
 Log:
 MFH:- Fixed bug #48203 (Crash when CURLOPT_STDERR is set to regular  
file)


Good stuff.


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_2) / NEWS

2009-05-25 Thread Pierre-Alain Joye
pajoye  Mon May 25 16:30:38 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
  Log:
  - #48202
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1518r2=1.2027.2.547.2.1519diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1518 php-src/NEWS:1.2027.2.547.2.1519
--- php-src/NEWS:1.2027.2.547.2.1518Fri May 22 11:23:21 2009
+++ php-src/NEWSMon May 25 16:30:37 2009
@@ -37,6 +37,8 @@
   with RecursiveIteratorIterator leads to a segfault). (Scott)
 - Fixed bug #48204 (xmlwriter_open_uri() does not emit warnings on invalid
   paths). (Ilia)
+- Fixed bug #48202 (Out of Memory error message when passing invalid file path)
+  (Pierre)
 - Fixed bug #48156 (Added support for lcov v1.7). (Ilia)
 - Fixed bug #48131 (Don't try to bind ipv4 addresses to ipv6 ips via
   bindto). (Ilia)



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

2009-05-25 Thread Jani Taskinen
janiTue May 26 04:47:05 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
/php-src/ext/zlib   zlib.c 
  Log:
  MFH:- Fixed bug #42362 (HTTP status codes 204 and 304 should not be gzipped)
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1519r2=1.2027.2.547.2.1520diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1519 php-src/NEWS:1.2027.2.547.2.1520
--- php-src/NEWS:1.2027.2.547.2.1519Mon May 25 16:30:37 2009
+++ php-src/NEWSTue May 26 04:47:04 2009
@@ -125,6 +125,8 @@
   data). (Arnaud)
 - Fixed bug #42414 (some odbc_*() functions incompatible with Oracle ODBC 
   driver). (jhml at gmx dot net)
+- Fixed bug #42362 (HTTP status codes 204 and 304 should not be gzipped).
+  (Scott, Edward Z. Yang)
 - Fixed bug #38805 (PDO truncates text from SQL Server text data type
   field). (Steph)
 
http://cvs.php.net/viewvc.cgi/php-src/ext/zlib/zlib.c?r1=1.183.2.6.2.10r2=1.183.2.6.2.11diff_format=u
Index: php-src/ext/zlib/zlib.c
diff -u php-src/ext/zlib/zlib.c:1.183.2.6.2.10 
php-src/ext/zlib/zlib.c:1.183.2.6.2.11
--- php-src/ext/zlib/zlib.c:1.183.2.6.2.10  Tue May 26 04:45:21 2009
+++ php-src/ext/zlib/zlib.c Tue May 26 04:47:05 2009
@@ -19,7 +19,7 @@
+--+
  */
 
-/* $Id: zlib.c,v 1.183.2.6.2.10 2009/05/26 04:45:21 jani Exp $ */
+/* $Id: zlib.c,v 1.183.2.6.2.11 2009/05/26 04:47:05 jani Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -987,7 +987,7 @@
 {
zend_bool do_start, do_end;
 
-   if (!ZLIBG(output_compression)) {
+   if (!ZLIBG(output_compression) || SG(sapi_headers).http_response_code 
== 204 || SG(sapi_headers).http_response_code == 304) {
*handled_output = NULL;
} else {
do_start = (mode  PHP_OUTPUT_HANDLER_START ? 1 : 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) / NEWS /ext/zlib zlib.c

2009-05-25 Thread Jani Taskinen
janiTue May 26 05:57:40 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
/php-src/ext/zlib   zlib.c 
  Log:
  MF53: - Fixed bug #45202 (zlib.output_compression can not be set with 
ini_set()
  # This is fixed in HEAD already. :)
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1520r2=1.2027.2.547.2.1521diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1520 php-src/NEWS:1.2027.2.547.2.1521
--- php-src/NEWS:1.2027.2.547.2.1520Tue May 26 04:47:04 2009
+++ php-src/NEWSTue May 26 05:57:40 2009
@@ -113,6 +113,8 @@
 - Fixed bug #45614 (ArrayIterator::current(), ::key() can show 1st private
   prop of wrapped object). (robin_fernandes at uk dot ibm dot com, Arnaud)
 - Fixed bug #45540 (stream_context_create creates bad http request). (Arnaud)
+- Fixed bug #45202 (zlib.output_compression can not be set with ini_set()).
+  (Jani)
 - Fixed bug #45191 (error_log ignores date.timezone php.ini val when
   setting logging timestamps). (Derick)
 - Fixed bug #45092 (header HTTP context option not being used when compiled
http://cvs.php.net/viewvc.cgi/php-src/ext/zlib/zlib.c?r1=1.183.2.6.2.11r2=1.183.2.6.2.12diff_format=u
Index: php-src/ext/zlib/zlib.c
diff -u php-src/ext/zlib/zlib.c:1.183.2.6.2.11 
php-src/ext/zlib/zlib.c:1.183.2.6.2.12
--- php-src/ext/zlib/zlib.c:1.183.2.6.2.11  Tue May 26 04:47:05 2009
+++ php-src/ext/zlib/zlib.c Tue May 26 05:57:40 2009
@@ -19,7 +19,7 @@
+--+
  */
 
-/* $Id: zlib.c,v 1.183.2.6.2.11 2009/05/26 04:47:05 jani Exp $ */
+/* $Id: zlib.c,v 1.183.2.6.2.12 2009/05/26 05:57:40 jani Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -88,7 +88,7 @@
 /* True globals, no need for thread safety */
 static const int gz_magic[2] = {0x1f, 0x8b};   /* gzip magic header */
 
-static int php_enable_output_compression(int buffer_size TSRMLS_DC);
+static int php_zlib_output_compression_start(TSRMLS_D);
 
 static PHP_MINIT_FUNCTION(zlib);
 static PHP_MSHUTDOWN_FUNCTION(zlib);
@@ -176,6 +176,7 @@
 /* {{{ OnUpdate_zlib_output_compression */
 static PHP_INI_MH(OnUpdate_zlib_output_compression)
 {
+   int status, int_value;
char *ini_value;
 
if (new_value == NULL) {
@@ -190,8 +191,10 @@
new_value_length = sizeof(1);
}
 
+   int_value = zend_atoi(new_value, new_value_length);
ini_value = zend_ini_string(output_handler, sizeof(output_handler), 
0);
-   if (ini_value != NULL  strlen(ini_value) != 0  zend_atoi(new_value, 
new_value_length) != 0) {
+
+   if (ini_value  *ini_value  int_value) {
php_error_docref(ref.outcontrol TSRMLS_CC, E_CORE_ERROR, 
Cannot use both zlib.output_compression and output_handler together!!);
return FAILURE;
}
@@ -201,9 +204,13 @@
return FAILURE;
}
 
-   OnUpdateLong(entry, new_value, new_value_length, mh_arg1, mh_arg2, 
mh_arg3, stage TSRMLS_CC);
+   status = OnUpdateLong(entry, new_value, new_value_length, mh_arg1, 
mh_arg2, mh_arg3, stage TSRMLS_CC);
 
-   return SUCCESS;
+   if (stage == PHP_INI_STAGE_RUNTIME  int_value) {
+   status = php_zlib_output_compression_start(TSRMLS_C);
+   }
+
+   return status;
 }
 /* }}} */
 
@@ -257,18 +264,10 @@
  */
 static PHP_RINIT_FUNCTION(zlib)
 {
-   uint chunk_size = ZLIBG(output_compression);
-
ZLIBG(ob_gzhandler_status) = 0;
ZLIBG(compression_coding) = 0;
-   if (chunk_size) {
-   if (chunk_size == 1) {
-   chunk_size = 4096; /* use the default size */
-   ZLIBG(output_compression) = chunk_size;
-   }
-   php_enable_output_compression(chunk_size TSRMLS_CC);
-   }
-   return SUCCESS;
+
+   return php_zlib_output_compression_start(TSRMLS_C);
 }
 /* }}} */
 
@@ -1032,6 +1031,24 @@
 }
 /* }}} */
 
+/* {{{ php_zlib_output_compression_start() */
+static int php_zlib_output_compression_start(TSRMLS_D)
+{
+   switch (ZLIBG(output_compression)) {
+   case 0:
+   break;
+   case 1:
+   ZLIBG(output_compression) = 4096;
+   default:
+   /* ZLIBG(compression_coding) should be 0 when zlib 
compression hasn't been started yet.. */
+   if (ZLIBG(compression_coding) == 0) {
+   return 
php_enable_output_compression(ZLIBG(output_compression) TSRMLS_CC);
+   }
+   }
+   return SUCCESS;
+}
+/* }}} */
+
 /*
  * Local variables:
  * tab-width: 4



-- 
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

2009-05-22 Thread Arnaud Le Blanc
lbarnaudFri May 22 11:23:22 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
  Log:
  BFN
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1517r2=1.2027.2.547.2.1518diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1517 php-src/NEWS:1.2027.2.547.2.1518
--- php-src/NEWS:1.2027.2.547.2.1517Thu May 21 16:05:10 2009
+++ php-src/NEWSFri May 22 11:23:21 2009
@@ -97,6 +97,8 @@
 - Fixed bug #47254 (Wrong Reflection for extends class). (Felipe)
 - Fixed bug #46882 (Serialize / Unserialize misbehaviour under OS with
   different bit numbers). (Matt)
+- Fixed bug #46812 (get_class_vars() does not include visible private variable
+  looking at subclass). (Arnaud)
 - Fixed bug #45997 (safe_mode bypass with exec/system/passthru (windows only)).
   (Pierre)
 - Fixed bug #45877 (Array key '2147483647' left as string). (Matt)



-- 
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/curl interface.c

2009-05-21 Thread Ilia Alshanetsky
iliaa   Thu May 21 12:53:24 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/curl   interface.c 
/php-srcNEWS 
  Log:
  
  MFB: Fixed bug #48207 (CURLOPT_(FILE|WRITEHEADER options do not error out
  when working with a non-writable stream)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.49r2=1.62.2.14.2.50diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.49 
php-src/ext/curl/interface.c:1.62.2.14.2.50
--- php-src/ext/curl/interface.c:1.62.2.14.2.49 Wed May 20 09:26:20 2009
+++ php-src/ext/curl/interface.cThu May 21 12:53:24 2009
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.62.2.14.2.49 2009/05/20 09:26:20 tony2001 Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.50 2009/05/21 12:53:24 iliaa Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -1436,12 +1436,24 @@
error = CURLE_OK;
switch (option) {
case CURLOPT_FILE:
-   ch-handlers-write-fp = fp;
-   ch-handlers-write-method = 
PHP_CURL_FILE;
+   if (((php_stream *) what)-mode[0] != 
'r') {
+   ch-handlers-write-fp = fp;
+   ch-handlers-write-method = 
PHP_CURL_FILE;
+   } else {
+   php_error_docref(NULL 
TSRMLS_CC, E_WARNING, the provided file handle is not writable);
+   RETVAL_FALSE;
+   return 1;
+   }
break;
case CURLOPT_WRITEHEADER:
-   ch-handlers-write_header-fp = fp;
-   ch-handlers-write_header-method = 
PHP_CURL_FILE;
+   if (((php_stream *) what)-mode[0] != 
'r') {
+   ch-handlers-write_header-fp 
= fp;
+   
ch-handlers-write_header-method = PHP_CURL_FILE;
+   } else {
+   php_error_docref(NULL 
TSRMLS_CC, E_WARNING, the provided file handle is not writable);
+   RETVAL_FALSE;
+   return 1;
+   }
break;
case CURLOPT_INFILE:
zend_list_addref(Z_LVAL_PP(zvalue));
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1515r2=1.2027.2.547.2.1516diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1515 php-src/NEWS:1.2027.2.547.2.1516
--- php-src/NEWS:1.2027.2.547.2.1515Wed May 20 09:06:31 2009
+++ php-src/NEWSThu May 21 12:53:24 2009
@@ -29,6 +29,8 @@
 - Fixed bug #48240 (DBA Segmentation fault dba_nextkey). (Felipe)
 - Fixed bug #48224 (Incorrect shuffle in array_rand). (Etienne)
 - Fixed bug #48221 (memory leak when passing invalid xslt parameter). (Felipe)
+- Fixed bug #48207 (CURLOPT_(FILE|WRITEHEADER options do not error out when   
+  working with a non-writable stream). (Ilia)
 - Fixed bug #48206 (Iterating over an invalid data structure
   with RecursiveIteratorIterator leads to a segfault). (Scott)
 - Fixed bug #48204 (xmlwriter_open_uri() does not emit warnings on invalid



-- 
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/reflection php_reflection.c /ext/reflection/tests bug48336.phpt

2009-05-21 Thread Arnaud Le Blanc
lbarnaudThu May 21 16:05:11 2009 UTC

  Added files: (Branch: PHP_5_2)
/php-src/ext/reflection/tests   bug48336.phpt 

  Modified files:  
/php-srcNEWS 
/php-src/ext/reflection php_reflection.c 
  Log:
  MFH: Fixed bug #48336 (ReflectionProperty::getDeclaringClass() does not 
  work with redeclared property) 
  (patch by Markus dot Lidel at shadowconnect dot com)
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1516r2=1.2027.2.547.2.1517diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1516 php-src/NEWS:1.2027.2.547.2.1517
--- php-src/NEWS:1.2027.2.547.2.1516Thu May 21 12:53:24 2009
+++ php-src/NEWSThu May 21 16:05:10 2009
@@ -16,6 +16,8 @@
 - Fixed segfault on invalid session.save_path. (Hannes)
 - Fixed leaks in imap when a mail_criteria is used. (Pierre)
 
+- Fixed bug #48336 (ReflectionProperty::getDeclaringClass() does not work with
+  redeclared property). (patch by Markus dot Lidel at shadowconnect dot com)
 - Fixed bug #48326 (constant MSG_DONTWAIT not defined). (Arnaud)
 - Fixed bug #48313 (fgetcsv() does not return null for empty rows). (Ilia)
 - Fixed bug #48309 (stream_copy_to_stream() and fpasstru() do not update stream
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/php_reflection.c?r1=1.164.2.33.2.56r2=1.164.2.33.2.57diff_format=u
Index: php-src/ext/reflection/php_reflection.c
diff -u php-src/ext/reflection/php_reflection.c:1.164.2.33.2.56 
php-src/ext/reflection/php_reflection.c:1.164.2.33.2.57
--- php-src/ext/reflection/php_reflection.c:1.164.2.33.2.56 Mon Apr 27 
19:54:34 2009
+++ php-src/ext/reflection/php_reflection.c Thu May 21 16:05:11 2009
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: php_reflection.c,v 1.164.2.33.2.56 2009/04/27 19:54:34 felipe Exp $ */
+/* $Id: php_reflection.c,v 1.164.2.33.2.57 2009/05/21 16:05:11 lbarnaud Exp $ 
*/
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -4126,6 +4126,10 @@
break;
}
ce = tmp_ce;
+   if (tmp_ce == tmp_info-ce) {
+   /* declared in this class, done */
+   break;
+   }
tmp_ce = tmp_ce-parent;
}
 
@@ -4948,7 +4952,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.56 2009/04/27 19:54:34 felipe Exp $);
+   php_info_print_table_row(2, Version, $Id: php_reflection.c,v 
1.164.2.33.2.57 2009/05/21 16:05:11 lbarnaud Exp $);
 
php_info_print_table_end();
 } /* }}} */

http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/bug48336.phpt?view=markuprev=1.1
Index: php-src/ext/reflection/tests/bug48336.phpt
+++ php-src/ext/reflection/tests/bug48336.phpt
--TEST--
Bug #48286 (ReflectionProperty::getDeclaringClass() does not work with 
redeclared properties)
--FILE--
?php
class A {
}

class B extends A {
  static protected $prop;
}

class C extends B {
  static protected $prop;
}

class D extends C {
}

class E extends D {
}

class F extends E {
  static protected $prop;
}

$class = 'A';
for($class = 'A'; $class = 'F'; $class ++) {
  print($class.' = ');
  try {
$rp = new ReflectionProperty($class, 'prop');
print($rp-getDeclaringClass()-getName());
  } catch(Exception $e) {
print('N/A');
  }
  print(\n);
}
?
--EXPECT--
A = N/A
B = B
C = C
D = C
E = C
F = F



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

2009-05-20 Thread Arnaud Le Blanc
lbarnaudWed May 20 09:06:32 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/socketssockets.c 
/php-srcNEWS 
  Log:
  MFH: Fixed bug #48326 (constant MSG_DONTWAIT not defined)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/sockets/sockets.c?r1=1.171.2.9.2.24r2=1.171.2.9.2.25diff_format=u
Index: php-src/ext/sockets/sockets.c
diff -u php-src/ext/sockets/sockets.c:1.171.2.9.2.24 
php-src/ext/sockets/sockets.c:1.171.2.9.2.25
--- php-src/ext/sockets/sockets.c:1.171.2.9.2.24Sun May 10 01:07:01 2009
+++ php-src/ext/sockets/sockets.c   Wed May 20 09:06:31 2009
@@ -19,7 +19,7 @@
+--+
  */
 
-/* $Id: sockets.c,v 1.171.2.9.2.24 2009/05/10 01:07:01 felipe Exp $ */
+/* $Id: sockets.c,v 1.171.2.9.2.25 2009/05/20 09:06:31 lbarnaud Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -484,6 +484,9 @@
REGISTER_LONG_CONSTANT(SOCK_RDM,  SOCK_RDM,   
CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(MSG_OOB,   MSG_OOB,
CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(MSG_WAITALL,   MSG_WAITALL,CONST_CS | 
CONST_PERSISTENT);
+#ifdef MSG_DONTWAIT
+   REGISTER_LONG_CONSTANT(MSG_DONTWAIT,  MSG_DONTWAIT,   CONST_CS | 
CONST_PERSISTENT);
+#endif
REGISTER_LONG_CONSTANT(MSG_PEEK,  MSG_PEEK,   
CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(MSG_DONTROUTE, MSG_DONTROUTE,  CONST_CS | 
CONST_PERSISTENT);
 #ifdef MSG_EOR
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1514r2=1.2027.2.547.2.1515diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1514 php-src/NEWS:1.2027.2.547.2.1515
--- php-src/NEWS:1.2027.2.547.2.1514Mon May 18 18:46:06 2009
+++ php-src/NEWSWed May 20 09:06:31 2009
@@ -16,6 +16,7 @@
 - Fixed segfault on invalid session.save_path. (Hannes)
 - Fixed leaks in imap when a mail_criteria is used. (Pierre)
 
+- Fixed bug #48326 (constant MSG_DONTWAIT not defined). (Arnaud)
 - Fixed bug #48313 (fgetcsv() does not return null for empty rows). (Ilia)
 - Fixed bug #48309 (stream_copy_to_stream() and fpasstru() do not update stream
   position of plain files). (Arnaud)



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

2009-05-19 Thread Antony Dovgal
On 18.05.2009 22:46, Ilia Alshanetsky wrote:
 iliaa Mon May 18 18:46:07 2009 UTC
 
   Modified files:  (Branch: PHP_5_2)
 /php-src/ext/standard file.c 
 /php-src  NEWS 
   Log:
   
   MFB: Fixed bug #48313 (fgetcsv() does not return null for empty rows)

All these tests started to fail:
/local/qa/5_2.zts/ext/standard/tests/file/fgetcsv.phpt
/local/qa/5_2.zts/ext/standard/tests/file/fgetcsv_variation1.phpt
/local/qa/5_2.zts/ext/standard/tests/file/fgetcsv_variation11.phpt
/local/qa/5_2.zts/ext/standard/tests/file/fgetcsv_variation14.phpt
/local/qa/5_2.zts/ext/standard/tests/file/fgetcsv_variation2.phpt
/local/qa/5_2.zts/ext/standard/tests/file/fgetcsv_variation21.phpt
/local/qa/5_2.zts/ext/standard/tests/file/fgetcsv_variation6.phpt
/local/qa/5_2.zts/ext/standard/tests/file/fgetcsv_variation7.phpt

-- 
Wbr, 
Antony Dovgal

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



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

2009-05-18 Thread Ilia Alshanetsky
iliaa   Mon May 18 18:46:07 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/standard   file.c 
/php-srcNEWS 
  Log:
  
  MFB: Fixed bug #48313 (fgetcsv() does not return null for empty rows)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/file.c?r1=1.409.2.6.2.41r2=1.409.2.6.2.42diff_format=u
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.409.2.6.2.41 
php-src/ext/standard/file.c:1.409.2.6.2.42
--- php-src/ext/standard/file.c:1.409.2.6.2.41  Fri May  8 09:49:27 2009
+++ php-src/ext/standard/file.c Mon May 18 18:46:06 2009
@@ -21,7 +21,7 @@
+--+
  */
 
-/* $Id: file.c,v 1.409.2.6.2.41 2009/05/08 09:49:27 lbarnaud Exp $ */
+/* $Id: file.c,v 1.409.2.6.2.42 2009/05/18 18:46:06 iliaa Exp $ */
 
 /* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
 
@@ -2384,8 +2384,12 @@
}
 
/* 3. Now pass our field back to php */
-   *comp_end = '\0';
-   add_next_index_stringl(return_value, temp, comp_end - temp, 1);
+   if (comp_end - temp) {
+   *comp_end = '\0';
+   add_next_index_stringl(return_value, temp, comp_end - 
temp, 1);
+   } else {
+   add_next_index_null(return_value);
+   }
} while (inc_len  0);
 
 out:
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1513r2=1.2027.2.547.2.1514diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1513 php-src/NEWS:1.2027.2.547.2.1514
--- php-src/NEWS:1.2027.2.547.2.1513Sun May 17 14:59:24 2009
+++ php-src/NEWSMon May 18 18:46:06 2009
@@ -16,6 +16,7 @@
 - Fixed segfault on invalid session.save_path. (Hannes)
 - Fixed leaks in imap when a mail_criteria is used. (Pierre)
 
+- Fixed bug #48313 (fgetcsv() does not return null for empty rows). (Ilia)
 - Fixed bug #48309 (stream_copy_to_stream() and fpasstru() do not update stream
   position of plain files). (Arnaud)
 - Fixed bug #48307 (stream_copy_to_stream() copies 0 bytes when $source is a 



-- 
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/tests/streams bug48309.phpt /main/streams mmap.c php_stream_mmap.h streams.c

2009-05-17 Thread Arnaud Le Blanc
lbarnaudSun May 17 14:59:24 2009 UTC

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

  Modified files:  
/php-srcNEWS 
/php-src/main/streams   mmap.c php_stream_mmap.h streams.c 
  Log:
  MFH: Fixed bug #48309 (stream_copy_to_stream() and fpasstru() do not 
  update stream position of plain files)
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1512r2=1.2027.2.547.2.1513diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1512 php-src/NEWS:1.2027.2.547.2.1513
--- php-src/NEWS:1.2027.2.547.2.1512Sat May 16 20:24:01 2009
+++ php-src/NEWSSun May 17 14:59:24 2009
@@ -16,6 +16,8 @@
 - Fixed segfault on invalid session.save_path. (Hannes)
 - Fixed leaks in imap when a mail_criteria is used. (Pierre)
 
+- Fixed bug #48309 (stream_copy_to_stream() and fpasstru() do not update stream
+  position of plain files). (Arnaud)
 - Fixed bug #48307 (stream_copy_to_stream() copies 0 bytes when $source is a 
   socket). (Arnaud)
 - Fixed bug #48256 (Crash due to double-linking of history.o).
http://cvs.php.net/viewvc.cgi/php-src/main/streams/mmap.c?r1=1.8.2.1.2.3r2=1.8.2.1.2.4diff_format=u
Index: php-src/main/streams/mmap.c
diff -u php-src/main/streams/mmap.c:1.8.2.1.2.3 
php-src/main/streams/mmap.c:1.8.2.1.2.4
--- php-src/main/streams/mmap.c:1.8.2.1.2.3 Wed Dec 31 11:17:48 2008
+++ php-src/main/streams/mmap.c Sun May 17 14:59:24 2009
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: mmap.c,v 1.8.2.1.2.3 2008/12/31 11:17:48 sebastian Exp $ */
+/* $Id: mmap.c,v 1.8.2.1.2.4 2009/05/17 14:59:24 lbarnaud Exp $ */
 
 /* Memory Mapping interface for streams */
 #include php.h
@@ -51,6 +51,20 @@
return php_stream_set_option(stream, PHP_STREAM_OPTION_MMAP_API, 
PHP_STREAM_MMAP_UNMAP, NULL) == PHP_STREAM_OPTION_RETURN_OK ? 1 : 0;
 }
 
+PHPAPI int _php_stream_mmap_unmap_ex(php_stream *stream, off_t readden 
TSRMLS_DC)
+{
+   int ret = 1;
+
+   if (php_stream_seek(stream, readden, SEEK_CUR) != 0) {
+   ret = 0;
+   }
+   if (php_stream_mmap_unmap(stream) == 0) {
+   ret = 0;
+   }
+
+   return ret;
+}
+
 /*
  * Local variables:
  * tab-width: 4
http://cvs.php.net/viewvc.cgi/php-src/main/streams/php_stream_mmap.h?r1=1.5.2.1.2.3r2=1.5.2.1.2.4diff_format=u
Index: php-src/main/streams/php_stream_mmap.h
diff -u php-src/main/streams/php_stream_mmap.h:1.5.2.1.2.3 
php-src/main/streams/php_stream_mmap.h:1.5.2.1.2.4
--- php-src/main/streams/php_stream_mmap.h:1.5.2.1.2.3  Wed Dec 31 11:17:48 2008
+++ php-src/main/streams/php_stream_mmap.h  Sun May 17 14:59:24 2009
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: php_stream_mmap.h,v 1.5.2.1.2.3 2008/12/31 11:17:48 sebastian Exp $ */
+/* $Id: php_stream_mmap.h,v 1.5.2.1.2.4 2009/05/17 14:59:24 lbarnaud Exp $ */
 
 /* Memory Mapping interface for streams.
  * The intention is to provide a uniform interface over the most common
@@ -58,6 +58,8 @@
 
 } php_stream_mmap_range;
 
+#define PHP_STREAM_MMAP_ALL 0
+
 #define php_stream_mmap_supported(stream)  
(_php_stream_set_option((stream), PHP_STREAM_OPTION_MMAP_API, 
PHP_STREAM_MMAP_SUPPORTED, NULL TSRMLS_CC) == 0 ? 1 : 0)
 
 /* Returns 1 if the stream in its current state can be memory mapped,
@@ -71,6 +73,9 @@
 /* un-maps the last mapped range */
 PHPAPI int _php_stream_mmap_unmap(php_stream *stream TSRMLS_DC);
 #define php_stream_mmap_unmap(stream)  
_php_stream_mmap_unmap((stream) TSRMLS_CC)
+
+PHPAPI int _php_stream_mmap_unmap_ex(php_stream *stream, off_t readden 
TSRMLS_DC);
+#define php_stream_mmap_unmap_ex(stream, readden)  
_php_stream_mmap_unmap_ex((stream), (readden) TSRMLS_CC)
 END_EXTERN_C()
 
 /*
http://cvs.php.net/viewvc.cgi/php-src/main/streams/streams.c?r1=1.82.2.6.2.37r2=1.82.2.6.2.38diff_format=u
Index: php-src/main/streams/streams.c
diff -u php-src/main/streams/streams.c:1.82.2.6.2.37 
php-src/main/streams/streams.c:1.82.2.6.2.38
--- php-src/main/streams/streams.c:1.82.2.6.2.37Sat May 16 20:24:01 2009
+++ php-src/main/streams/streams.c  Sun May 17 14:59:24 2009
@@ -19,7 +19,7 @@
+--+
  */
 
-/* $Id: streams.c,v 1.82.2.6.2.37 2009/05/16 20:24:01 lbarnaud Exp $ */
+/* $Id: streams.c,v 1.82.2.6.2.38 2009/05/17 14:59:24 lbarnaud Exp $ */
 
 #define _GNU_SOURCE
 #include php.h
@@ -1206,12 +1206,12 @@
char *p;
size_t mapped;
 
-   p = php_stream_mmap_range(stream, php_stream_tell(stream), 
PHP_STREAM_COPY_ALL, PHP_STREAM_MAP_MODE_SHARED_READONLY, mapped);
+   p = php_stream_mmap_range(stream, php_stream_tell(stream), 
PHP_STREAM_MMAP_ALL, PHP_STREAM_MAP_MODE_SHARED_READONLY, mapped);
 
if (p) {
  

[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/standard/tests/streams stream_copy_to_stream_socket.phpt /main/streams streams.c

2009-05-16 Thread Arnaud Le Blanc
lbarnaudSat May 16 20:24:02 2009 UTC

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

  Modified files:  
/php-src/main/streams   streams.c 
/php-srcNEWS 
  Log:
  MFH: Fixed bug #48307 (stream_copy_to_stream() copies 0 bytes when $source 
  is a socket)
  
  
http://cvs.php.net/viewvc.cgi/php-src/main/streams/streams.c?r1=1.82.2.6.2.36r2=1.82.2.6.2.37diff_format=u
Index: php-src/main/streams/streams.c
diff -u php-src/main/streams/streams.c:1.82.2.6.2.36 
php-src/main/streams/streams.c:1.82.2.6.2.37
--- php-src/main/streams/streams.c:1.82.2.6.2.36Sun Apr 19 17:10:52 2009
+++ php-src/main/streams/streams.c  Sat May 16 20:24:01 2009
@@ -19,7 +19,7 @@
+--+
  */
 
-/* $Id: streams.c,v 1.82.2.6.2.36 2009/04/19 17:10:52 lbarnaud Exp $ */
+/* $Id: streams.c,v 1.82.2.6.2.37 2009/05/16 20:24:01 lbarnaud Exp $ */
 
 #define _GNU_SOURCE
 #include php.h
@@ -1313,11 +1313,8 @@
 
if (php_stream_stat(src, ssbuf) == 0) {
if (ssbuf.sb.st_size == 0
-#ifdef S_ISFIFO
- !S_ISFIFO(ssbuf.sb.st_mode)
-#endif
-#ifdef S_ISCHR
- !S_ISCHR(ssbuf.sb.st_mode)
+#ifdef S_ISREG
+S_ISREG(ssbuf.sb.st_mode)
 #endif
) {
*len = 0;
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1511r2=1.2027.2.547.2.1512diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1511 php-src/NEWS:1.2027.2.547.2.1512
--- php-src/NEWS:1.2027.2.547.2.1511Fri May 15 17:18:18 2009
+++ php-src/NEWSSat May 16 20:24:01 2009
@@ -16,6 +16,8 @@
 - Fixed segfault on invalid session.save_path. (Hannes)
 - Fixed leaks in imap when a mail_criteria is used. (Pierre)
 
+- Fixed bug #48307 (stream_copy_to_stream() copies 0 bytes when $source is a 
+  socket). (Arnaud)
 - Fixed bug #48256 (Crash due to double-linking of history.o).
   (tstarling at wikimedia dot org)
 - Fixed bug #48248 (SIGSEGV when access to private property via __get). 

http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/streams/stream_copy_to_stream_socket.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/streams/stream_copy_to_stream_socket.phpt
+++ php-src/ext/standard/tests/streams/stream_copy_to_stream_socket.phpt
--TEST--
stream_copy_to_stream() with socket as $source
--SKIPIF--
?php
$sockets = @stream_socket_pair(STREAM_PF_UNIX, STREAM_SOCK_STREAM, 0);
if (!$sockets) die(skip stream_socket_pair);
?
--FILE--
?php

$sockets = stream_socket_pair(STREAM_PF_UNIX, STREAM_SOCK_STREAM, 0);
$tmp = tmpfile();

fwrite($sockets[0], ba);
stream_socket_shutdown($sockets[0], STREAM_SHUT_WR);
stream_copy_to_stream($sockets[1], $tmp);

fseek($tmp, 0, SEEK_SET);
var_dump(stream_get_contents($tmp));

stream_copy_to_stream($sockets[1], $tmp);

fseek($tmp, 0, SEEK_SET);
var_dump(stream_get_contents($tmp));


?
--EXPECT--
string(1) a
string(1) a



-- 
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

2009-05-15 Thread Moriyoshi Koizumi
moriyoshi   Fri May 15 17:06:36 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
  Log:
  - Not a news actually.
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1509r2=1.2027.2.547.2.1510diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1509 php-src/NEWS:1.2027.2.547.2.1510
--- php-src/NEWS:1.2027.2.547.2.1509Thu May 14 19:04:14 2009
+++ php-src/NEWSFri May 15 17:06:35 2009
@@ -3,6 +3,9 @@
 ?? ??? 2009, PHP 5.2.10
 - Updated timezone database to version 2009.7 (2009g) (Derick)
 
+- Reverted the default value of array_unique()'s sorting type flag parameter to
+  SORT_STRING for the sake of backwards compatibility. (Moriyoshi)
+
 - Added new CURL options CURLOPT_REDIR_PROTOCOLS, CURLOPT_PROTOCOLS,
   and CURLPROTO_* for redirect fixes in CURL 7.19.4. (Yoram Bar Haim, Stas)
 - Added support for Sun CC (FR #46595 and FR #46513). (David Soria Parra)



-- 
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

2009-05-15 Thread Jani Taskinen
janiFri May 15 17:18:18 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
  Log:
  - Reverted is such a strong word.. :)
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1510r2=1.2027.2.547.2.1511diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1510 php-src/NEWS:1.2027.2.547.2.1511
--- php-src/NEWS:1.2027.2.547.2.1510Fri May 15 17:06:35 2009
+++ php-src/NEWSFri May 15 17:18:18 2009
@@ -3,8 +3,9 @@
 ?? ??? 2009, PHP 5.2.10
 - Updated timezone database to version 2009.7 (2009g) (Derick)
 
-- Reverted the default value of array_unique()'s sorting type flag parameter to
-  SORT_STRING for the sake of backwards compatibility. (Moriyoshi)
+- Changed default value of array_unique()'s optional sorting type parameter
+  back to SORT_STRING to fix backwards compatibility breakage introduced in 
+  PHP 5.2.9. (Moriyoshi)
 
 - Added new CURL options CURLOPT_REDIR_PROTOCOLS, CURLOPT_PROTOCOLS,
   and CURLPROTO_* for redirect fixes in CURL 7.19.4. (Yoram Bar Haim, Stas)



-- 
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

2009-05-15 Thread Moriyoshi Koizumi
Just to let you guys know no intention to offend here.  I just used it
in the sense Jani had corrected it to be.

Moriyoshi

Jani Taskinen wrote:
 jani  Fri May 15 17:18:18 2009 UTC
 
   Modified files:  (Branch: PHP_5_2)
 /php-src  NEWS 
   Log:
   - Reverted is such a strong word.. :)
   
 http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1510r2=1.2027.2.547.2.1511diff_format=u
 Index: php-src/NEWS
 diff -u php-src/NEWS:1.2027.2.547.2.1510 php-src/NEWS:1.2027.2.547.2.1511
 --- php-src/NEWS:1.2027.2.547.2.1510  Fri May 15 17:06:35 2009
 +++ php-src/NEWS  Fri May 15 17:18:18 2009
 @@ -3,8 +3,9 @@
  ?? ??? 2009, PHP 5.2.10
  - Updated timezone database to version 2009.7 (2009g) (Derick)
  
 -- Reverted the default value of array_unique()'s sorting type flag parameter 
 to
 -  SORT_STRING for the sake of backwards compatibility. (Moriyoshi)
 +- Changed default value of array_unique()'s optional sorting type parameter
 +  back to SORT_STRING to fix backwards compatibility breakage introduced in 
 +  PHP 5.2.9. (Moriyoshi)
  
  - Added new CURL options CURLOPT_REDIR_PROTOCOLS, CURLOPT_PROTOCOLS,
and CURLPROTO_* for redirect fixes in CURL 7.19.4. (Yoram Bar Haim, Stas)
 
 
 


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

2009-05-14 Thread Jani Taskinen
janiThu May 14 13:43:53 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/readline   config.m4 
/php-srcNEWS 
  Log:
  MFH:- Fixed bug #48256 (Crash due to double-linking of history.o)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/readline/config.m4?r1=1.25.2.3r2=1.25.2.3.2.1diff_format=u
Index: php-src/ext/readline/config.m4
diff -u php-src/ext/readline/config.m4:1.25.2.3 
php-src/ext/readline/config.m4:1.25.2.3.2.1
--- php-src/ext/readline/config.m4:1.25.2.3 Mon Nov 28 23:04:01 2005
+++ php-src/ext/readline/config.m4  Thu May 14 13:43:52 2009
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.25.2.3 2005/11/28 23:04:01 sniper Exp $
+dnl $Id: config.m4,v 1.25.2.3.2.1 2009/05/14 13:43:52 jani Exp $
 dnl
 
 PHP_ARG_WITH(libedit,for libedit readline replacement, 
@@ -50,15 +50,6 @@
 -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS
   ])
 
-  PHP_CHECK_LIBRARY(history, add_history,
-  [
-PHP_ADD_LIBRARY_WITH_PATH(history, $READLINE_DIR/$PHP_LIBDIR, 
READLINE_SHARED_LIBADD)
-  ], [
-AC_MSG_ERROR(history library required by readline not found)
-  ], [
--L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS
-  ])
-
   AC_DEFINE(HAVE_LIBREADLINE, 1, [ ])
 
 elif test $PHP_LIBEDIT != no; then
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1506r2=1.2027.2.547.2.1507diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1506 php-src/NEWS:1.2027.2.547.2.1507
--- php-src/NEWS:1.2027.2.547.2.1506Thu May 14 01:31:50 2009
+++ php-src/NEWSThu May 14 13:43:52 2009
@@ -12,6 +12,8 @@
 - Fixed segfault on invalid session.save_path. (Hannes)
 - Fixed leaks in imap when a mail_criteria is used. (Pierre)
 
+- Fixed bug #48256 (Crash due to double-linking of history.o).
+  (tstarling at wikimedia dot org)
 - Fixed bug #48248 (SIGSEGV when access to private property via __get). 
   (Felipe)
 - Fixed bug #48240 (DBA Segmentation fault dba_nextkey). (Felipe)



-- 
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

2009-05-14 Thread Arnaud Le Blanc
lbarnaudThu May 14 16:24:13 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
  Log:
  moved from 5.3
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1507r2=1.2027.2.547.2.1508diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1507 php-src/NEWS:1.2027.2.547.2.1508
--- php-src/NEWS:1.2027.2.547.2.1507Thu May 14 13:43:52 2009
+++ php-src/NEWSThu May 14 16:24:12 2009
@@ -90,6 +90,7 @@
   (Derick, Mike Sullivan)
 - Fixed bug #45799 (imagepng() crashes on empty image). (Martin McNickle,
   Takeshi Abe)
+- Fixed bug #45540 (stream_context_create creates bad http request). (Arnaud)
 - Fixed bug #45191 (error_log ignores date.timezone php.ini val when
   setting logging timestamps). (Derick)
 - Fixed bug #45092 (header HTTP context option not being used when compiled
@@ -98,6 +99,8 @@
   (Ilia, kawai at apache dot org) 
 - Fixed bug #43073 (TrueType bounding box is wrong for angle0).
   (Martin McNickle)
+- Fixed bug #42663 (gzinflate() try to allocate all memory with truncated
+  data). (Arnaud)
 - Fixed bug #42414 (some odbc_*() functions incompatible with Oracle ODBC 
   driver). (jhml at gmx dot net)
 - Fixed bug #38805 (PDO truncates text from SQL Server text data type



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



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

2009-05-14 Thread Arnaud Le Blanc
lbarnaudThu May 14 19:04:15 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
  Log:
  moved from 5.3
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1508r2=1.2027.2.547.2.1509diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1508 php-src/NEWS:1.2027.2.547.2.1509
--- php-src/NEWS:1.2027.2.547.2.1508Thu May 14 16:24:12 2009
+++ php-src/NEWSThu May 14 19:04:14 2009
@@ -90,6 +90,10 @@
   (Derick, Mike Sullivan)
 - Fixed bug #45799 (imagepng() crashes on empty image). (Martin McNickle,
   Takeshi Abe)
+- Fixed bug #45622 (isset($arrayObject-p) misbehaves with ArrayObject::
+  ARRAY_AS_PROPS set). (robin_fernandes at uk dot ibm dot com, Arnaud)
+- Fixed bug #45614 (ArrayIterator::current(), ::key() can show 1st private
+  prop of wrapped object). (robin_fernandes at uk dot ibm dot com, Arnaud)
 - Fixed bug #45540 (stream_context_create creates bad http request). (Arnaud)
 - Fixed bug #45191 (error_log ignores date.timezone php.ini val when
   setting logging timestamps). (Derick)



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



[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/xmlrpc xmlrpc-epi-php.c

2009-05-13 Thread Ilia Alshanetsky
iliaa   Wed May 13 14:25:59 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/xmlrpc xmlrpc-epi-php.c 
/php-srcNEWS 
  Log:
  
  MFB: Fixed bug #44996 (xmlrpc_decode() ignores time zone on iso8601.datetime).
  
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlrpc/xmlrpc-epi-php.c?r1=1.39.2.5.2.14r2=1.39.2.5.2.15diff_format=u
Index: php-src/ext/xmlrpc/xmlrpc-epi-php.c
diff -u php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.39.2.5.2.14 
php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.39.2.5.2.15
--- php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.39.2.5.2.14   Thu Apr  2 15:55:01 2009
+++ php-src/ext/xmlrpc/xmlrpc-epi-php.c Wed May 13 14:25:58 2009
@@ -51,7 +51,7 @@
+--+
  */
 
-/* $Id: xmlrpc-epi-php.c,v 1.39.2.5.2.14 2009/04/02 15:55:01 felipe Exp $ */
+/* $Id: xmlrpc-epi-php.c,v 1.39.2.5.2.15 2009/05/13 14:25:58 iliaa Exp $ */
 
 /**
 * BUGS:   *
@@ -1300,7 +1300,7 @@
if(newtype == xmlrpc_datetime) {
XMLRPC_VALUE v = 
XMLRPC_CreateValueDateTime_ISO8601(NULL, value-value.str.val);
if(v) {
-   time_t timestamp = 
XMLRPC_GetValueDateTime(v);
+   time_t timestamp = (time_t) 
php_parse_date(XMLRPC_GetValueDateTime_ISO8601(v), NULL);
if(timestamp) {
zval* ztimestamp;
 
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1503r2=1.2027.2.547.2.1504diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1503 php-src/NEWS:1.2027.2.547.2.1504
--- php-src/NEWS:1.2027.2.547.2.1503Wed May 13 02:16:36 2009
+++ php-src/NEWSWed May 13 14:25:58 2009
@@ -91,6 +91,8 @@
   setting logging timestamps). (Derick)
 - Fixed bug #45092 (header HTTP context option not being used when compiled
   using --with-curlwrappers). (Jani)
+- Fixed bug #44996 (xmlrpc_decode() ignores time zone on iso8601.datetime).
+  (Ilia, kawai at apache dot org) 
 - Fixed bug #43073 (TrueType bounding box is wrong for angle0).
   (Martin McNickle)
 - Fixed bug #38805 (PDO truncates text from SQL Server text data type



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



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

2009-05-13 Thread Felipe Pena
felipe  Thu May 14 01:31:51 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
  Log:
  BFN
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1505r2=1.2027.2.547.2.1506diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1505 php-src/NEWS:1.2027.2.547.2.1506
--- php-src/NEWS:1.2027.2.547.2.1505Thu May 14 01:28:14 2009
+++ php-src/NEWSThu May 14 01:31:50 2009
@@ -96,6 +96,8 @@
   (Ilia, kawai at apache dot org) 
 - Fixed bug #43073 (TrueType bounding box is wrong for angle0).
   (Martin McNickle)
+- Fixed bug #42414 (some odbc_*() functions incompatible with Oracle ODBC 
+  driver). (jhml at gmx dot net)
 - Fixed bug #38805 (PDO truncates text from SQL Server text data type
   field). (Steph)
 



-- 
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 pack.c /ext/standard/tests/strings bug38770.phpt

2009-05-12 Thread Ilia Alshanetsky
iliaa   Tue May 12 12:35:45 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/standard/tests/strings bug38770.phpt 
/php-src/ext/standard   pack.c 
/php-srcNEWS 
  Log:
  
  MFB: Fixed bug #47564 (unpacking unsigned long 32bit bit endian returns
  wrong result)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/bug38770.phpt?r1=1.1.2.1r2=1.1.2.2diff_format=u
Index: php-src/ext/standard/tests/strings/bug38770.phpt
diff -u php-src/ext/standard/tests/strings/bug38770.phpt:1.1.2.1 
php-src/ext/standard/tests/strings/bug38770.phpt:1.1.2.2
--- php-src/ext/standard/tests/strings/bug38770.phpt:1.1.2.1Sun Nov 19 
18:20:48 2006
+++ php-src/ext/standard/tests/strings/bug38770.phptTue May 12 12:35:45 2009
@@ -12,7 +12,7 @@
 --EXPECT-- 
 Array
 (
-[1] = -3
+[1] = 4294937296
 )
 Array
 (
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/pack.c?r1=1.57.2.5.2.8r2=1.57.2.5.2.9diff_format=u
Index: php-src/ext/standard/pack.c
diff -u php-src/ext/standard/pack.c:1.57.2.5.2.8 
php-src/ext/standard/pack.c:1.57.2.5.2.9
--- php-src/ext/standard/pack.c:1.57.2.5.2.8Wed Dec 31 11:17:45 2008
+++ php-src/ext/standard/pack.c Tue May 12 12:35:45 2009
@@ -15,7 +15,7 @@
| Author: Chris Schneider cschn...@relog.ch  |
+--+
  */
-/* $Id: pack.c,v 1.57.2.5.2.8 2008/12/31 11:17:45 sebastian Exp $ */
+/* $Id: pack.c,v 1.57.2.5.2.9 2009/05/12 12:35:45 iliaa Exp $ */
 
 #include php.h
 
@@ -799,6 +799,13 @@
}
 
v |= 
php_unpack(input[inputpos], 4, issigned, map);
+   if (sizeof(long)  4) {
+   if (type == 'l') {
+   v = (signed 
int) v; 
+   } else {
+   v = (unsigned 
int) v;
+   }
+   }
add_assoc_long(return_value, n, 
v);
break;
}
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1498r2=1.2027.2.547.2.1499diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1498 php-src/NEWS:1.2027.2.547.2.1499
--- php-src/NEWS:1.2027.2.547.2.1498Mon May 11 12:35:00 2009
+++ php-src/NEWSTue May 12 12:35:45 2009
@@ -62,6 +62,8 @@
   literal). (Ilia)
 - Fixed bug #47616 (curl keeps crashing). (Felipe)
 - Fixed bug #47598 (FILTER_VALIDATE_EMAIL is locale aware). (Ilia)
+- Fixed bug #47564 (unpacking unsigned long 32bit bit endian returns wrong
+  result). (Ilia)
 - Fixed bug #47487 (performance degraded when reading large chunks after fix of
   bug #44607). (Arnaud)
 - Fixed bug #47468 (enable cli|cgi-only extensions for embed sapi). (Jani)



-- 
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/pdo_oci oci_driver.c oci_statement.c /ext/pdo_oci/tests bug44301.phpt

2009-05-12 Thread Matteo Beccati
mbeccatiTue May 12 21:57:42 2009 UTC

  Added files: (Branch: PHP_5_2)
/php-src/ext/pdo_oci/tests  bug44301.phpt 

  Modified files:  
/php-srcNEWS 
/php-src/ext/pdo_ocioci_driver.c oci_statement.c 
  Log:
  MFH
  - Backported fix for #44301
  - Fixed bug #48070
  # The backport was required to also fix #48070
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1499r2=1.2027.2.547.2.1500diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1499 php-src/NEWS:1.2027.2.547.2.1500
--- php-src/NEWS:1.2027.2.547.2.1499Tue May 12 12:35:45 2009
+++ php-src/NEWSTue May 12 21:57:40 2009
@@ -23,6 +23,8 @@
   bindto). (Ilia)
 - Fixed bug #48132 (configure check for curl ssl support fails with
   --disable-rpath). (Jani)
+- Fixed bug #48070 (PDO_OCI: Segfault when using persistent connection).
+  (Pierre, Matteo)
 - Fixed bug #48058 (Year formatter goes wrong with out-of-int range). (Derick)
 - Fixed bug #48038 (odbc_execute changes variables used to form params array).
   (Felipe)
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_oci/oci_driver.c?r1=1.24.2.4.2.11r2=1.24.2.4.2.12diff_format=u
Index: php-src/ext/pdo_oci/oci_driver.c
diff -u php-src/ext/pdo_oci/oci_driver.c:1.24.2.4.2.11 
php-src/ext/pdo_oci/oci_driver.c:1.24.2.4.2.12
--- php-src/ext/pdo_oci/oci_driver.c:1.24.2.4.2.11  Wed Dec 31 11:17:42 2008
+++ php-src/ext/pdo_oci/oci_driver.cTue May 12 21:57:40 2009
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: oci_driver.c,v 1.24.2.4.2.11 2008/12/31 11:17:42 sebastian Exp $ */
+/* $Id: oci_driver.c,v 1.24.2.4.2.12 2009/05/12 21:57:40 mbeccati Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -70,15 +70,13 @@
S = (pdo_oci_stmt*)stmt-driver_data;
einfo = S-einfo;
pdo_err = stmt-error_code;
-   if (einfo-errmsg) {
-   efree(einfo-errmsg);
-   }
}
else {
einfo = H-einfo;
-   if (einfo-errmsg) {
-   pefree(einfo-errmsg, dbh-is_persistent);
-   }
+   }
+
+   if (einfo-errmsg) {
+   pefree(einfo-errmsg, dbh-is_persistent);
}
 
einfo-errmsg = NULL;
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_oci/oci_statement.c?r1=1.16.2.10.2.9r2=1.16.2.10.2.10diff_format=u
Index: php-src/ext/pdo_oci/oci_statement.c
diff -u php-src/ext/pdo_oci/oci_statement.c:1.16.2.10.2.9 
php-src/ext/pdo_oci/oci_statement.c:1.16.2.10.2.10
--- php-src/ext/pdo_oci/oci_statement.c:1.16.2.10.2.9   Wed Dec 31 11:17:42 2008
+++ php-src/ext/pdo_oci/oci_statement.c Tue May 12 21:57:41 2009
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: oci_statement.c,v 1.16.2.10.2.9 2008/12/31 11:17:42 sebastian Exp $ */
+/* $Id: oci_statement.c,v 1.16.2.10.2.10 2009/05/12 21:57:41 mbeccati Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -87,7 +87,7 @@
}
 
if (S-einfo.errmsg) {
-   efree(S-einfo.errmsg);
+   pefree(S-einfo.errmsg, stmt-dbh-is_persistent);
S-einfo.errmsg = NULL;
}
 

http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_oci/tests/bug44301.phpt?view=markuprev=1.1
Index: php-src/ext/pdo_oci/tests/bug44301.phpt
+++ php-src/ext/pdo_oci/tests/bug44301.phpt
--TEST--
PDO OCI Bug #44301 (Segfault when an exception is thrown on persistent 
connections)
--SKIPIF--
?php
if (!extension_loaded('pdo') || !extension_loaded('pdo_oci')) die('skip not 
loaded');
require dirname(__FILE__).'/../../pdo/tests/pdo_test.inc';
PDOTest::skip();
?
--FILE--
?php
putenv(PDO_OCI_TEST_ATTR= . serialize(array(PDO::ATTR_PERSISTENT = true)));
require 'ext/pdo/tests/pdo_test.inc';
$db = PDOTest::test_factory('ext/pdo_oci/tests/common.phpt');
$db-setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);

try {
$stmt = $db-prepare('SELECT * FROM no_table');
$stmt-execute();
} catch (PDOException $e) {
print $e-getMessage();
}
$db = null;
--EXPECTF--
SQLSTATE[HY000]: General error: 942 OCIStmtExecute: ORA-00942: table or view 
does not exist
 (%s/ext/pdo_oci/oci_statement.c:%d)



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



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

2009-05-12 Thread Matteo Beccati
mbeccatiTue May 12 22:01:57 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
  Log:
  Added proper credits for the last commit
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1500r2=1.2027.2.547.2.1501diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1500 php-src/NEWS:1.2027.2.547.2.1501
--- php-src/NEWS:1.2027.2.547.2.1500Tue May 12 21:57:40 2009
+++ php-src/NEWSTue May 12 22:01:55 2009
@@ -24,7 +24,7 @@
 - Fixed bug #48132 (configure check for curl ssl support fails with
   --disable-rpath). (Jani)
 - Fixed bug #48070 (PDO_OCI: Segfault when using persistent connection).
-  (Pierre, Matteo)
+  (Pierre, Matteo, jarismar dot php at gmail dot com)
 - Fixed bug #48058 (Year formatter goes wrong with out-of-int range). (Derick)
 - Fixed bug #48038 (odbc_execute changes variables used to form params array).
   (Felipe)



-- 
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/dba dba_db4.c /ext/dba/tests bug48240.phpt

2009-05-12 Thread Felipe Pena
felipe  Wed May 13 02:16:37 2009 UTC

  Added files: (Branch: PHP_5_2)
/php-src/ext/dba/tests  bug48240.phpt 

  Modified files:  
/php-srcNEWS 
/php-src/ext/dbadba_db4.c 
  Log:
  - MFH: Fixed bug #48240 (DBA Segmentation fault dba_nextkey)
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1502r2=1.2027.2.547.2.1503diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1502 php-src/NEWS:1.2027.2.547.2.1503
--- php-src/NEWS:1.2027.2.547.2.1502Tue May 12 23:01:37 2009
+++ php-src/NEWSWed May 13 02:16:36 2009
@@ -14,6 +14,7 @@
 
 - Fixed bug #48248 (SIGSEGV when access to private property via __get). 
   (Felipe)
+- Fixed bug #48240 (DBA Segmentation fault dba_nextkey). (Felipe)
 - Fixed bug #48224 (Incorrect shuffle in array_rand). (Etienne)
 - Fixed bug #48221 (memory leak when passing invalid xslt parameter). (Felipe)
 - Fixed bug #48206 (Iterating over an invalid data structure
http://cvs.php.net/viewvc.cgi/php-src/ext/dba/dba_db4.c?r1=1.15.2.3.2.4r2=1.15.2.3.2.5diff_format=u
Index: php-src/ext/dba/dba_db4.c
diff -u php-src/ext/dba/dba_db4.c:1.15.2.3.2.4 
php-src/ext/dba/dba_db4.c:1.15.2.3.2.5
--- php-src/ext/dba/dba_db4.c:1.15.2.3.2.4  Wed Dec 31 11:17:36 2008
+++ php-src/ext/dba/dba_db4.c   Wed May 13 02:16:36 2009
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: dba_db4.c,v 1.15.2.3.2.4 2008/12/31 11:17:36 sebastian Exp $ */
+/* $Id: dba_db4.c,v 1.15.2.3.2.5 2009/05/13 02:16:36 felipe Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -219,7 +219,7 @@
gkey.flags |= DB_DBT_MALLOC;
gval.flags |= DB_DBT_MALLOC;
}
-   if (dba-cursor-c_get(dba-cursor, gkey, gval, DB_NEXT) == 0) {
+   if (dba-cursor  dba-cursor-c_get(dba-cursor, gkey, gval, 
DB_NEXT) == 0) {
if (gkey.data) {
nkey = estrndup(gkey.data, gkey.size);
if (newlen) *newlen = gkey.size;

http://cvs.php.net/viewvc.cgi/php-src/ext/dba/tests/bug48240.phpt?view=markuprev=1.1
Index: php-src/ext/dba/tests/bug48240.phpt
+++ php-src/ext/dba/tests/bug48240.phpt
--TEST--
Bug #48240 (DBA Segmentation fault dba_nextkey)
--SKIPIF--
?php 
$handler = 'db4';
require_once('skipif.inc');
?
--FILE--
?php

$handler = 'db4';
require_once('test.inc');

$db = dba_open($db_filename, 'c', 'db4');

var_dump(dba_nextkey($db));

dba_close($db);
unlink($db_filename);

?
===DONE===
--EXPECT--
bool(false)
===DONE===



-- 
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/xmlwriter php_xmlwriter.c

2009-05-11 Thread Ilia Alshanetsky
iliaa   Mon May 11 12:35:05 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/xmlwriter  php_xmlwriter.c 
/php-srcNEWS 
  Log:
  MFB: Fixed bug #48204 (xmlwriter_open_uri() does not emit warnings on invalid 
 
paths)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlwriter/php_xmlwriter.c?r1=1.20.2.12.2.20r2=1.20.2.12.2.21diff_format=u
Index: php-src/ext/xmlwriter/php_xmlwriter.c
diff -u php-src/ext/xmlwriter/php_xmlwriter.c:1.20.2.12.2.20 
php-src/ext/xmlwriter/php_xmlwriter.c:1.20.2.12.2.21
--- php-src/ext/xmlwriter/php_xmlwriter.c:1.20.2.12.2.20Wed Dec 31 
11:17:47 2008
+++ php-src/ext/xmlwriter/php_xmlwriter.c   Mon May 11 12:35:00 2009
@@ -17,7 +17,7 @@
   +--+
 */
 
-/* $Id: php_xmlwriter.c,v 1.20.2.12.2.20 2008/12/31 11:17:47 sebastian Exp $ */
+/* $Id: php_xmlwriter.c,v 1.20.2.12.2.21 2009/05/11 12:35:00 iliaa Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -1451,6 +1451,7 @@
 
valid_file = _xmlwriter_get_valid_file_path(source, resolved_path, 
MAXPATHLEN TSRMLS_CC);
if (!valid_file) {
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, Unable to resolve 
file path);
RETURN_FALSE;
}
 
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1497r2=1.2027.2.547.2.1498diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1497 php-src/NEWS:1.2027.2.547.2.1498
--- php-src/NEWS:1.2027.2.547.2.1497Sun May 10 16:45:01 2009
+++ php-src/NEWSMon May 11 12:35:00 2009
@@ -16,6 +16,8 @@
 - Fixed bug #48221 (memory leak when passing invalid xslt parameter). (Felipe)
 - Fixed bug #48206 (Iterating over an invalid data structure
   with RecursiveIteratorIterator leads to a segfault). (Scott)
+- Fixed bug #48204 (xmlwriter_open_uri() does not emit warnings on invalid
+  paths). (Ilia)
 - Fixed bug #48156 (Added support for lcov v1.7). (Ilia)
 - Fixed bug #48131 (Don't try to bind ipv4 addresses to ipv6 ips via
   bindto). (Ilia)



-- 
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

2009-05-10 Thread Ilia Alshanetsky
iliaa   Sun May 10 13:44:14 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
  Log:
  
  WS
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1494r2=1.2027.2.547.2.1495diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1494 php-src/NEWS:1.2027.2.547.2.1495
--- php-src/NEWS:1.2027.2.547.2.1494Sat May  9 20:42:56 2009
+++ php-src/NEWSSun May 10 13:44:13 2009
@@ -60,7 +60,7 @@
 - Fixed bug #47598 (FILTER_VALIDATE_EMAIL is locale aware). (Ilia)
 - Fixed bug #47487 (performance degraded when reading large chunks after fix of
   bug #44607). (Arnaud)
-- Fixed bug #47468 (enable cli|cgi-only extensions  for embed sapi). (Jani)
+- Fixed bug #47468 (enable cli|cgi-only extensions for embed sapi). (Jani)
 - Fixed bug #47365 (ip2long() may allow some invalid values on certain 64bit  
   systems). (Ilia)
 - Fixed bug #47435 (FILTER_FLAG_NO_PRIV_RANGE does not work with ipv6



-- 
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/xsl xsltprocessor.c /ext/xsl/tests bug48221.phpt

2009-05-10 Thread Felipe Pena
felipe  Sun May 10 15:15:48 2009 UTC

  Added files: (Branch: PHP_5_2)
/php-src/ext/xsl/tests  bug48221.phpt 

  Modified files:  
/php-srcNEWS 
/php-src/ext/xslxsltprocessor.c 
  Log:
  - MFH: Fixed bug #48221 (memory leak when passing invalid xslt parameter)
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1495r2=1.2027.2.547.2.1496diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1495 php-src/NEWS:1.2027.2.547.2.1496
--- php-src/NEWS:1.2027.2.547.2.1495Sun May 10 13:44:13 2009
+++ php-src/NEWSSun May 10 15:15:47 2009
@@ -12,6 +12,7 @@
 - Fixed segfault on invalid session.save_path. (Hannes)
 - Fixed leaks in imap when a mail_criteria is used. (Pierre)
 
+- Fixed bug #48221 (memory leak when passing invalid xslt parameter). (Felipe)
 - Fixed bug #48206 (Iterating over an invalid data structure
   with RecursiveIteratorIterator leads to a segfault). (Scott)
 - Fixed bug #48156 (Added support for lcov v1.7). (Ilia)
http://cvs.php.net/viewvc.cgi/php-src/ext/xsl/xsltprocessor.c?r1=1.39.2.2.2.16r2=1.39.2.2.2.17diff_format=u
Index: php-src/ext/xsl/xsltprocessor.c
diff -u php-src/ext/xsl/xsltprocessor.c:1.39.2.2.2.16 
php-src/ext/xsl/xsltprocessor.c:1.39.2.2.2.17
--- php-src/ext/xsl/xsltprocessor.c:1.39.2.2.2.16   Wed Dec 31 11:17:47 2008
+++ php-src/ext/xsl/xsltprocessor.c Sun May 10 15:15:47 2009
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: xsltprocessor.c,v 1.39.2.2.2.16 2008/12/31 11:17:47 sebastian Exp $ */
+/* $Id: xsltprocessor.c,v 1.39.2.2.2.17 2009/05/10 15:15:47 felipe Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -157,11 +157,13 @@
if (!xpath_params) {
xpath_expr = 
php_xsl_xslt_string_to_xpathexpr(Z_STRVAL_PP(value) TSRMLS_CC);
} else {
-   xpath_expr = estrndup(Z_STRVAL_PP(value), 
strlen(Z_STRVAL_PP(value)));
+   xpath_expr = estrndup(Z_STRVAL_PP(value), 
Z_STRLEN_PP(value));
}
if (xpath_expr) {
params[i++] = string_key;
params[i++] = xpath_expr;
+   } else {
+   efree(string_key);
}
}
}

http://cvs.php.net/viewvc.cgi/php-src/ext/xsl/tests/bug48221.phpt?view=markuprev=1.1
Index: php-src/ext/xsl/tests/bug48221.phpt
+++ php-src/ext/xsl/tests/bug48221.phpt
--TEST--
Bug #48221 (memory leak when passing invalid xslt parameter)
--SKIPIF--
?php
if (!extension_loaded('xsl')) die(skip Extension XSL is required\n);
?
--FILE--
?php

$xsl = new DOMDocument;
$xsl-loadXML('html xsl:version=1.0
  xmlns:xsl=http://www.w3.org/1999/XSL/Transform;
  lang=en
head
titleSales Results By Division/title
/head
body
table border=1
tr
thDivision/th
thRevenue/th
thGrowth/th
thBonus/th
/tr
xsl:for-each select=sales/division
!-- order the result by revenue --
xsl:sort select=revenue
  data-type=number
  order=descending/
tr
td
emxsl:value-of select=@id//em
/td
td
xsl:value-of select=revenue/
/td
td
!-- highlight negative growth in red --
xsl:if test=growth lt; 0
 xsl:attribute name=style
 xsl:textcolor:red/xsl:text
 /xsl:attribute
/xsl:if
xsl:value-of select=growth/
/td
td
xsl:value-of select=bonus/
/td
/tr
/xsl:for-each
/table
/body
/html');

$dom = new DOMDocument;
$dom-loadXMl('sales

division id=North
revenue10/revenue
growth9/growth
bonus7/bonus
/division

division id=South
revenue4/revenue
growth3/growth
bonus4/bonus
/division

division id=West
revenue6/revenue
growth-1.5/growth
bonus2/bonus
/division

/sales');

$proc = new xsltprocessor;
$proc-importStylesheet($xsl);
$proc-setParameter('', '', '\'');
$proc-transformToXml($dom);

?
--EXPECTF--
Warning: XSLTProcessor::transformToXml(): Cannot create XPath expression 
(string contains both quote and double-quotes) in %s on line %d



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

[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/standard array.c

2009-05-10 Thread Etienne Kneuss
colder  Sun May 10 16:45:03 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
/php-src/ext/standard   array.c 
  Log:
  Fix #48224 (Remove incorrect shuffle)
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1496r2=1.2027.2.547.2.1497diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1496 php-src/NEWS:1.2027.2.547.2.1497
--- php-src/NEWS:1.2027.2.547.2.1496Sun May 10 15:15:47 2009
+++ php-src/NEWSSun May 10 16:45:01 2009
@@ -12,6 +12,7 @@
 - Fixed segfault on invalid session.save_path. (Hannes)
 - Fixed leaks in imap when a mail_criteria is used. (Pierre)
 
+- Fixed bug #48224 (Incorrect shuffle in array_rand). (Etienne)
 - Fixed bug #48221 (memory leak when passing invalid xslt parameter). (Felipe)
 - Fixed bug #48206 (Iterating over an invalid data structure
   with RecursiveIteratorIterator leads to a segfault). (Scott)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/array.c?r1=1.308.2.21.2.65r2=1.308.2.21.2.66diff_format=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.308.2.21.2.65 
php-src/ext/standard/array.c:1.308.2.21.2.66
--- php-src/ext/standard/array.c:1.308.2.21.2.65Fri Feb 13 22:26:46 2009
+++ php-src/ext/standard/array.cSun May 10 16:45:01 2009
@@ -21,7 +21,7 @@
+--+
 */
 
-/* $Id: array.c,v 1.308.2.21.2.65 2009/02/13 22:26:46 andrei Exp $ */
+/* $Id: array.c,v 1.308.2.21.2.66 2009/05/10 16:45:01 colder Exp $ */
 
 #include php.h
 #include php_ini.h
@@ -4204,10 +4204,6 @@
num_avail--;
zend_hash_move_forward_ex(Z_ARRVAL_PP(input), pos);
}
-
-   if (num_req_val == num_avail) {
-   array_data_shuffle(return_value TSRMLS_CC);
-   }
 }
 /* }}} */
 



-- 
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 acinclude.m4

2009-05-09 Thread Jani Taskinen
janiSat May  9 20:28:04 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcacinclude.m4 NEWS 
  Log:
  MFH: sync + - Fixed bug #47468 (enable cli|cgi-only extensions  for embed 
sapi)
  
http://cvs.php.net/viewvc.cgi/php-src/acinclude.m4?r1=1.332.2.14.2.28r2=1.332.2.14.2.29diff_format=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.332.2.14.2.28 
php-src/acinclude.m4:1.332.2.14.2.29
--- php-src/acinclude.m4:1.332.2.14.2.28Mon Sep  8 10:24:38 2008
+++ php-src/acinclude.m4Sat May  9 20:28:02 2009
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.332.2.14.2.28 2008/09/08 10:24:38 tony2001 Exp $
+dnl $Id: acinclude.m4,v 1.332.2.14.2.29 2009/05/09 20:28:02 jani Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -920,7 +920,7 @@
 ])
 
 dnl
-dnl PHP_NEW_EXTENSION(extname, sources [, shared [,sapi_class[, extra-cflags[, 
cxx[, zend_ext])
+dnl PHP_NEW_EXTENSION(extname, sources [, shared [, sapi_class [, extra-cflags 
[, cxx [, zend_ext])
 dnl
 dnl Includes an extension in the build.
 dnl
@@ -968,12 +968,15 @@
   if test $3 != shared  test $3 != yes  test $4 = cli; then
 dnl -- CLI static module
 [PHP_]translit($1,a-z_-,A-Z__)[_SHARED]=no
-if test $PHP_SAPI = cgi; then
-  PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,)
-  EXT_STATIC=$EXT_STATIC $1
-else
-  PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,cli)
-fi
+case $PHP_SAPI in
+  cgi|embed[)]
+PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,)
+EXT_STATIC=$EXT_STATIC $1
+;;
+  *[)]
+PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,cli)
+;;
+esac
 EXT_CLI_STATIC=$EXT_CLI_STATIC $1
   fi
   PHP_ADD_BUILD_DIR($ext_builddir)
@@ -2766,6 +2769,23 @@
   )
 ])
 
+dnl PHP_DETECT_SUNCC
+dnl Detect if the systems default compiler is suncc.
+dnl We also set some usefull CFLAGS if the user didn't set any
+AC_DEFUN([PHP_DETECT_SUNCC],[
+  SUNCC=no
+  AC_MSG_CHECKING([for suncc])
+  AC_EGREP_CPP([^__SUNPRO_C], [__SUNPRO_C],
+SUNCC=no
+AC_MSG_RESULT([no]),
+SUNCC=yes
+GCC=no
+test -n $auto_cflags  CFLAGS=-fsimple=2 -xnorunpath -xO4 
-xalias_level=basic -xipo=1 -xlibmopt -xprefetch_level=1 -xprefetch=auto 
-xstrconst -xtarget=native -zlazyload
+GCC=
+AC_MSG_RESULT([yes])
+  )
+])
+
 dnl
 dnl PHP_CRYPT_R_STYLE
 dnl detect the style of crypt_r() is any is available
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1491r2=1.2027.2.547.2.1492diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1491 php-src/NEWS:1.2027.2.547.2.1492
--- php-src/NEWS:1.2027.2.547.2.1491Thu May  7 13:45:47 2009
+++ php-src/NEWSSat May  9 20:28:03 2009
@@ -12,7 +12,6 @@
 - Fixed leaks in imap when a mail_criteria is used. (Pierre)
 
 - Fixed bug #48156 (Added support for lcov v1.7). (Ilia)
-
 - Fixed bug #48131 (Don't try to bind ipv4 addresses to ipv6 ips via
   bindto). (Ilia)
 - Fixed bug #48132 (configure check for curl ssl support fails with
@@ -58,6 +57,7 @@
 - Fixed bug #47598 (FILTER_VALIDATE_EMAIL is locale aware). (Ilia)
 - Fixed bug #47487 (performance degraded when reading large chunks after fix of
   bug #44607). (Arnaud)
+- Fixed bug #47468 (enable cli|cgi-only extensions  for embed sapi). (Jani)
 - Fixed bug #47365 (ip2long() may allow some invalid values on certain 64bit  
   systems). (Ilia)
 - Fixed bug #47435 (FILTER_FLAG_NO_PRIV_RANGE does not work with ipv6



-- 
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 configure.in /scripts phpize.m4

2009-05-09 Thread Jani Taskinen
janiSat May  9 20:36:35 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS configure.in 
/php-src/scriptsphpize.m4 
  Log:
  MFH: Add support for Sun CC
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1492r2=1.2027.2.547.2.1493diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1492 php-src/NEWS:1.2027.2.547.2.1493
--- php-src/NEWS:1.2027.2.547.2.1492Sat May  9 20:28:03 2009
+++ php-src/NEWSSat May  9 20:36:34 2009
@@ -5,6 +5,7 @@
 
 - Added new CURL options CURLOPT_REDIR_PROTOCOLS, CURLOPT_PROTOCOLS,
   and CURLPROTO_* for redirect fixes in CURL 7.19.4. (Yoram Bar Haim, Stas)
+- Added support for Sun CC (FR #46595 and FR #46513). (David Soria Parra)
 
 - Fixed memory corruptions while reading properties of zip files. (Ilia)
 - Fixed memory leak in ob_get_clean/ob_get_flush. (Christian)
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.133r2=1.579.2.52.2.134diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.579.2.52.2.133 
php-src/configure.in:1.579.2.52.2.134
--- php-src/configure.in:1.579.2.52.2.133   Wed May  6 14:05:54 2009
+++ php-src/configure.inSat May  9 20:36:35 2009
@@ -1,4 +1,4 @@
-## $Id: configure.in,v 1.579.2.52.2.133 2009/05/06 14:05:54 iliaa Exp $ -*- 
autoconf -*-
+## $Id: configure.in,v 1.579.2.52.2.134 2009/05/09 20:36:35 jani Exp $ -*- 
autoconf -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -140,8 +140,9 @@
 dnl Checks for programs.
 dnl -
 
-AC_PROG_CC
+AC_PROG_CC([cc gcc])
 PHP_DETECT_ICC
+PHP_DETECT_SUNCC
 AC_PROG_CC_C_O
 dnl Change to AC_PROG_CC_STDC when we start requiring a post-2.13 autoconf
 dnl AC_PROG_CC_STDC
@@ -187,6 +188,10 @@
   CFLAGS=$CFLAGS -ieee
 fi
 ;;
+  sparc*)
+if test $SUNCC = yes; then
+  CFLAGS=$CFLAGS -xmemalign=8s
+fi
 esac
 
 case $host_alias in
@@ -731,6 +736,15 @@
   dnl Add the special gcc flags
   CFLAGS=$CFLAGS -O0 -fprofile-arcs -ftest-coverage
   CXXFLAGS=$CXXFLAGS -O0 -fprofile-arcs -ftest-coverage
+  if test $SUNCC = yes; then
+if test -n $auto_cflags; then
+  CFLAGS=-g
+  CXXFLAGS=-g
+else
+  CFLAGS=$CFLAGS -g
+  CXXFLAGS=$CFLAGS -g
+fi
+  fi
 fi
 
 PHP_ARG_ENABLE(debug, whether to include debugging symbols,
http://cvs.php.net/viewvc.cgi/php-src/scripts/phpize.m4?r1=1.17.2.3.2.9r2=1.17.2.3.2.10diff_format=u
Index: php-src/scripts/phpize.m4
diff -u php-src/scripts/phpize.m4:1.17.2.3.2.9 
php-src/scripts/phpize.m4:1.17.2.3.2.10
--- php-src/scripts/phpize.m4:1.17.2.3.2.9  Thu Jul 31 00:45:46 2008
+++ php-src/scripts/phpize.m4   Sat May  9 20:36:35 2009
@@ -17,11 +17,15 @@
   test [$]$1 = no  $1=yes
 ])dnl
 dnl
+
+test -z $CFLAGS  auto_cflags=1
+
 abs_srcdir=`(cd $srcdir  pwd)`
 abs_builddir=`pwd`
 
-AC_PROG_CC
+AC_PROG_CC([cc gcc])
 PHP_DETECT_ICC
+PHP_DETECT_SUNCC
 AC_PROG_CC_C_O
 
 dnl Support systems with system libraries in e.g. /usr/lib64
@@ -116,6 +120,15 @@
 CFLAGS=$CFLAGS -O0
 CXXFLAGS=$CXXFLAGS -O0
   fi
+  if test $SUNCC = yes; then
+if test -n $auto_cflags; then
+  CFLAGS=-g
+  CXXFLAGS=-g
+else
+  CFLAGS=$CFLAGS -g
+  CXXFLAGS=$CFLAGS -g
+fi
+  fi
 else
   PHP_DEBUG=0
   ZEND_DEBUG=no



-- 
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

2009-05-09 Thread Scott MacVicar
scottmacSat May  9 20:42:56 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
  Log:
  BFN
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1493r2=1.2027.2.547.2.1494diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1493 php-src/NEWS:1.2027.2.547.2.1494
--- php-src/NEWS:1.2027.2.547.2.1493Sat May  9 20:36:34 2009
+++ php-src/NEWSSat May  9 20:42:56 2009
@@ -12,6 +12,8 @@
 - Fixed segfault on invalid session.save_path. (Hannes)
 - Fixed leaks in imap when a mail_criteria is used. (Pierre)
 
+- Fixed bug #48206 (Iterating over an invalid data structure
+  with RecursiveIteratorIterator leads to a segfault). (Scott)
 - Fixed bug #48156 (Added support for lcov v1.7). (Ilia)
 - Fixed bug #48131 (Don't try to bind ipv4 addresses to ipv6 ips via
   bindto). (Ilia)



-- 
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 configure.in

2009-05-06 Thread Ilia Alshanetsky
iliaa   Wed May  6 14:05:55 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcconfigure.in NEWS 
  Log:
  
  MFB: Fixed bug #48156 (Added support for lcov v1.7)
  
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.132r2=1.579.2.52.2.133diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.579.2.52.2.132 
php-src/configure.in:1.579.2.52.2.133
--- php-src/configure.in:1.579.2.52.2.132   Wed Feb 25 15:34:33 2009
+++ php-src/configure.inWed May  6 14:05:54 2009
@@ -1,4 +1,4 @@
-## $Id: configure.in,v 1.579.2.52.2.132 2009/02/25 15:34:33 iliaa Exp $ -*- 
autoconf -*-
+## $Id: configure.in,v 1.579.2.52.2.133 2009/05/06 14:05:54 iliaa Exp $ -*- 
autoconf -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -685,7 +685,7 @@
 AC_MSG_ERROR([ccache must be disabled when --enable-gcov option is used. 
You can disable ccache by setting environment variable CCACHE_DISABLE=1.])
   fi
   
-  ltp_version_list=1.5 1.6
+  ltp_version_list=1.5 1.6 1.7
 
   AC_CHECK_PROG(LTP, lcov, lcov)
   AC_CHECK_PROG(LTP_GENHTML, genhtml, genhtml)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1489r2=1.2027.2.547.2.1490diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1489 php-src/NEWS:1.2027.2.547.2.1490
--- php-src/NEWS:1.2027.2.547.2.1489Tue May  5 00:33:03 2009
+++ php-src/NEWSWed May  6 14:05:54 2009
@@ -11,8 +11,8 @@
 - Fixed segfault on invalid session.save_path. (Hannes)
 - Fixed leaks in imap when a mail_criteria is used. (Pierre)
 
-- Fixed bug #45092 (header HTTP context option not being used when compiled
-  using --with-curlwrappers). (Jani)
+- Fixed bug #48156 (Added support for lcov v1.7). (Ilia)
+
 - Fixed bug #48131 (Don't try to bind ipv4 addresses to ipv6 ips via
   bindto). (Ilia)
 - Fixed bug #48132 (configure check for curl ssl support fails with
@@ -75,6 +75,8 @@
   Takeshi Abe)
 - Fixed bug #45191 (error_log ignores date.timezone php.ini val when
   setting logging timestamps). (Derick)
+- Fixed bug #45092 (header HTTP context option not being used when compiled
+  using --with-curlwrappers). (Jani)
 - Fixed bug #43073 (TrueType bounding box is wrong for angle0).
   (Martin McNickle)
 - Fixed bug #38805 (PDO truncates text from SQL Server text data type



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



[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /main network.c

2009-05-04 Thread Ilia Alshanetsky
iliaa   Mon May  4 13:12:35 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
/php-src/main   network.c 
  Log:
  
  MFB: Fixed bug #48131 (Don't try to bind ipv4 addresses to ipv6 ips via 
  bindto)
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1487r2=1.2027.2.547.2.1488diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1487 php-src/NEWS:1.2027.2.547.2.1488
--- php-src/NEWS:1.2027.2.547.2.1487Sun May  3 19:09:22 2009
+++ php-src/NEWSMon May  4 13:12:34 2009
@@ -11,6 +11,8 @@
 - Fixed segfault on invalid session.save_path. (Hannes)
 - Fixed leaks in imap when a mail_criteria is used. (Pierre)
 
+- Fixed bug #48131 (Don't try to bind ipv4 addresses to ipv6 ips via
+  bindto). (Ilia)
 - Fixed bug #48132 (configure check for curl ssl support fails with
   --disable-rpath). (Jani)
 - Fixed bug #48058 (Year formatter goes wrong with out-of-int range). (Derick)
http://cvs.php.net/viewvc.cgi/php-src/main/network.c?r1=1.118.2.2.2.16r2=1.118.2.2.2.17diff_format=u
Index: php-src/main/network.c
diff -u php-src/main/network.c:1.118.2.2.2.16 
php-src/main/network.c:1.118.2.2.2.17
--- php-src/main/network.c:1.118.2.2.2.16   Sat Jan  3 00:06:59 2009
+++ php-src/main/network.c  Mon May  4 13:12:35 2009
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: network.c,v 1.118.2.2.2.16 2009/01/03 00:06:59 felipe Exp $ */
+/* $Id: network.c,v 1.118.2.2.2.17 2009/05/04 13:12:35 iliaa Exp $ */
 
 /*#define DEBUG_MAIN_NETWORK 1*/
 
@@ -423,9 +423,14 @@
switch (sa-sa_family) {
 #if HAVE_GETADDRINFO  HAVE_IPV6
case AF_INET6:
-   ((struct sockaddr_in6 *)sa)-sin6_family = 
sa-sa_family;
-   ((struct sockaddr_in6 *)sa)-sin6_port = 
htons(port);
-   socklen = sizeof(struct sockaddr_in6);
+   if (strstr(bindto, ':')) {
+   ((struct sockaddr_in6 
*)sa)-sin6_family = sa-sa_family;
+   ((struct sockaddr_in6 *)sa)-sin6_port 
= htons(port);
+   socklen = sizeof(struct sockaddr_in6);
+   } else {
+   socklen = 0;
+   sa = NULL;
+   }
break;
 #endif
case AF_INET:
@@ -786,9 +791,14 @@
switch (sa-sa_family) {
 #if HAVE_GETADDRINFO  HAVE_IPV6
case AF_INET6:
-   ((struct sockaddr_in6 *)sa)-sin6_family = 
sa-sa_family;
-   ((struct sockaddr_in6 *)sa)-sin6_port = 
htons(port);
-   socklen = sizeof(struct sockaddr_in6);
+   if (strstr(bindto, ':')) {
+   ((struct sockaddr_in6 
*)sa)-sin6_family = sa-sa_family;
+   ((struct sockaddr_in6 *)sa)-sin6_port 
= htons(port);
+   socklen = sizeof(struct sockaddr_in6);
+   } else {
+   socklen = 0;
+   sa = NULL;
+   }
break;
 #endif
case AF_INET:
@@ -808,7 +818,7 @@
if (bindto) {
struct sockaddr *local_address = NULL;
int local_address_len = 0;
-   
+
if (sa-sa_family == AF_INET) {
struct sockaddr_in *in4 = 
emalloc(sizeof(struct sockaddr_in));
 



-- 
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 /main network.c

2009-05-04 Thread Antony Dovgal

The build is broken:

/local/qa/5_2/main/network.c: In function 
'php_network_bind_socket_to_local_addr':
/local/qa/5_2/main/network.c:426: error: 'bindto' undeclared (first use in this 
function)
/local/qa/5_2/main/network.c:426: error: (Each undeclared identifier is 
reported only once
/local/qa/5_2/main/network.c:426: error: for each function it appears in.)
/local/qa/5_2/main/network.c:426: warning: passing argument 2 of 'strstr' makes 
pointer from integer without a cast
/local/qa/5_2/main/network.c: In function 'php_network_connect_socket_to_host':
/local/qa/5_2/main/network.c:794: warning: passing argument 2 of 'strstr' makes 
pointer from integer without a cast
make: *** [main/network.lo] Error 1


-- 
Wbr, 
Antony Dovgal

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



[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/curl streams.c /ext/standard http_fopen_wrapper.c

2009-05-04 Thread Jani Taskinen
janiTue May  5 00:33:03 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/curl   streams.c 
/php-src/ext/standard   http_fopen_wrapper.c 
/php-srcNEWS 
  Log:
  MFH: - Fixed Bug #45092 header HTTP context option not being used 
(--with-curlwrappers)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/streams.c?r1=1.14.2.2.2.13r2=1.14.2.2.2.14diff_format=u
Index: php-src/ext/curl/streams.c
diff -u php-src/ext/curl/streams.c:1.14.2.2.2.13 
php-src/ext/curl/streams.c:1.14.2.2.2.14
--- php-src/ext/curl/streams.c:1.14.2.2.2.13Wed Dec 31 11:17:36 2008
+++ php-src/ext/curl/streams.c  Tue May  5 00:33:02 2009
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: streams.c,v 1.14.2.2.2.13 2008/12/31 11:17:36 sebastian Exp $ */
+/* $Id: streams.c,v 1.14.2.2.2.14 2009/05/05 00:33:02 jani Exp $ */
 
 /* This file implements cURL based wrappers.
  * NOTE: If you are implementing your own streams that are intended to
@@ -48,6 +48,7 @@
 #include ext/standard/php_smart_str.h
 #include ext/standard/info.h
 #include ext/standard/file.h
+#include ext/standard/php_string.h
 #include php_curl.h
 
 static size_t on_data_available(char *data, size_t size, size_t nmemb, void 
*ctx)
@@ -258,6 +259,7 @@
php_stream *stream;
php_curl_stream *curlstream;
zval *tmp, **ctx_opt = NULL;
+   struct curl_slist *slist = NULL;
 
curlstream = emalloc(sizeof(php_curl_stream));
memset(curlstream, 0, sizeof(php_curl_stream));
@@ -306,6 +308,15 @@

/* TODO: read cookies and options from context */
if (context  !strncasecmp(filename, http, sizeof(http)-1)) {
+   /* Protocol version */
+   if (SUCCESS == php_stream_context_get_option(context, http, 
protocol_version, ctx_opt)  Z_TYPE_PP(ctx_opt) == IS_DOUBLE) {
+   if (Z_DVAL_PP(ctx_opt) == 1.1) {
+   curl_easy_setopt(curlstream-curl, 
CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1);
+   } else {
+   curl_easy_setopt(curlstream-curl, 
CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0);
+   }
+   }
+
if (SUCCESS == php_stream_context_get_option(context, http, 
curl_verify_ssl_host, ctx_opt)  Z_TYPE_PP(ctx_opt) == IS_BOOL  
Z_LVAL_PP(ctx_opt) == 1) {
curl_easy_setopt(curlstream-curl, 
CURLOPT_SSL_VERIFYHOST, 1);
} else {
@@ -321,20 +332,34 @@
if (SUCCESS == php_stream_context_get_option(context, http, 
user_agent, ctx_opt)  Z_TYPE_PP(ctx_opt) == IS_STRING) {
curl_easy_setopt(curlstream-curl, CURLOPT_USERAGENT, 
Z_STRVAL_PP(ctx_opt));
}
-   if (SUCCESS == php_stream_context_get_option(context, http, 
header, ctx_opt)  Z_TYPE_PP(ctx_opt) == IS_ARRAY) {
-   HashPosition pos;
-   zval **header = NULL;
-   struct curl_slist *hl = NULL;
+   if (SUCCESS == php_stream_context_get_option(context, http, 
header, ctx_opt)) {
+   if (Z_TYPE_PP(ctx_opt) == IS_ARRAY) {
+   HashPosition pos;
+   zval **header = NULL;

-   for 
(zend_hash_internal_pointer_reset_ex(Z_ARRVAL_PP(ctx_opt), pos);
-   SUCCESS == 
zend_hash_get_current_data_ex(Z_ARRVAL_PP(ctx_opt), (void *)header, pos);
-   zend_hash_move_forward_ex(Z_ARRVAL_PP(ctx_opt), 
pos)) {
-   if (Z_TYPE_PP(header) == IS_STRING) {
-   hl = curl_slist_append(hl, 
Z_STRVAL_PP(header));
+   for 
(zend_hash_internal_pointer_reset_ex(Z_ARRVAL_PP(ctx_opt), pos);
+   SUCCESS == 
zend_hash_get_current_data_ex(Z_ARRVAL_PP(ctx_opt), (void *)header, pos);
+   
zend_hash_move_forward_ex(Z_ARRVAL_PP(ctx_opt), pos)
+   ) {
+   if (Z_TYPE_PP(header) == IS_STRING) {
+   slist = 
curl_slist_append(slist, Z_STRVAL_PP(header));
+   }
}
+   } else if (Z_TYPE_PP(ctx_opt) == IS_STRING  
Z_STRLEN_PP(ctx_opt)) {
+   char *p, *token, *trimmed, *copy_ctx_opt;
+
+   copy_ctx_opt = php_trim(Z_STRVAL_PP(ctx_opt), 
Z_STRLEN_PP(ctx_opt), NULL, 0, NULL, 3 TSRMLS_CC);
+   p = php_strtok_r(copy_ctx_opt, \r\n, token);
+   while (p) {
+   trimmed = php_trim(p, strlen(p), NULL, 
0, NULL, 3 TSRMLS_CC);
+ 

[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/date php_date.c /ext/date/lib timelib_structs.h tm2unixtime.c /ext/date/tests bug48058.phpt date_create-relative.phpt strtotime-relative.phpt

2009-05-03 Thread Derick Rethans
derick  Sun May  3 18:22:59 2009 UTC

  Added files: (Branch: PHP_5_2)
/php-src/ext/date/tests bug48058.phpt date_create-relative.phpt 
strtotime-relative.phpt 

  Modified files:  
/php-src/ext/date   php_date.c 
/php-src/ext/date/lib   timelib_structs.h tm2unixtime.c 
/php-srcNEWS 
  Log:
  - MFH: Fixed bug #48058 (Year formatter goes wrong with out-of-int range).
  - MFH: Fixed bug #45822 (Near infinite-loops while parsing huge relative 
offsets).
  
  http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.43.2.45.2.64r2=1.43.2.45.2.65diff_format=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.43.2.45.2.64 
php-src/ext/date/php_date.c:1.43.2.45.2.65
--- php-src/ext/date/php_date.c:1.43.2.45.2.64  Wed Dec 31 11:17:36 2008
+++ php-src/ext/date/php_date.c Sun May  3 18:22:59 2009
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_date.c,v 1.43.2.45.2.64 2008/12/31 11:17:36 sebastian Exp $ */
+/* $Id: php_date.c,v 1.43.2.45.2.65 2009/05/03 18:22:59 derick Exp $ */
 
 #include php.h
 #include php_streams.h
@@ -787,7 +787,7 @@
/* year */
case 'L': length = slprintf(buffer, 32, %d, 
timelib_is_leap((int) t-y)); break;
case 'y': length = slprintf(buffer, 32, %02d, (int) 
t-y % 100); break;
-   case 'Y': length = slprintf(buffer, 32, %s%04d, t-y 
 0 ? - : , abs((int) t-y)); break;
+   case 'Y': length = slprintf(buffer, 32, %s%04ld, t-y 
 0 ? - : , llabs(t-y)); break;
 
/* time */
case 'a': length = slprintf(buffer, 32, %s, t-h = 
12 ? pm : am); break;
http://cvs.php.net/viewvc.cgi/php-src/ext/date/lib/timelib_structs.h?r1=1.13.2.6.2.6r2=1.13.2.6.2.7diff_format=u
Index: php-src/ext/date/lib/timelib_structs.h
diff -u php-src/ext/date/lib/timelib_structs.h:1.13.2.6.2.6 
php-src/ext/date/lib/timelib_structs.h:1.13.2.6.2.7
--- php-src/ext/date/lib/timelib_structs.h:1.13.2.6.2.6 Wed Dec 31 11:17:36 2008
+++ php-src/ext/date/lib/timelib_structs.h  Sun May  3 18:22:59 2009
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: timelib_structs.h,v 1.13.2.6.2.6 2008/12/31 11:17:36 sebastian Exp $ */
+/* $Id: timelib_structs.h,v 1.13.2.6.2.7 2009/05/03 18:22:59 derick Exp $ */
 
 #ifndef __TIMELIB_STRUCTS_H__
 #define __TIMELIB_STRUCTS_H__
@@ -200,6 +200,9 @@
 #define SECS_PER_DAY   86400
 #define DAYS_PER_YEAR365
 #define DAYS_PER_LYEAR   366
+/* 400*365 days + 97 leap days */
+#define DAYS_PER_LYEAR_PERIOD 146097
+#define YEARS_PER_LYEAR_PERIOD 400
 
 #define timelib_is_leap(y) ((y) % 4 == 0  ((y) % 100 != 0 || (y) % 400 == 0))
 
http://cvs.php.net/viewvc.cgi/php-src/ext/date/lib/tm2unixtime.c?r1=1.13.2.3.2.7r2=1.13.2.3.2.8diff_format=u
Index: php-src/ext/date/lib/tm2unixtime.c
diff -u php-src/ext/date/lib/tm2unixtime.c:1.13.2.3.2.7 
php-src/ext/date/lib/tm2unixtime.c:1.13.2.3.2.8
--- php-src/ext/date/lib/tm2unixtime.c:1.13.2.3.2.7 Wed Dec 31 11:17:36 2008
+++ php-src/ext/date/lib/tm2unixtime.c  Sun May  3 18:22:59 2009
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: tm2unixtime.c,v 1.13.2.3.2.7 2008/12/31 11:17:36 sebastian Exp $ */
+/* $Id: tm2unixtime.c,v 1.13.2.3.2.8 2009/05/03 18:22:59 derick Exp $ */
 
 #include timelib.h
 
@@ -31,20 +31,12 @@
 static int do_range_limit(timelib_sll start, timelib_sll end, timelib_sll adj, 
timelib_sll *a, timelib_sll *b)
 {
if (*a  start) {
-   *a += adj;
-   (*b)--;
-   return 1;
+   *b -= (start - *a - 1) / adj + 1;
+   *a += adj * ((start - *a - 1) / adj + 1);
}
if (*a = end) {
-   if (start == 0) {
-   (*b) += (*a / end);
-   (*a) -= (end * (*a / end));
-   return 0;
-   }
-
-   *a -= adj;
-   (*b)++;
-   return 1;
+   *b += *a / adj;
+   *a -= adj * (*a / adj);
}
return 0;
 }
@@ -55,6 +47,12 @@
timelib_sll days_this_month;
timelib_sll last_month, last_year;
timelib_sll days_last_month;
+   
+   /* can jump an entire leap year period quickly */
+   if (*d = DAYS_PER_LYEAR_PERIOD || *d = -DAYS_PER_LYEAR_PERIOD) {
+   *y += YEARS_PER_LYEAR_PERIOD * (*d / DAYS_PER_LYEAR_PERIOD);
+   *d -= DAYS_PER_LYEAR_PERIOD * (*d / DAYS_PER_LYEAR_PERIOD);
+   }
 
do_range_limit(1, 13, 12, m, y);
 
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1485r2=1.2027.2.547.2.1486diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1485 php-src/NEWS:1.2027.2.547.2.1486
--- 

  1   2   3   4   5   6   7   8   9   10   >