[PHP-CVS] cvs: php-src /ext/standard url_scanner_ex.re

2009-04-25 Thread Arnaud Le Blanc 
lbarnaudSat Apr 25 21:07:07 2009 UTC

  Modified files:  
/php-src/ext/standard   url_scanner_ex.re 
  Log:
  Handle HEAD output handler flags
  (fixes ext/standard/tests/general_functions/bug44394.phpt)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/url_scanner_ex.re?r1=1.83r2=1.84diff_format=u
Index: php-src/ext/standard/url_scanner_ex.re
diff -u php-src/ext/standard/url_scanner_ex.re:1.83 
php-src/ext/standard/url_scanner_ex.re:1.84
--- php-src/ext/standard/url_scanner_ex.re:1.83 Wed Mar 12 19:35:24 2008
+++ php-src/ext/standard/url_scanner_ex.re  Sat Apr 25 21:07:07 2009
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: url_scanner_ex.re,v 1.83 2008/03/12 19:35:24 felipe Exp $ */
+/* $Id: url_scanner_ex.re,v 1.84 2009/04/25 21:07:07 lbarnaud Exp $ */
 
 #include php.h
 
@@ -431,7 +431,7 @@
size_t len;
 
if (BG(url_adapt_state_ex).url_app.len != 0) {
-   *handled_output = url_adapt_ext(output, output_len, len, 
(zend_bool) (mode  (PHP_OUTPUT_HANDLER_END | PHP_OUTPUT_HANDLER_CONT) ? 1 : 0) 
TSRMLS_CC);
+   *handled_output = url_adapt_ext(output, output_len, len, 
(zend_bool) (mode  (PHP_OUTPUT_HANDLER_END | PHP_OUTPUT_HANDLER_CONT | 
PHP_OUTPUT_HANDLER_FLUSH | PHP_OUTPUT_HANDLER_FINAL) ? 1 : 0) TSRMLS_CC);
if (sizeof(uint)  sizeof(size_t)) {
if (len  UINT_MAX)
len = UINT_MAX;



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

[PHP-CVS] cvs: php-src /ext/standard url_scanner_ex.re

2009-04-25 Thread Arnaud Le Blanc 
lbarnaudSat Apr 25 21:08:54 2009 UTC

  Modified files:  
/php-src/ext/standard   url_scanner_ex.re 
  Log:
  Fix version
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/url_scanner_ex.re?r1=1.84r2=1.85diff_format=u
Index: php-src/ext/standard/url_scanner_ex.re
diff -u php-src/ext/standard/url_scanner_ex.re:1.84 
php-src/ext/standard/url_scanner_ex.re:1.85
--- php-src/ext/standard/url_scanner_ex.re:1.84 Sat Apr 25 21:07:07 2009
+++ php-src/ext/standard/url_scanner_ex.re  Sat Apr 25 21:08:54 2009
@@ -1,6 +1,6 @@
 /*
   +--+
-  | PHP Version 5|
+  | PHP Version 6|
   +--+
   | Copyright (c) 1997-2006 The PHP Group|
   +--+
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: url_scanner_ex.re,v 1.84 2009/04/25 21:07:07 lbarnaud Exp $ */
+/* $Id: url_scanner_ex.re,v 1.85 2009/04/25 21:08:54 lbarnaud Exp $ */
 
 #include php.h
 



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

[PHP-CVS] cvs: php-src /ext/standard url_scanner_ex.re

2008-03-12 Thread Felipe Pena 
felipe  Wed Mar 12 19:35:24 2008 UTC

  Modified files:  
/php-src/ext/standard   url_scanner_ex.re 
  Log:
  Sync with fix for #44394
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/url_scanner_ex.re?r1=1.82r2=1.83diff_format=u
Index: php-src/ext/standard/url_scanner_ex.re
diff -u php-src/ext/standard/url_scanner_ex.re:1.82 
php-src/ext/standard/url_scanner_ex.re:1.83
--- php-src/ext/standard/url_scanner_ex.re:1.82 Wed Oct 10 00:36:25 2007
+++ php-src/ext/standard/url_scanner_ex.re  Wed Mar 12 19:35:24 2008
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: url_scanner_ex.re,v 1.82 2007/10/10 00:36:25 iliaa Exp $ */
+/* $Id: url_scanner_ex.re,v 1.83 2008/03/12 19:35:24 felipe Exp $ */
 
 #include php.h
 
@@ -431,7 +431,7 @@
size_t len;
 
if (BG(url_adapt_state_ex).url_app.len != 0) {
-   *handled_output = url_adapt_ext(output, output_len, len, 
(zend_bool) (mode  PHP_OUTPUT_HANDLER_END ? 1 : 0) TSRMLS_CC);
+   *handled_output = url_adapt_ext(output, output_len, len, 
(zend_bool) (mode  (PHP_OUTPUT_HANDLER_END | PHP_OUTPUT_HANDLER_CONT) ? 1 : 0) 
TSRMLS_CC);
if (sizeof(uint)  sizeof(size_t)) {
if (len  UINT_MAX)
len = UINT_MAX;



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

[PHP-CVS] cvs: php-src /ext/standard url_scanner_ex.re

2005-01-10 Thread Jani Taskinen 
sniper  Mon Jan 10 10:20:47 2005 EDT

  Modified files:  
/php-src/ext/standard   url_scanner_ex.re 
  Log:
  Missing $Id$ tag
  
http://cvs.php.net/diff.php/php-src/ext/standard/url_scanner_ex.re?r1=1.73r2=1.74ty=u
Index: php-src/ext/standard/url_scanner_ex.re
diff -u php-src/ext/standard/url_scanner_ex.re:1.73 
php-src/ext/standard/url_scanner_ex.re:1.74
--- php-src/ext/standard/url_scanner_ex.re:1.73 Thu Jul 22 22:05:49 2004
+++ php-src/ext/standard/url_scanner_ex.re  Mon Jan 10 10:20:46 2005
@@ -16,6 +16,8 @@
   +--+
 */
 
+/* $Id: url_scanner_ex.re,v 1.74 2005/01/10 15:20:46 sniper Exp $ */
+
 #include php.h
 
 #ifdef HAVE_UNISTD_H

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