[PHP-CVS] svn: /php/php-src/trunk/ext/standard/ credits_ext.h

[Jani Taskinen]

jani Fri, 17 Dec 2010 10:48:47 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=306412

Log:
- Update credits

Changed paths:
U   php/php-src/trunk/ext/standard/credits_ext.h

Modified: php/php-src/trunk/ext/standard/credits_ext.h
===
--- php/php-src/trunk/ext/standard/credits_ext.h2010-12-17 10:43:52 UTC 
(rev 306411)
+++ php/php-src/trunk/ext/standard/credits_ext.h2010-12-17 10:48:47 UTC 
(rev 306412)
@@ -59,7 +59,7 @@
 CREDIT_LINE(PostgreSQL, Jouni Ahto, Zeev Suraski, Yasuo Ohgaki, Chris 
Kings-Lynne);
 CREDIT_LINE(Pspell, Vlad Krupin);
 CREDIT_LINE(Readline, Thies C. Arntzen);
-CREDIT_LINE(Recode, Kristian Köhntopp);
+CREDIT_LINE(Recode, Kristian Koehntopp);
 CREDIT_LINE(Reflection, Marcus Boerger, Timm Friebe, George Schlossnagle, 
Andrei Zmievski, Johannes Schlueter);
 CREDIT_LINE(Sessions, Sascha Schumann, Andrei Zmievski);
 CREDIT_LINE(Shared Memory Operations, Slava Poliakov, Ilia Alshanetsky);
@@ -68,9 +68,8 @@
 CREDIT_LINE(SOAP, Brad Lafountain, Shane Caraveo, Dmitry Stogov);
 CREDIT_LINE(Sockets, Chris Vandomelen, Sterling Hughes, Daniel Beulshausen, 
Jason Greene);
 CREDIT_LINE(SPL, Marcus Boerger, Etienne Kneuss);
-CREDIT_LINE(SQLite3, Scott MacVicar);
+CREDIT_LINE(SQLite3, Scott MacVicar, Ilia Alshanetsky);
 CREDIT_LINE(SQLite 3.x driver for PDO, Wez Furlong);
-CREDIT_LINE(SQLite, Wez Furlong, Tal Peer, Marcus Boerger, Ilia 
Alshanetsky);
 CREDIT_LINE(Sybase-CT, Zeev Suraski, Tom May, Timm Friebe);
 CREDIT_LINE(System V Message based IPC, Wez Furlong);
 CREDIT_LINE(System V Semaphores, Tom May);
@@ -84,4 +83,4 @@
 CREDIT_LINE(XMLWriter, Rob Richards, Pierre-Alain Joye);
 CREDIT_LINE(XSL, Christian Stocker, Rob Richards);
 CREDIT_LINE(Zip, Pierre-Alain Joye);
-CREDIT_LINE(Zlib, Rasmus Lerdorf, Stefan Roehrich, Zeev Suraski, Jade 
Nicoletti);
+CREDIT_LINE(Zlib, Rasmus Lerdorf, Stefan Roehrich, Zeev Suraski, Jade 
Nicoletti, Michael Wallner);

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

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ext/standard/ credits_ext.h

[Jani Taskinen]

jani Fri, 17 Dec 2010 10:49:02 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=306413

Log:
- Update credits

Changed paths:
U   php/php-src/branches/PHP_5_3/ext/standard/credits_ext.h

Modified: php/php-src/branches/PHP_5_3/ext/standard/credits_ext.h
===
--- php/php-src/branches/PHP_5_3/ext/standard/credits_ext.h 2010-12-17 
10:48:47 UTC (rev 306412)
+++ php/php-src/branches/PHP_5_3/ext/standard/credits_ext.h 2010-12-17 
10:49:02 UTC (rev 306413)
@@ -59,7 +59,7 @@
 CREDIT_LINE(PostgreSQL, Jouni Ahto, Zeev Suraski, Yasuo Ohgaki, Chris 
Kings-Lynne);
 CREDIT_LINE(Pspell, Vlad Krupin);
 CREDIT_LINE(Readline, Thies C. Arntzen);
-CREDIT_LINE(Recode, Kristian Köhntopp);
+CREDIT_LINE(Recode, Kristian Koehntopp);
 CREDIT_LINE(Reflection, Marcus Boerger, Timm Friebe, George Schlossnagle, 
Andrei Zmievski, Johannes Schlueter);
 CREDIT_LINE(Sessions, Sascha Schumann, Andrei Zmievski);
 CREDIT_LINE(Shared Memory Operations, Slava Poliakov, Ilia Alshanetsky);
@@ -68,7 +68,7 @@
 CREDIT_LINE(SOAP, Brad Lafountain, Shane Caraveo, Dmitry Stogov);
 CREDIT_LINE(Sockets, Chris Vandomelen, Sterling Hughes, Daniel Beulshausen, 
Jason Greene);
 CREDIT_LINE(SPL, Marcus Boerger, Etienne Kneuss);
-CREDIT_LINE(SQLite3, Scott MacVicar);
+CREDIT_LINE(SQLite3, Scott MacVicar, Ilia Alshanetsky);
 CREDIT_LINE(SQLite 3.x driver for PDO, Wez Furlong);
 CREDIT_LINE(SQLite, Wez Furlong, Tal Peer, Marcus Boerger, Ilia 
Alshanetsky);
 CREDIT_LINE(Sybase-CT, Zeev Suraski, Tom May, Timm Friebe);

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

[PHP-CVS] svn: /php/php-src/trunk/main/ SAPI.c

[Jani Taskinen]

jani Thu, 16 Dec 2010 12:25:27 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=306406

Log:
- Typos, WS, CS

Changed paths:
U   php/php-src/trunk/main/SAPI.c

Modified: php/php-src/trunk/main/SAPI.c
===
--- php/php-src/trunk/main/SAPI.c   2010-12-16 12:18:54 UTC (rev 306405)
+++ php/php-src/trunk/main/SAPI.c   2010-12-16 12:25:27 UTC (rev 306406)
@@ -381,9 +381,7 @@
SG(request_info).proto_num = 1000; /* Default to HTTP 1.0 */
SG(global_request_time) = 0;

-   /* It's possible to override this general case in the activate() 
callback, if
-* necessary.
-*/
+   /* It's possible to override this general case in the activate() 
callback, if necessary. */
if (SG(request_info).request_method  
!strcmp(SG(request_info).request_method, HEAD)) {
SG(request_info).headers_only = 1;
} else {
@@ -391,22 +389,19 @@
}
SG(rfc1867_uploaded_files) = NULL;

-   /* handle request mehtod */
+   /* Handle request method */
if (SG(server_context)) {
if (PG(enable_post_data_reading)  
SG(request_info).request_method) {
-   if(!strcmp(SG(request_info).request_method, POST)
-   (SG(request_info).content_type)) {
-   /* HTTP POST - may contain form data to be 
read into variables
-  depending on content type given
-   */
+   if (SG(request_info).content_type  
!strcmp(SG(request_info).request_method, POST)) {
+   /* HTTP POST may contain form data to be 
processed into variables
+* depending on given content type */
sapi_read_post_data(TSRMLS_C);
} else {
-   /* any other method with content payload will 
fill
-  $HTTP_RAW_POST_DATA if enabled by 
always_populate_raw_post_data
-  it is up to the webserver to decide whether 
to allow a method or not
-   */
+   /* Any other method with content payload will 
fill $HTTP_RAW_POST_DATA
+* if it is enabled by 
always_populate_raw_post_data.
+* It's up to the webserver to decide whether 
to allow a method or not. */
SG(request_info).content_type_dup = NULL;
-   if(sapi_module.default_post_reader) {
+   if (sapi_module.default_post_reader) {

sapi_module.default_post_reader(TSRMLS_C);
}
}
@@ -416,11 +411,12 @@

/* Cookies */
SG(request_info).cookie_data = 
sapi_module.read_cookies(TSRMLS_C);
+
if (sapi_module.activate) {
sapi_module.activate(TSRMLS_C);
}
}
-   if (sapi_module.input_filter_init ) {
+   if (sapi_module.input_filter_init) {
sapi_module.input_filter_init(TSRMLS_C);
}
 }

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

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/main/ output.c

[Jani Taskinen]

jani Fri, 03 Dec 2010 13:20:13 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=305939

Log:
- Fix leaks and crash bug when passing the callback as variable

Changed paths:
U   php/php-src/branches/PHP_5_3/main/output.c

Modified: php/php-src/branches/PHP_5_3/main/output.c
===
--- php/php-src/branches/PHP_5_3/main/output.c  2010-12-03 10:15:06 UTC (rev 
305938)
+++ php/php-src/branches/PHP_5_3/main/output.c  2010-12-03 13:20:13 UTC (rev 
305939)
@@ -745,7 +745,7 @@
long chunk_size=0;
zend_bool erase=1;

-   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, |zlb, 
output_handler, chunk_size, erase) == FAILURE) {
+   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, |z/lb, 
output_handler, chunk_size, erase) == FAILURE) {
return;
}


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

[PHP-CVS] svn: /php/php-src/trunk/tests/output/ ob_start_callbacks.phpt

[Jani Taskinen]

jani Fri, 03 Dec 2010 15:29:53 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=305944

Log:
- Add test for the ob_start($foo); leak/crash bug

Changed paths:
A   php/php-src/trunk/tests/output/ob_start_callbacks.phpt

Added: php/php-src/trunk/tests/output/ob_start_callbacks.phpt
===
--- php/php-src/trunk/tests/output/ob_start_callbacks.phpt  
(rev 0)
+++ php/php-src/trunk/tests/output/ob_start_callbacks.phpt  2010-12-03 
15:29:53 UTC (rev 305944)
@@ -0,0 +1,39 @@
+--TEST--
+Test ob_start() with callbacks in variables
+--FILE--
+?php
+
+// Closure in variable
+$a = function ($s) { return strtoupper($s); };
+ob_start($a);
+echo 'closure in variable', \n;
+ob_end_flush();
+
+// Object (array) in variable
+class foo {
+   static function out($foo) {
+   return strtoupper($foo);
+   }
+}
+$a = array('foo', 'out');
+ob_start($a);
+echo 'object in variable', \n;
+ob_end_flush();
+
+// Object with static array
+ob_start(array('foo', 'out'));
+echo 'object via static array', \n;
+ob_end_flush();
+
+function my_strtoupper($foo, $bar) {
+   return strtoupper($foo);
+}
+$a = 'my_strtoupper';
+ob_start($a);
+echo 'function via variable', \n;
+ob_end_flush();
+--EXPECT--
+CLOSURE IN VARIABLE
+OBJECT IN VARIABLE
+OBJECT VIA STATIC ARRAY
+FUNCTION VIA VARIABLE

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

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/tests/output/ ob_start_callbacks.phpt

[Jani Taskinen]

jani Fri, 03 Dec 2010 15:30:21 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=305945

Log:
- Add test for the ob_start($foo); leak/crash bug

Changed paths:
A   php/php-src/branches/PHP_5_3/tests/output/ob_start_callbacks.phpt

Added: php/php-src/branches/PHP_5_3/tests/output/ob_start_callbacks.phpt
===
--- php/php-src/branches/PHP_5_3/tests/output/ob_start_callbacks.phpt   
(rev 0)
+++ php/php-src/branches/PHP_5_3/tests/output/ob_start_callbacks.phpt   
2010-12-03 15:30:21 UTC (rev 305945)
@@ -0,0 +1,39 @@
+--TEST--
+Test ob_start() with callbacks in variables
+--FILE--
+?php
+
+// Closure in variable
+$a = function ($s) { return strtoupper($s); };
+ob_start($a);
+echo 'closure in variable', \n;
+ob_end_flush();
+
+// Object (array) in variable
+class foo {
+   static function out($foo) {
+   return strtoupper($foo);
+   }
+}
+$a = array('foo', 'out');
+ob_start($a);
+echo 'object in variable', \n;
+ob_end_flush();
+
+// Object with static array
+ob_start(array('foo', 'out'));
+echo 'object via static array', \n;
+ob_end_flush();
+
+function my_strtoupper($foo, $bar) {
+   return strtoupper($foo);
+}
+$a = 'my_strtoupper';
+ob_start($a);
+echo 'function via variable', \n;
+ob_end_flush();
+--EXPECT--
+CLOSURE IN VARIABLE
+OBJECT IN VARIABLE
+OBJECT VIA STATIC ARRAY
+FUNCTION VIA VARIABLE

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

[PHP-CVS] svn: /php/php-src/trunk/tests/output/ ob_start_basic_005.phpt

[Jani Taskinen]

jani Fri, 03 Dec 2010 15:30:54 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=305946

Log:
- Fix test

Changed paths:
U   php/php-src/trunk/tests/output/ob_start_basic_005.phpt

Modified: php/php-src/trunk/tests/output/ob_start_basic_005.phpt
===
--- php/php-src/trunk/tests/output/ob_start_basic_005.phpt  2010-12-03 
15:30:21 UTC (rev 305945)
+++ php/php-src/trunk/tests/output/ob_start_basic_005.phpt  2010-12-03 
15:30:54 UTC (rev 305946)
@@ -25,9 +25,9 @@

 ?
 --EXPECTF--
-Strict Standards: Non-static method C::h() should not be called statically in 
%s on line 20
+Warning: ob_start(): non-static method C::h() should not be called statically 
in %s on line 20
 bool(true)
 Array
 (
 [0] = C::h
-)
\ No newline at end of file
+)

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

[PHP-CVS] svn: /php/php-src/trunk/ main/output.c tests/output/ob_start_basic_006.phpt tests/output/ob_start_error_001.phpt

[Jani Taskinen]

jani Fri, 03 Dec 2010 15:34:24 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=305947

Log:
- CS and de-facto style of returning NULL for failing parse-params, sync 
partially with PHP_5_3 too (reordering part :)

Changed paths:
U   php/php-src/trunk/main/output.c
U   php/php-src/trunk/tests/output/ob_start_basic_006.phpt
U   php/php-src/trunk/tests/output/ob_start_error_001.phpt

Modified: php/php-src/trunk/main/output.c
===
--- php/php-src/trunk/main/output.c	2010-12-03 15:30:54 UTC (rev 305946)
+++ php/php-src/trunk/main/output.c	2010-12-03 15:34:24 UTC (rev 305947)
@@ -78,7 +78,7 @@
 /* }}} */

 /* {{{ static void php_output_init_globals(zend_output_globals *G)
-	Initialize the module globals on MINIT */
+ * Initialize the module globals on MINIT */
 static inline void php_output_init_globals(zend_output_globals *G)
 {
 	memset(G, 0, sizeof(*G));
@@ -86,7 +86,7 @@
 /* }}} */

 /* {{{ void php_output_startup(void)
-	Set up module globals and initalize the conflict and reverse conflict hash tables */
+ * Set up module globals and initalize the conflict and reverse conflict hash tables */
 PHPAPI void php_output_startup(void)
 {
 	ZEND_INIT_MODULE_GLOBALS(output, php_output_init_globals, NULL);
@@ -97,7 +97,7 @@
 /* }}} */

 /* {{{ void php_output_shutdown(void)
-	Destroy module globals and the conflict and reverse conflict hash tables */
+ * Destroy module globals and the conflict and reverse conflict hash tables */
 PHPAPI void php_output_shutdown(void)
 {
 	zend_hash_destroy(php_output_handler_aliases);
@@ -107,7 +107,7 @@
 /* }}} */

 /* {{{ SUCCESS|FAILURE php_output_activate(TSRMLS_D)
-	Reset output globals and setup the output handler stack */
+ * Reset output globals and setup the output handler stack */
 PHPAPI int php_output_activate(TSRMLS_D)
 {
 #ifdef ZTS
@@ -115,22 +115,22 @@
 #else
 	memset(output_globals, 0, sizeof(zend_output_globals));
 #endif
-
+
 	zend_stack_init(OG(handlers));
-
+
 	return SUCCESS;
 }
 /* }}} */

 /* {{{ void php_output_deactivate(TSRMLS_D)
-	Destroy the output handler stack */
+ * Destroy the output handler stack */
 PHPAPI void php_output_deactivate(TSRMLS_D)
 {
 	php_output_handler **handler = NULL;
-
+
 	OG(active) = NULL;
 	OG(running) = NULL;
-
+
 	/* release all output handlers */
 	if (OG(handlers).elements) {
 		while (SUCCESS == zend_stack_top(OG(handlers), (void *) handler)) {
@@ -163,7 +163,7 @@
 /* }}} */

 /* {{{ void php_output_set_status(int status TSRMLS_DC)
-	Used by SAPIs to disable output */
+ * Used by SAPIs to disable output */
 PHPAPI void php_output_set_status(int status TSRMLS_DC)
 {
 	OG(flags) = status  0xf;
@@ -171,7 +171,7 @@
 /* }}} */

 /* {{{ int php_output_get_status(TSRMLS_C)
-	Get output control status */
+ * Get output control status */
 PHPAPI int php_output_get_status(TSRMLS_D)
 {
 	return OG(flags)
@@ -181,7 +181,7 @@
 /* }}} */

 /* {{{ int php_output_write_unbuffered(const char *str, size_t len TSRMLS_DC)
-	Unbuffered write */
+ * Unbuffered write */
 PHPAPI int php_output_write_unbuffered(const char *str, size_t len TSRMLS_DC)
 {
 	if (OG(flags)  PHP_OUTPUT_DISABLED) {
@@ -192,7 +192,7 @@
 /* }}} */

 /* {{{ int php_output_write(const char *str, size_t len TSRMLS_DC)
-	Buffered write */
+ * Buffered write */
 PHPAPI int php_output_write(const char *str, size_t len TSRMLS_DC)
 {
 	if (OG(flags)  PHP_OUTPUT_DISABLED) {
@@ -204,11 +204,11 @@
 /* }}} */

 /* {{{ SUCCESS|FAILURE php_output_flush(TSRMLS_D)
-	Flush the most recent output handlers buffer */
+ * Flush the most recent output handlers buffer */
 PHPAPI int php_output_flush(TSRMLS_D)
 {
 	php_output_context context;
-
+
 	if (OG(active)  (OG(active)-flags  PHP_OUTPUT_HANDLER_FLUSHABLE)) {
 		php_output_context_init(context, PHP_OUTPUT_HANDLER_FLUSH TSRMLS_CC);
 		php_output_handler_op(OG(active), context);
@@ -225,7 +225,7 @@
 /* }}} */

 /* {{{ void php_output_flush_all(TSRMLS_C)
-	Flush all output buffers subsequently */
+ * Flush all output buffers subsequently */
 PHPAPI void php_output_flush_all(TSRMLS_D)
 {
 	if (OG(active)) {
@@ -235,11 +235,11 @@
 /* }}} */

 /* {{{ SUCCESS|FAILURE php_output_clean(TSRMLS_D)
-	Cleans the most recent output handlers buffer if the handler is cleanable */
+ * Cleans the most recent output handlers buffer if the handler is cleanable */
 PHPAPI int php_output_clean(TSRMLS_D)
 {
 	php_output_context context;
-
+
 	if (OG(active)  (OG(active)-flags  PHP_OUTPUT_HANDLER_CLEANABLE)) {
 		OG(active)-buffer.used = 0;
 		php_output_context_init(context, PHP_OUTPUT_HANDLER_CLEAN TSRMLS_CC);
@@ -252,11 +252,11 @@
 /* }}} */

 /* {{{ void php_output_clean_all(TSRMLS_D)
-	Cleans all output handler buffers, without regard whether the handler is cleanable */
+ * Cleans all output handler buffers, without regard whether the handler is cleanable */
 PHPAPI void php_output_clean_all(TSRMLS_D)
 {
 	php_output_context context;

Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_3/main/ output.c

[Jani Taskinen]

Done.

--Jani

On Dec 3, 2010, at 3:39 PM, Johannes Schlüter wrote:

 Test? :-)
 
 And thanks for the fix.
 
 On Fri, 2010-12-03 at 13:20 +, Jani Taskinen wrote:
 jani Fri, 03 Dec 2010 13:20:13 +
 
 Revision: http://svn.php.net/viewvc?view=revisionrevision=305939
 
 Log:
 - Fix leaks and crash bug when passing the callback as variable
 
 Changed paths:
U   php/php-src/branches/PHP_5_3/main/output.c
 
 Modified: php/php-src/branches/PHP_5_3/main/output.c
 ===
 --- php/php-src/branches/PHP_5_3/main/output.c   2010-12-03 10:15:06 UTC 
 (rev 305938)
 +++ php/php-src/branches/PHP_5_3/main/output.c   2010-12-03 13:20:13 UTC 
 (rev 305939)
 @@ -745,7 +745,7 @@
  long chunk_size=0;
  zend_bool erase=1;
 
 -if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, |zlb, 
 output_handler, chunk_size, erase) == FAILURE) {
 +if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, |z/lb, 
 output_handler, chunk_size, erase) == FAILURE) {
  return;
  }
 
 
 -- 
 PHP CVS Mailing List (http://www.php.net/)
 To unsubscribe, visit: http://www.php.net/unsub.php
 
 


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

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/standard/tests/general_functions/bug44394_2.phpt trunk/ext/standard/tests/general_functions/bug44394_2.phpt

[Jani Taskinen]

jani Fri, 03 Dec 2010 16:02:47 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=305949

Log:
- Fix test

Changed paths:
U   
php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/bug44394_2.phpt
U   php/php-src/trunk/ext/standard/tests/general_functions/bug44394_2.phpt

Modified: 
php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/bug44394_2.phpt
===
--- 
php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/bug44394_2.phpt
   2010-12-03 16:00:26 UTC (rev 305948)
+++ 
php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/bug44394_2.phpt
   2010-12-03 16:02:47 UTC (rev 305949)
@@ -4,6 +4,7 @@
 ?php if (!extension_loaded(session)) print skip; ?
 --INI--
 session.name=PHPSESSID
+session.use_only_cookies=0
 --FILE--
 ?php


Modified: php/php-src/trunk/ext/standard/tests/general_functions/bug44394_2.phpt
===
--- php/php-src/trunk/ext/standard/tests/general_functions/bug44394_2.phpt  
2010-12-03 16:00:26 UTC (rev 305948)
+++ php/php-src/trunk/ext/standard/tests/general_functions/bug44394_2.phpt  
2010-12-03 16:02:47 UTC (rev 305949)
@@ -4,6 +4,7 @@
 ?php if (!extension_loaded(session)) print skip; ?
 --INI--
 session.name=PHPSESSID
+session.use_only_cookies=0
 --FILE--
 ?php


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

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ main/output.c tests/output/bug46897.phpt tests/output/ob_clean_basic_001.phpt tests/output/ob_end_clean_basic_001.phpt tests/output/ob_end_flush_basic_001

[Jani Taskinen]

jani Fri, 03 Dec 2010 16:04:24 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=305950

Log:
- CS + reorder to match trunk better, removed trailing dots from error messages

Changed paths:
U   php/php-src/branches/PHP_5_3/main/output.c
U   php/php-src/branches/PHP_5_3/tests/output/bug46897.phpt
U   php/php-src/branches/PHP_5_3/tests/output/ob_clean_basic_001.phpt
U   php/php-src/branches/PHP_5_3/tests/output/ob_end_clean_basic_001.phpt
U   php/php-src/branches/PHP_5_3/tests/output/ob_end_flush_basic_001.phpt
U   php/php-src/branches/PHP_5_3/tests/output/ob_flush_basic_001.phpt
U   php/php-src/branches/PHP_5_3/tests/output/ob_get_level_basic_001.phpt
U   
php/php-src/branches/PHP_5_3/tests/output/ob_start_basic_unerasable_002.phpt
U   
php/php-src/branches/PHP_5_3/tests/output/ob_start_basic_unerasable_003.phpt
U   
php/php-src/branches/PHP_5_3/tests/output/ob_start_basic_unerasable_004.phpt
U   
php/php-src/branches/PHP_5_3/tests/output/ob_start_basic_unerasable_005.phpt

Modified: php/php-src/branches/PHP_5_3/main/output.c
===
--- php/php-src/branches/PHP_5_3/main/output.c	2010-12-03 16:02:47 UTC (rev 305949)
+++ php/php-src/branches/PHP_5_3/main/output.c	2010-12-03 16:04:24 UTC (rev 305950)
@@ -1,4 +1,4 @@
-/*
+/*
+--+
| PHP Version 5|
+--+
@@ -61,7 +61,7 @@
 /* {{{ php_output_init_globals */
 static void php_output_init_globals(php_output_globals *output_globals_p TSRMLS_DC)
 {
- 	OG(php_body_write) = php_default_output_func;
+	OG(php_body_write) = php_default_output_func;
 	OG(php_header_write) = php_default_output_func;
 	OG(implicit_flush) = 0;
 	OG(output_start_filename) = NULL;
@@ -69,22 +69,20 @@
 }
 /* }}} */

-
 /* {{{ php_output_startup
-   Start output layer */
+ * Start output layer */
 PHPAPI void php_output_startup(void)
 {
 #ifdef ZTS
 	ts_allocate_id(output_globals_id, sizeof(php_output_globals), (ts_allocate_ctor) php_output_init_globals, NULL);
-#else
+#else
 	php_output_init_globals(output_globals TSRMLS_CC);
 #endif
 }
 /* }}} */

-
 /* {{{ php_output_activate
-   Initilize output global for activation */
+ * Initilize output global for activation */
 PHPAPI void php_output_activate(TSRMLS_D)
 {
 	OG(php_body_write) = php_ub_body_write;
@@ -97,15 +95,6 @@
 }
 /* }}} */

-
-/* {{{ php_output_set_status
-   Toggle output status.  Do NOT use in application code, only in SAPIs where appropriate. */
-PHPAPI void php_output_set_status(zend_bool status TSRMLS_DC)
-{
-	OG(disable_output) = !status;
-}
-/* }}} */
-
 /* {{{ php_output_register_constants */
 void php_output_register_constants(TSRMLS_D)
 {
@@ -115,12 +104,19 @@
 }
 /* }}} */

+/* {{{ php_output_set_status
+ * Toggle output status.  Do NOT use in application code, only in SAPIs where appropriate. */
+PHPAPI void php_output_set_status(zend_bool status TSRMLS_DC)
+{
+	OG(disable_output) = !status;
+}
+/* }}} */

 /* {{{ php_body_write
  * Write body part */
 PHPAPI int php_body_write(const char *str, uint str_length TSRMLS_DC)
 {
-	return OG(php_body_write)(str, str_length TSRMLS_CC);
+	return OG(php_body_write)(str, str_length TSRMLS_CC);
 }
 /* }}} */

@@ -219,7 +215,7 @@
 	 fclose(fp);
  }
 #endif
-
+
 	if (OG(active_ob_buffer).internal_output_handler) {
 		final_buffer = OG(active_ob_buffer).internal_output_handler_buffer;
 		final_buffer_length = OG(active_ob_buffer).internal_output_handler_buffer_size;
@@ -343,7 +339,7 @@
  */
 PHPAPI void php_start_implicit_flush(TSRMLS_D)
 {
-	OG(implicit_flush)=1;
+	OG(implicit_flush) = 1;
 }
 /* }}} */

@@ -351,15 +347,31 @@
  */
 PHPAPI void php_end_implicit_flush(TSRMLS_D)
 {
-	OG(implicit_flush)=0;
+	OG(implicit_flush) = 0;
 }
 /* }}} */

+/* {{{ char *php_get_output_start_filename(TSRMLS_D)
+ *  Return filename start output something */
+PHPAPI char *php_get_output_start_filename(TSRMLS_D)
+{
+	return OG(output_start_filename);
+}
+/* }}} */
+
+/* {{{ char *php_get_output_start_lineno(TSRMLS_D)
+ * Return line number start output something */
+PHPAPI int php_get_output_start_lineno(TSRMLS_D)
+{
+	return OG(output_start_lineno);
+}
+/* }}} */
+
 /* {{{ php_ob_set_internal_handler
  */
 PHPAPI void php_ob_set_internal_handler(php_output_handler_func_t internal_output_handler, uint buffer_size, char *handler_name, zend_bool erase TSRMLS_DC)
 {
-	if (OG(ob_nesting_level)==0 || OG(active_ob_buffer).internal_output_handler || strcmp(OG(active_ob_buffer).handler_name, OB_DEFAULT_HANDLER_NAME)) {
+	if (OG(ob_nesting_level) == 0 || OG(active_ob_buffer).internal_output_handler || strcmp(OG(active_ob_buffer).handler_name, OB_DEFAULT_HANDLER_NAME)) {
 		php_start_ob_buffer(NULL, buffer_size, erase TSRMLS_CC);
 	}

@@ -398,8 +410,7 @@
 /* 

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ acinclude.m4

[Jani Taskinen]

jani Fri, 19 Nov 2010 08:26:47 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=305553

Log:
- Merged check from trunk to prevent building multiple SAPIs (bug #52419)

Bug: http://bugs.php.net/52419 (Closed) Unable to compile PHP with both Apache2 
and FPM support
  
Changed paths:
U   php/php-src/branches/PHP_5_3/acinclude.m4

Modified: php/php-src/branches/PHP_5_3/acinclude.m4
===
--- php/php-src/branches/PHP_5_3/acinclude.m4   2010-11-19 05:30:04 UTC (rev 
305552)
+++ php/php-src/branches/PHP_5_3/acinclude.m4   2010-11-19 08:26:47 UTC (rev 
305553)
@@ -878,6 +878,17 @@
 dnl objects.
 dnl
 AC_DEFUN([PHP_SELECT_SAPI],[
+  if test $PHP_SAPI != default; then
+AC_MSG_ERROR([
+++
+|*** ATTENTION ***   |
+||
+| You've configured multiple SAPIs to be build. You can build only   |
+| one SAPI module and CLI binary at the same time.   |
+++
+])
+  fi
+
   PHP_SAPI=$1

   case $2 in

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

Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ NEWS

[Jani Taskinen]

Using # in front of some number seems to trigger the bug stuff instead of 
adding links to  viewvc.
Perhaps someone should enhance the SVNROOT/commit-bugs.php with rev trigger? :)

--Jani
 


On Nov 18, 2010, at 6:14 AM, Gustavo André dos Santos Lopes wrote:

 cataphract   Thu, 18 Nov 2010 04:14:49 +
 
 Revision: http://svn.php.net/viewvc?view=revisionrevision=305482
 
 Log:
 - Fixed NULL dereference in lex_scan on zend multibyte builds where the script
  had a flex incompatible encoding and there was no converter.
 #see rev #305464 and rev #305466.
 
 Bugs: http://bugs.php.net/305464 (error getting bug information)
  http://bugs.php.net/305466 (error getting bug information)
 
 Changed paths:
U   php/php-src/branches/PHP_5_3/NEWS
 
 Modified: php/php-src/branches/PHP_5_3/NEWS
 ===
 --- php/php-src/branches/PHP_5_3/NEWS 2010-11-18 04:09:02 UTC (rev 305481)
 +++ php/php-src/branches/PHP_5_3/NEWS 2010-11-18 04:14:49 UTC (rev 305482)
 @@ -61,6 +61,8 @@
 - Fixed covariance of return-by-ref constraints. (Etienne)
 - Fixed the filter extension accepting IPv4 octets with a leading 0 as that
   belongs to the unsupported dotted octal representation. (Gustavo)
 +- Fixed NULL dereference in lex_scan on zend multibyte builds where the 
 script
 +  had a flex incompatible encoding and there was no converter. (Gustavo)
 
 - Fixed bug #53335 (pdo_firebird did not implement rowCount()).
   (preeves at ibphoenix dot com)
 
 -- 
 PHP CVS Mailing List (http://www.php.net/)
 To unsubscribe, visit: http://www.php.net/unsub.php


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

[PHP-CVS] svn: /php/php-src/trunk/ acinclude.m4

[Jani Taskinen]

jani Thu, 18 Nov 2010 10:11:36 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=305487

Log:
- Fixed DTrace support in MacOSX (bug #53338)

Bug: http://bugs.php.net/53338 (Assigned) DTrace build config broken by Rev 
305329
  
Changed paths:
U   php/php-src/trunk/acinclude.m4

Modified: php/php-src/trunk/acinclude.m4
===
--- php/php-src/trunk/acinclude.m4  2010-11-18 09:02:51 UTC (rev 305486)
+++ php/php-src/trunk/acinclude.m4  2010-11-18 10:11:36 UTC (rev 305487)
@@ -2919,8 +2919,12 @@
 dnl header-file
   ac_hdrobj=$2

-dnl Add providerdesc.o in global objects
-  PHP_GLOBAL_OBJS=[$]PHP_GLOBAL_OBJS [$]ac_bdir[$]ac_provsrc.o
+dnl Add providerdesc.o into global objects when needed
+  case $host_alias in
+  *solaris*)
+PHP_GLOBAL_OBJS=[$]PHP_GLOBAL_OBJS [$]ac_bdir[$]ac_provsrc.o
+;;
+  esac

 dnl DTrace objects
   old_IFS=[$]IFS

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

[PHP-CVS] svn: /php/php-src/trunk/ UPGRADING UPGRADING.INTERNALS

[Jani Taskinen]

jani Thu, 18 Nov 2010 10:43:01 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=305490

Log:
- Added section for build system changes in UPGRADING.INTERNALS

Changed paths:
U   php/php-src/trunk/UPGRADING
U   php/php-src/trunk/UPGRADING.INTERNALS

Modified: php/php-src/trunk/UPGRADING
===
--- php/php-src/trunk/UPGRADING 2010-11-18 10:34:33 UTC (rev 305489)
+++ php/php-src/trunk/UPGRADING 2010-11-18 10:43:01 UTC (rev 305490)
@@ -224,10 +224,6 @@
 9. Changes in SAPI support
 ==

-- When adding new binary SAPI (executable, like CLI/CGI/FPM) use CLI
-  config.m4 and Makefile.frag files as templates and replace CLI/cli with
-  your SAPI name.
-
 - The REQUEST_TIME value inside server now returns a floating point number
   indicating the time with microsecond precision. All SAPIs providing this
   value should be returning float and not time_t.

Modified: php/php-src/trunk/UPGRADING.INTERNALS
===
--- php/php-src/trunk/UPGRADING.INTERNALS   2010-11-18 10:34:33 UTC (rev 
305489)
+++ php/php-src/trunk/UPGRADING.INTERNALS   2010-11-18 10:43:01 UTC (rev 
305490)
@@ -12,6 +12,11 @@
   g. leak_variable
   h. API Signature changes

+2. Build system changes
+  a. Unix build system changes
+  b. Windows build system changes
+
+
 
 1. Internal API changes
 
@@ -22,6 +27,7 @@
 CWD_API int virtual_file_ex(cwd_state *state, const char *path,
  verify_path_func verify_path, int use_realpath TSRLS_DC);

+
b. stat/lstat support

 lstat is now available on all platforms. On unix-like platform
@@ -29,6 +35,7 @@
 available using php_sys_lstat. php_sys_stat and php_sys_lstat usage is 
recommended
 instead of calling lstat directly, to ensure portability.

+
c. readlink support

 readlink is now available on all platforms. On unix-like platform
@@ -36,6 +43,7 @@
 available using php_sys_readlink. php_sys_readlink usage is recommended
 instead of calling readlink directly, to ensure portability.

+
d. layout of some core ZE structures (zend_op_array, zend_class_entry, 
...)

 . zend_function.pass_rest_by_reference is replaced by
@@ -59,7 +67,9 @@
   by different information for internal and user classes.
   See zend_class_inttry.info union.

+
e. Zend\zend_fast_cache.h
+
 It should not have been used anymore since php5, but now this header has
 been removed. The following macros are not available anymore:

@@ -70,7 +80,9 @@

 Use emalloc, emalloc_rel, efree or efree_rel instead.

+
f. Streams that enclose private streams
+
 Some streams, like the temp:// stream, may enclose private streams. If the
 outer stream leaks due to a programming error or is not exposed through a
 zval (and therefore is not deleted when all the zvals are gone), it will
@@ -111,13 +123,17 @@
 php_stream_encloses with the 2nd argument NULL. If this is not done, there will
 be problems, so observe this requirement when using php_stream_encloses.

+
g. leak_variable
+
 The function leak_variable(variable [, leak_data]) was added. It is only
 available on debug builds. It increments the refcount of a zval or, if the
 second argument is true and the variable is either an object or a resource
 it increments the refcounts of those objects instead.

+
h. API Signature changes
+
 . zend_list_insert
   ZEND_API int zend_list_insert(void *ptr, int type TSRMLS_DC);
   call: zend_list_insert(a, SOMETYPE TSRMLS_CC);
@@ -131,6 +147,10 @@
 . php_stream_context_alloc
   PHPAPI php_stream_context *php_stream_context_alloc(TSRMLS_D);
   call: context  = php_stream_context_alloc(TSRMLS_C);
+
+. sapi_get_request_time(TSRMLS_D);
+  SAPI_API double sapi_get_request_time(TSRMLS_D);
+
 . sapi_register_default_post_reader
   SAPI_API int sapi_register_default_post_reader(void 
(*default_post_reader)(TSRMLS_D) TSRMLS_DC);

@@ -163,3 +183,21 @@

 . php_unescape_html_entities
   PHPAPI char *php_unescape_html_entities(unsigned char *old, size_t oldlen, 
size_t *newlen, int all, int flags, char *hint_charset TSRMLS_DC);
+
+
+
+2. Build system changes
+
+
+  a. Unix build system changes
+
+- Changes in SAPI module build:
+  . When adding new binary SAPI (executable, like CLI/CGI/FPM) use CLI 
config.m4 and Makefile.frag files as templates and replace CLI/cli with your 
SAPI name.
+
+- New macros:
+  . PHP_INIT_DTRACE(providerdesc, header-file, sources [, module])
+
+
+  b. Windows build system changes
+-
+

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

[PHP-CVS] svn: /php/php-src/trunk/ acinclude.m4

[Jani Taskinen]

jani Thu, 18 Nov 2010 16:02:37 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=305508

Log:
- One more fix for bug #53338 (when copying stuff from other macros, do it all 
the way.. :)

Bug: http://bugs.php.net/53338 (Assigned) DTrace build config broken by Rev 
305329
  
Changed paths:
U   php/php-src/trunk/acinclude.m4

Modified: php/php-src/trunk/acinclude.m4
===
--- php/php-src/trunk/acinclude.m4  2010-11-18 15:22:22 UTC (rev 305507)
+++ php/php-src/trunk/acinclude.m4  2010-11-18 16:02:37 UTC (rev 305508)
@@ -2903,9 +2903,9 @@
 AC_DEFUN([PHP_INIT_DTRACE],[
 dnl Set paths properly when called from extension
   case $4 in
-[)] unset ac_bdir;;
-/*[)] ac_bdir=$ac_srcdir;;
-*[)] extdir=PHP_EXT_DIR($3); ac_bdir=$extdir/;;
+[)] ac_srcdir=$abs_srcdir/; unset ac_bdir;;
+/*[)] ac_srcdir=`echo $4|cut -c 2-`/; ac_bdir=$ac_srcdir;;
+*[)] ac_srcdir=$abs_srcdir/$1/; ac_bdir=$4/;;
   esac

 dnl providerdesc

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

[PHP-CVS] svn: /php/php-src/trunk/main/ php_variables.c

[Jani Taskinen]

jani Wed, 17 Nov 2010 11:55:37 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=305452

Log:
- Cleanup

Changed paths:
U   php/php-src/trunk/main/php_variables.c

Modified: php/php-src/trunk/main/php_variables.c
===
--- php/php-src/trunk/main/php_variables.c  2010-11-17 09:58:43 UTC (rev 
305451)
+++ php/php-src/trunk/main/php_variables.c  2010-11-17 11:55:37 UTC (rev 
305452)
@@ -816,7 +816,7 @@
array_init(form_variables);
INIT_PZVAL(form_variables);

-   if(PG(request_order) != NULL) {
+   if (PG(request_order) != NULL) {
p = PG(request_order);
} else {
p = PG(variables_order);
@@ -854,13 +854,13 @@

 void php_startup_auto_globals(TSRMLS_D)
 {
-   zend_register_auto_global(_GET, sizeof(_GET)-1, 0, 
php_auto_globals_create_get TSRMLS_CC);
-   zend_register_auto_global(_POST, sizeof(_POST)-1, 0, 
php_auto_globals_create_post TSRMLS_CC);
-   zend_register_auto_global(_COOKIE, sizeof(_COOKIE)-1, 0, 
php_auto_globals_create_cookie TSRMLS_CC);
-   zend_register_auto_global(_SERVER, sizeof(_SERVER)-1, 
PG(auto_globals_jit), php_auto_globals_create_server TSRMLS_CC);
-   zend_register_auto_global(_ENV, sizeof(_ENV)-1, 
PG(auto_globals_jit), php_auto_globals_create_env TSRMLS_CC);
-   zend_register_auto_global(_REQUEST, sizeof(_REQUEST)-1, 
PG(auto_globals_jit), php_auto_globals_create_request TSRMLS_CC);
-   zend_register_auto_global(_FILES, sizeof(_FILES)-1, 0, 
php_auto_globals_create_files TSRMLS_CC);
+   zend_register_auto_global(ZEND_STRL(_GET), 0, 
php_auto_globals_create_get TSRMLS_CC);
+   zend_register_auto_global(ZEND_STRL(_POST), 0, 
php_auto_globals_create_post TSRMLS_CC);
+   zend_register_auto_global(ZEND_STRL(_COOKIE), 0, 
php_auto_globals_create_cookie TSRMLS_CC);
+   zend_register_auto_global(ZEND_STRL(_SERVER), PG(auto_globals_jit), 
php_auto_globals_create_server TSRMLS_CC);
+   zend_register_auto_global(ZEND_STRL(_ENV), PG(auto_globals_jit), 
php_auto_globals_create_env TSRMLS_CC);
+   zend_register_auto_global(ZEND_STRL(_REQUEST), PG(auto_globals_jit), 
php_auto_globals_create_request TSRMLS_CC);
+   zend_register_auto_global(ZEND_STRL(_FILES), 0, 
php_auto_globals_create_files TSRMLS_CC);
 }

 /*

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

[PHP-CVS] svn: /php/php-src/trunk/ext/standard/ info.c

[Jani Taskinen]

jani Wed, 17 Nov 2010 11:56:48 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=305453

Log:
- Fixed wrong type causing crash (in php-cgi -i and phpinfo(); when doing HTML 
output)

Changed paths:
U   php/php-src/trunk/ext/standard/info.c

Modified: php/php-src/trunk/ext/standard/info.c
===
--- php/php-src/trunk/ext/standard/info.c   2010-11-17 11:55:37 UTC (rev 
305452)
+++ php/php-src/trunk/ext/standard/info.c   2010-11-17 11:56:48 UTC (rev 
305453)
@@ -73,7 +73,8 @@

 static int php_info_print_html_esc(const char *str, int len) /* {{{ */
 {
-   int new_len, written;
+   size_t new_len;
+   int written;
char *new_str;
TSRMLS_FETCH();

@@ -299,7 +300,7 @@
  */
 PHPAPI char *php_info_html_esc(char *string TSRMLS_DC)
 {
-   int new_len;
+   size_t new_len;
return php_escape_html_entities(string, strlen(string), new_len, 0, 
ENT_QUOTES, NULL TSRMLS_CC);
 }
 /* }}} */
@@ -880,13 +881,13 @@
if (zend_hash_find(EG(symbol_table), PHP_AUTH_PW, 
sizeof(PHP_AUTH_PW), (void **) data) != FAILURE) {
php_info_print_table_row(2, PHP_AUTH_PW, 
Z_STRVAL_PP(data));
}
-   php_print_gpcse_array(_REQUEST, sizeof(_REQUEST)-1 
TSRMLS_CC);
-   php_print_gpcse_array(_GET, sizeof(_GET)-1 TSRMLS_CC);
-   php_print_gpcse_array(_POST, sizeof(_POST)-1 TSRMLS_CC);
-   php_print_gpcse_array(_FILES, sizeof(_FILES)-1 TSRMLS_CC);
-   php_print_gpcse_array(_COOKIE, sizeof(_COOKIE)-1 TSRMLS_CC);
-   php_print_gpcse_array(_SERVER, sizeof(_SERVER)-1 TSRMLS_CC);
-   php_print_gpcse_array(_ENV, sizeof(_ENV)-1 TSRMLS_CC);
+   php_print_gpcse_array(ZEND_STRL(_REQUEST) TSRMLS_CC);
+   php_print_gpcse_array(ZEND_STRL(_GET) TSRMLS_CC);
+   php_print_gpcse_array(ZEND_STRL(_POST) TSRMLS_CC);
+   php_print_gpcse_array(ZEND_STRL(_FILES) TSRMLS_CC);
+   php_print_gpcse_array(ZEND_STRL(_COOKIE) TSRMLS_CC);
+   php_print_gpcse_array(ZEND_STRL(_SERVER) TSRMLS_CC);
+   php_print_gpcse_array(ZEND_STRL(_ENV) TSRMLS_CC);
php_info_print_table_end();
}


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

[PHP-CVS] svn: /php/php-src/trunk/ acinclude.m4

[Jani Taskinen]

jani Wed, 17 Nov 2010 13:01:53 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=305455

Log:
- Fix building SAPI module

Changed paths:
U   php/php-src/trunk/acinclude.m4

Modified: php/php-src/trunk/acinclude.m4
===
--- php/php-src/trunk/acinclude.m4  2010-11-17 12:13:06 UTC (rev 305454)
+++ php/php-src/trunk/acinclude.m4  2010-11-17 13:01:53 UTC (rev 305455)
@@ -830,8 +830,6 @@
   shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) 
'$pic_setting
   shared_cxx_post=
   shared_lo=lo
-
-  php_sapi_module=program
 ])

 dnl
@@ -901,19 +899,18 @@

   PHP_INSTALLED_SAPIS=$PHP_INSTALLED_SAPIS $1

-  case $2 in
-  static[)] PHP_BUILD_STATIC;;
-  shared[)] PHP_BUILD_SHARED;;
-  bundle[)] PHP_BUILD_BUNDLE;;
-  program[)] PHP_BUILD_PROGRAM;;
-  esac
-
   ifelse($2,program,[
+PHP_BUILD_PROGRAM
 install_binaries=install-binaries
 install_binary_targets=$install_binary_targets install-$1
 PHP_SUBST(PHP_[]translit($1,a-z0-9-,A-Z0-9_)[]_OBJS)
 
ifelse($3,,,[PHP_ADD_SOURCES_X([sapi/$1],[$3],[$4],PHP_[]translit($1,a-z0-9-,A-Z0-9_)[]_OBJS)])
   ],[
+case $2 in
+static[)] PHP_BUILD_STATIC;;
+shared[)] PHP_BUILD_SHARED;;
+bundle[)] PHP_BUILD_BUNDLE;;
+esac
 install_sapi=install-sapi
 ifelse($3,,,[PHP_ADD_SOURCES([sapi/$1],[$3],[$4],[sapi])])
   ])
@@ -2937,14 +2934,14 @@
   done;

   case [$]php_sapi_module in
-  program|static)
-dtrace_objs='$(PHP_DTRACE_OBJS:.lo=.o)'
-;;
-  *)
+  shared[)]
 for ac_lo in $PHP_DTRACE_OBJS; do
   dtrace_objs=[$]dtrace_objs `echo $ac_lo | $SED -e 's,\.lo$,.o,' -e 
's#\(.*\)\/#\1\/.libs\/#'`
 done;
 ;;
+  *[)]
+dtrace_objs='$(PHP_DTRACE_OBJS:.lo=.o)'
+;;
   esac

 dnl Generate Makefile.objects entries

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

[PHP-CVS] svn: /php/php-src/trunk/ UPGRADING

[Jani Taskinen]

jani Wed, 17 Nov 2010 14:07:54 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=305456

Log:
- Added comment about binary SAPIs

Changed paths:
U   php/php-src/trunk/UPGRADING

Modified: php/php-src/trunk/UPGRADING
===
--- php/php-src/trunk/UPGRADING 2010-11-17 13:01:53 UTC (rev 305455)
+++ php/php-src/trunk/UPGRADING 2010-11-17 14:07:54 UTC (rev 305456)
@@ -224,6 +224,10 @@
 9. Changes in SAPI support
 ==

+- When adding new binary SAPI (executable, like CLI/CGI/FPM) use CLI
+  config.m4 and Makefile.frag files as templates and replace CLI/cli with
+  your SAPI name.
+
 - The REQUEST_TIME value inside server now returns a  floating point number
   indicating the time with microsecond precision. All SAPIs provinding this
   value should be returning float and not time_t.

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

[PHP-CVS] svn: /php/php-src/trunk/ UPGRADING

[Jani Taskinen]

jani Wed, 17 Nov 2010 14:08:39 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=305457

Log:
typo

Changed paths:
U   php/php-src/trunk/UPGRADING

Modified: php/php-src/trunk/UPGRADING
===
--- php/php-src/trunk/UPGRADING 2010-11-17 14:07:54 UTC (rev 305456)
+++ php/php-src/trunk/UPGRADING 2010-11-17 14:08:39 UTC (rev 305457)
@@ -228,8 +228,8 @@
   config.m4 and Makefile.frag files as templates and replace CLI/cli with
   your SAPI name.

-- The REQUEST_TIME value inside server now returns a  floating point number
-  indicating the time with microsecond precision. All SAPIs provinding this
+- The REQUEST_TIME value inside server now returns a floating point number
+  indicating the time with microsecond precision. All SAPIs providing this
   value should be returning float and not time_t.

 =

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

[PHP-CVS] svn: /php/php-src/trunk/main/ main.c

[Jani Taskinen]

jani Wed, 17 Nov 2010 14:09:46 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=305458

Log:
- Fix possible crashes in 64bit builds caused by usage of int instead of size_t

Changed paths:
U   php/php-src/trunk/main/main.c

Modified: php/php-src/trunk/main/main.c
===
--- php/php-src/trunk/main/main.c   2010-11-17 14:08:39 UTC (rev 305457)
+++ php/php-src/trunk/main/main.c   2010-11-17 14:09:46 UTC (rev 305458)
@@ -623,8 +623,9 @@

/* get error text into buffer and escape for html if necessary */
buffer_len = vspprintf(buffer, 0, format, args);
+
if (PG(html_errors)) {
-   int len;
+   size_t len;
char *replace = php_escape_html_entities(buffer, buffer_len, 
len, 0, ENT_COMPAT, NULL TSRMLS_CC);
efree(buffer);
buffer = replace;
@@ -682,7 +683,7 @@
}

if (PG(html_errors)) {
-   int len;
+   size_t len;
char *replace = php_escape_html_entities(origin, origin_len, 
len, 0, ENT_COMPAT, NULL TSRMLS_CC);
efree(origin);
origin = replace;
@@ -981,7 +982,7 @@

if (PG(html_errors)) {
if (type == E_ERROR) {
-   int len;
+   size_t len;
char *buf = 
php_escape_html_entities(buffer, buffer_len, len, 0, ENT_COMPAT, NULL 
TSRMLS_CC);
php_printf(%sbr 
/\nb%s/b:  %s in b%s/b on line b%d/bbr /\n%s, 
STR_PRINT(prepend_string), error_type_str, buf, error_filename, error_lineno, 
STR_PRINT(append_string));
efree(buf);

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

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/spl/tests/spl_fileinfo_getlinktarget_basic.phpt trunk/ext/spl/tests/spl_fileinfo_getlinktarget_basic.phpt

[Jani Taskinen]

jani Wed, 17 Nov 2010 14:54:37 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=305462

Log:
- Fix test

Changed paths:
U   
php/php-src/branches/PHP_5_3/ext/spl/tests/spl_fileinfo_getlinktarget_basic.phpt
U   php/php-src/trunk/ext/spl/tests/spl_fileinfo_getlinktarget_basic.phpt

Modified: 
php/php-src/branches/PHP_5_3/ext/spl/tests/spl_fileinfo_getlinktarget_basic.phpt
===
--- 
php/php-src/branches/PHP_5_3/ext/spl/tests/spl_fileinfo_getlinktarget_basic.phpt
2010-11-17 14:49:26 UTC (rev 305461)
+++ 
php/php-src/branches/PHP_5_3/ext/spl/tests/spl_fileinfo_getlinktarget_basic.phpt
2010-11-17 14:54:37 UTC (rev 305462)
@@ -8,7 +8,7 @@
 ?
 --FILE--
 ?php
-$link = 'test_link';
+$link = __DIR__ . '/test_link';
 symlink(__FILE__, $link );
 $fileInfo = new SplFileInfo($link);


Modified: php/php-src/trunk/ext/spl/tests/spl_fileinfo_getlinktarget_basic.phpt
===
--- php/php-src/trunk/ext/spl/tests/spl_fileinfo_getlinktarget_basic.phpt   
2010-11-17 14:49:26 UTC (rev 305461)
+++ php/php-src/trunk/ext/spl/tests/spl_fileinfo_getlinktarget_basic.phpt   
2010-11-17 14:54:37 UTC (rev 305462)
@@ -8,7 +8,7 @@
 ?
 --FILE--
 ?php
-$link = 'test_link';
+$link = __DIR__ . '/test_link';
 symlink(__FILE__, $link );
 $fileInfo = new SplFileInfo($link);


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

[PHP-CVS] svn: /php/php-src/trunk/tests/basic/ bug46313.phpt

[Jani Taskinen]

jani Wed, 17 Nov 2010 15:00:51 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=305463

Log:
- Fix test: register_globals is gone

Changed paths:
U   php/php-src/trunk/tests/basic/bug46313.phpt

Modified: php/php-src/trunk/tests/basic/bug46313.phpt
===
--- php/php-src/trunk/tests/basic/bug46313.phpt 2010-11-17 14:54:37 UTC (rev 
305462)
+++ php/php-src/trunk/tests/basic/bug46313.phpt 2010-11-17 15:00:51 UTC (rev 
305463)
@@ -22,10 +22,6 @@
 --FILE--
 ?php
 var_dump($_FILES);
-var_dump($GLOBALS[o1\'file_name]);
-var_dump($GLOBALS[o1\'file_name] === $_FILES[o1\'file][name]);
-var_dump($GLOBALS[o1\'file]);
-var_dump($GLOBALS[o1\'file] === $_FILES[o1\'file][tmp_name]);
 ?
 --EXPECTF--
 array(2) {
@@ -56,7 +52,3 @@
 int(1)
   }
 }
-string(12) o1\'file.png
-bool(true)
-string(%d) %s
-bool(true)

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

[PHP-CVS] svn: /php/php-src/trunk/ NEWS

[Jani Taskinen]

jani Wed, 17 Nov 2010 16:56:21 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=305465

Log:
- NEWS cleanup, please do not mess it anymore :)

Changed paths:
U   php/php-src/trunk/NEWS

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

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ run-tests.php

[Jani Taskinen]

jani Sat, 13 Nov 2010 10:18:35 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=305310

Log:
- Sync with trunk

Changed paths:
U   php/php-src/branches/PHP_5_3/run-tests.php

Modified: php/php-src/branches/PHP_5_3/run-tests.php
===
--- php/php-src/branches/PHP_5_3/run-tests.php  2010-11-13 07:47:27 UTC (rev 
305309)
+++ php/php-src/branches/PHP_5_3/run-tests.php  2010-11-13 10:18:35 UTC (rev 
305310)
@@ -197,7 +197,7 @@
 if (getenv('TEST_PHP_LOG_FORMAT')) {
$log_format = strtoupper(getenv('TEST_PHP_LOG_FORMAT'));
 } else {
-   $log_format = 'LEOD';
+   $log_format = 'LEODS';
 }

 // Check whether a detailed log is wanted.
@@ -1352,6 +1352,7 @@
$exp_filename  = $temp_dir . DIRECTORY_SEPARATOR . $main_file_name 
. 'exp';
$output_filename   = $temp_dir . DIRECTORY_SEPARATOR . $main_file_name 
. 'out';
$memcheck_filename = $temp_dir . DIRECTORY_SEPARATOR . $main_file_name 
. 'mem';
+   $sh_filename   = $temp_dir . DIRECTORY_SEPARATOR . $main_file_name 
. 'sh';
$temp_file = $temp_dir . DIRECTORY_SEPARATOR . $main_file_name 
. 'php';
$test_file = $test_dir . DIRECTORY_SEPARATOR . $main_file_name 
. 'php';
$temp_skipif   = $temp_dir . DIRECTORY_SEPARATOR . $main_file_name 
. 'skip.php';
@@ -1382,6 +1383,7 @@
'exp'  = $exp_filename,
'out'  = $output_filename,
'mem'  = $memcheck_filename,
+   'sh'   = $sh_filename,
'php'  = $temp_file,
'skip' = $temp_skipif,
'clean'= $temp_clean);
@@ -1398,6 +1400,7 @@
@unlink($exp_filename);
@unlink($output_filename);
@unlink($memcheck_filename);
+   @unlink($sh_filename);
@unlink($temp_file);
@unlink($test_file);
@unlink($temp_skipif);
@@ -1959,6 +1962,15 @@
error(Cannot create test diff - $diff_filename);
}

+   // write .sh
+   if (strpos($log_format, 'S') !== false  
file_put_contents($sh_filename, b#!/bin/sh
+
+{$cmd}
+, FILE_BINARY) === false) {
+   error(Cannot create test shell script - $sh_filename);
+   }
+   chmod($sh_filename, 0755);
+
// write .log
if (strpos($log_format, 'L') !== false  
file_put_contents($log_filename, b
  EXPECTED OUTPUT

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

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ acinclude.m4 configure.in

[Jani Taskinen]

jani Sat, 13 Nov 2010 11:07:38 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=305311

Log:
- WS

Changed paths:
U   php/php-src/branches/PHP_5_3/acinclude.m4
U   php/php-src/branches/PHP_5_3/configure.in

Modified: php/php-src/branches/PHP_5_3/acinclude.m4
===
--- php/php-src/branches/PHP_5_3/acinclude.m4   2010-11-13 10:18:35 UTC (rev 
305310)
+++ php/php-src/branches/PHP_5_3/acinclude.m4   2010-11-13 11:07:38 UTC (rev 
305311)
@@ -2661,13 +2661,13 @@
   for arg in $ac_configure_args; do
  if test `expr -- $arg : '.*` = 0; then
 if test `expr -- $arg : --.*` = 0; then
- break;
+  break;
 fi
 echo '[$]arg' \\  $1
 CONFIGURE_OPTIONS=$CONFIGURE_OPTIONS '[$]arg'
  else
 if test `expr -- $arg : '--.*` = 0; then
- break;
+  break;
 fi
 echo [$]arg \\  $1
 CONFIGURE_OPTIONS=$CONFIGURE_OPTIONS [$]arg
@@ -2687,19 +2687,19 @@
   for arg in $ac_configure_args; do
 case $arg in
   --with-*[)]
-   arg_name=`echo [$]arg | $SED -e 's/--with-/with-/g' -e 's/=.*//g'`
+arg_name=`echo [$]arg | $SED -e 's/--with-/with-/g' -e 's/=.*//g'`
 ;;
   --without-*[)]
-   arg_name=`echo [$]arg | $SED -e 's/--without-/with-/g' -e 's/=.*//g'`
+arg_name=`echo [$]arg | $SED -e 's/--without-/with-/g' -e 's/=.*//g'`
 ;;
   --enable-*[)]
-   arg_name=`echo [$]arg | $SED -e 's/--enable-/enable-/g' -e 's/=.*//g'`
+arg_name=`echo [$]arg | $SED -e 's/--enable-/enable-/g' -e 
's/=.*//g'`
 ;;
   --disable-*[)]
-   arg_name=`echo [$]arg | $SED -e 's/--disable-/enable-/g' -e 
's/=.*//g'`
+arg_name=`echo [$]arg | $SED -e 's/--disable-/enable-/g' -e 
's/=.*//g'`
 ;;
   *[)]
-   continue
+continue
 ;;
 esac
 case $arg_name in

Modified: php/php-src/branches/PHP_5_3/configure.in
===
--- php/php-src/branches/PHP_5_3/configure.in   2010-11-13 10:18:35 UTC (rev 
305310)
+++ php/php-src/branches/PHP_5_3/configure.in   2010-11-13 11:07:38 UTC (rev 
305311)
@@ -1329,8 +1329,8 @@
 dnl This hack works around it. Ugly.
 case $host_alias in
 *darwin9*|*darwin10*)
-   ac_cv_exeext=
-   ;;
+  ac_cv_exeext=
+  ;;
 esac

 dnl Only allow AC_PROG_CXX and AC_PROG_CXXCPP if they are explicitly called 
(by PHP_REQUIRE_CXX).

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

[PHP-CVS] svn: /php/php-src/trunk/ NEWS acinclude.m4 configure.in

[Jani Taskinen]

jani Sat, 13 Nov 2010 11:12:07 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=305312

Log:
- WS + cleanup
# Note:
# Considering DTrace support: Why does it really need any configure time stuff?
# 3 macros for static stuff that could be made much cleaner with simple 
Makefile.dtrace
# addition. The only thing required in configure is that --enable flag part..
#

Bug: http://bugs.php.net/3 (Closed) extern for errno missing in debugger.c
  
Changed paths:
U   php/php-src/trunk/NEWS
U   php/php-src/trunk/acinclude.m4
U   php/php-src/trunk/configure.in

Modified: php/php-src/trunk/NEWS
===
--- php/php-src/trunk/NEWS  2010-11-13 11:07:38 UTC (rev 305311)
+++ php/php-src/trunk/NEWS  2010-11-13 11:12:07 UTC (rev 305312)
@@ -1,14 +1,17 @@
-PHP
NEWS
+PHPNEWS
 |||
 ?? ??? 201?, PHP 5.3.99
 - Upgraded bundled sqlite to version 3.7.3. (Ilia)
 - Upgraded bundled PCRE to version 8.10. (Ilia)

-- Updated _SERVER['REQUEST_TIME'] to include microsecond precision. (Ilia)
+- Changed $_SERVER['REQUEST_TIME'] to include microsecond precision. (Ilia)
+
 - Added apache compatible functions (apache_child_terminate, getallheaders,
-  apache_request_headers, apache_response_headers) to FastCGI SAPI (Dmitry)
+  apache_request_headers, apache_response_headers) to FastCGI SAPI. (Dmitry)
+
 - Added caches to eliminate repeatable run-time bindings of functions, classes,
-  constants, methods and properties (Dmitry)
+  constants, methods and properties. (Dmitry)
+
 - Added a number of small performance tweaks and optimizations (Dmitry)
   . ZEND_RECV now always has IS_CV as its result
   . ZEND_CATCH now has to be used only with constant class names
@@ -30,44 +33,55 @@
 required after them instead.
   . improved performance of FastCGI request parsing
   . improved performance of @ (silence) operator
+
 - Added concept of interned strings. All strings constants known at compile
   time are allocated in a single copy and never changed. (Dmitry)
 - Added an optimization which saves memory and emalloc/efree calls for empty
-  HashTables (Stas, Dmitry)
+  HashTables. (Stas, Dmitry)

-- Added named pipes support in mysqlnd (Request#48082). (Andrey)
+- Added named pipes support in mysqlnd (FR #48082). (Andrey)
 - Added support for Traits. (Stefan)
 - Added array dereferencing support. (Felipe)
 - Added DTrace support. (David Soria Parra)
 - Added Tokyo Cabinet abstract DB support to ext/dba. (Michael Maclean)
+- Added Berkeley DB 5 support to the DBA extension (Johannes, Chris Jones)
+
 - Added Jenkins's one-at-a-time hash support to ext/hash. (Martin Jansen)
 - Added FNV-1 hash support to ext/hash. (Michael Maclean)
-- Added ReflectionExtension::isTemporary() and
-  ReflectionExtension::isPersistent(). (Johannes)
+
+- Added ReflectionExtension::isTemporary() and 
ReflectionExtension::isPersistent(). (Johannes)
 - Added ReflectionZendExtension class. (Johannes)
 - Added ReflectionClass::isCloneable(). (Felipe)
+
 - Added command line option --rz to CLI. (Johannes)
+
 - Added closure $this support back. (Stas)
+
 - Added SplObjectStorage::getHash() hook. (Etienne)
-- Added JsonSerializable interface (Sara)
+
+- Added JsonSerializable interface. (Sara)
 - Added JSON_BIGINT_AS_STRING, extended json_decode() sig with $options. (Sara)
+- Added support for JSON_NUMERIC_CHECK option in json_encode() that converts
+  numeric strings to integers. (Ilia)
+
 - Added support for storing upload progress feedback in session data. (Arnaud)
 - Added nextRowset support for PDO_dblib. (Stanley)
+
 - Added support for CURLOPT_MAX_RECV_SPEED_LARGE and 
CURLOPT_MAX_SEND_SPEED_LARGE.
-  FR #51815. (Pierrick)
+  (FR #51815). (Pierrick)
+
 - Added iterator support in MySQLi. mysqli_result implements Traversable.
   (Andrey, Johannes)
+
 - Added scalar typehints to the parser and the reflection API. (Ilia, Derick)
-- Added support for JSON_NUMERIC_CHECK option in json_encode() that converts
-  numeric strings to integers. (Ilia)
-- Added support for object references in recursive serialize() calls. FR 
#36424.
-  (Mike)
-- Added Berkeley DB 5 support to the DBA extension (Johannes, Chris Jones)

+- Added support for object references in recursive serialize() calls. (FR 
#36424). (Mike)
+
 - default_charset if not specified is now UTF-8 instead of ISO-8859-1. (Rasmus)

 - Changed the structure of op_array.opcodes. The constant values are moved from
   opcode operands into a separate literal table. (Dmitry)
+
 - Changed session.entropy_file to default to /dev/urandom or /dev/arandom if
   either is present at compile time. (Rasmus)

@@ -142,6 +156,7 @@
 - Fixed bug #52211 (iconv() returns part of string on 

[PHP-CVS] svn: /php/php-src/trunk/ acinclude.m4 configure.in

[Jani Taskinen]

jani Sat, 13 Nov 2010 22:22:51 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=305329

Log:
- Simplified the DTrace configure macros, one is enough

Changed paths:
U   php/php-src/trunk/acinclude.m4
U   php/php-src/trunk/configure.in

Modified: php/php-src/trunk/acinclude.m4
===
--- php/php-src/trunk/acinclude.m4  2010-11-13 19:50:55 UTC (rev 305328)
+++ php/php-src/trunk/acinclude.m4  2010-11-13 22:22:51 UTC (rev 305329)
@@ -711,10 +711,7 @@
 AC_ARG_WITH($1,[$3],$5=[$]withval,
 [
   $5=ifelse($4,,no,$4)
-
-  if test $PHP_ENABLE_ALL  test $6 = yes; then
-$5=$PHP_ENABLE_ALL
-  fi
+  ifelse($6,yes,[test $PHP_ENABLE_ALL  $5=$PHP_ENABLE_ALL])
 ])
 PHP_ARG_ANALYZE($5,[$2],$6)
 ])
@@ -739,10 +736,7 @@
 AC_ARG_ENABLE($1,[$3],$5=[$]enableval,
 [
   $5=ifelse($4,,no,$4)
-
-  if test $PHP_ENABLE_ALL  test $6 = yes; then
-$5=$PHP_ENABLE_ALL
-  fi
+  ifelse($6,yes,[test $PHP_ENABLE_ALL  $5=$PHP_ENABLE_ALL])
 ])
 PHP_ARG_ANALYZE($5,[$2],$6)
 ])
@@ -2883,43 +2877,33 @@
 ])

 dnl
-dnl Generate dtrace targets
+dnl PHP_INIT_DTRACE(providerdesc, header-file, sources [, module])
 dnl
-AC_DEFUN([PHP_GENERATE_DTRACE],[
+AC_DEFUN([PHP_INIT_DTRACE],[
+dnl Set paths properly when called from extension
+  case $4 in
+[)] unset ac_bdir;;
+/*[)] ac_bdir=$ac_srcdir;;
+*[)] extdir=PHP_EXT_DIR($3); ac_bdir=$extdir/;;
+  esac
+
+dnl providerdesc
+  ac_provsrc=$1
   old_IFS=[$]IFS
   IFS=.
-  set $ac_src
+  set $ac_provsrc
+  ac_provobj=[$]1
   IFS=$old_IFS
-  build_target=$2
-  PHP_GLOBAL_OBJS=[$]PHP_GLOBAL_OBJS $1.o
-  for src in $PHP_DTRACE_OBJS; do
-case [$]build_target in
-  program|static)
-obj=$obj `dirname $src`/`basename $src | sed 's,\.lo$,.o,'`  ;;
-  *)
-obj=$obj `dirname $src`/.libs/`basename $src | sed 's,\.lo$,.o,'`  ;;
-esac
-  done

-  cat Makefile.objectsEOF
-$1.o: \$(PHP_DTRACE_OBJS)
-   dtrace -G -o $abs_builddir/$1.o -s $abs_srcdir/$1 $obj
-EOF
+dnl header-file
+  ac_hdrobj=$2

-])
+dnl Add providerdesc.o in global objects
+  PHP_GLOBAL_OBJS=[$]PHP_GLOBAL_OBJS [$]ac_bdir[$]ac_provsrc.o

-dnl
-dnl Link given source files with dtrace
-dnl PHP_ADD_DTRACE(providerdesc, sources, module)
-dnl
-AC_DEFUN([PHP_ADD_DTRACE],[
-   case $3 in
-[)] unset ac_bdir;;
-/*[)] ac_bdir=$ac_srcdir;;
-*[)] extdir=PHP_EXT_DIR($3); ac_bdir=$extdir/;;
-esac
+dnl DTrace objects
   old_IFS=[$]IFS
-  for ac_src in $2; do
+  for ac_src in $3; do
 IFS=.
 set $ac_src
 ac_obj=[$]1
@@ -2927,16 +2911,28 @@

 PHP_DTRACE_OBJS=[$]PHP_DTRACE_OBJS [$]ac_bdir[$]ac_obj.lo
   done;
-])

-dnl
-dnl Generate platform specific dtrace header
-dnl
-AC_DEFUN([PHP_INIT_DTRACE], [
-  dtrace -h -C -s $abs_srcdir/$1 -o $abs_builddir/$2
-  if test $? != 0; then
-AC_MSG_ERROR([cannot create DTrace header file])
-  fi
-  $SED -ibak 's,PHP_,DTRACE_,g' $abs_builddir/$2
-])
+  case [$]php_build_target in
+  program|static)
+dtrace_objs='$(PHP_DTRACE_OBJS:.lo=.o)'
+;;
+  *)
+for ac_lo in $PHP_DTRACE_OBJS; do
+  dtrace_objs=[$]dtrace_objs `echo $ac_lo | $SED -e 's,\.lo$,.o,' -e 
's#\(.*\)\/#\1\/.libs\/#'`
+done;
+;;
+  esac

+dnl Generate Makefile.objects entries
+  catMakefile.objectsEOF
+
+$ac_bdir[$]ac_hdrobj: $abs_srcdir/$ac_provsrc
+   dtrace -h -C -s $ac_srcdir[$]ac_provsrc -o \$[]@  \$(SED) -ibak 
's,PHP_,DTRACE_,g' \$[]@
+
+\$(PHP_DTRACE_OBJS): $ac_bdir[$]ac_hdrobj
+
+$ac_bdir[$]ac_provsrc.o: \$(PHP_DTRACE_OBJS)
+   dtrace -G -o \$[]@ -s $abs_srcdir/$ac_provsrc $dtrace_objs
+
+EOF
+])

Modified: php/php-src/trunk/configure.in
===
--- php/php-src/trunk/configure.in  2010-11-13 19:50:55 UTC (rev 305328)
+++ php/php-src/trunk/configure.in  2010-11-13 22:22:51 UTC (rev 305329)
@@ -881,22 +881,21 @@

 dnl ##
 dnl ## DTRACE CHECKS
-dnl ## this needs to be done before SAPI configuration
+dnl ## Note: this has to be done after SAPI configuration!
 dnl ##
 PHP_ARG_ENABLE(dtrace, whether to enable DTrace support,
 [  --enable-dtrace Enable DTrace support], no, no)

 if test $PHP_DTRACE = yes; then
   AC_CHECK_HEADERS([sys/sdt.h], [
-PHP_ADD_DTRACE([Zend/zend_dtrace.d], [main/main.c, Zend/zend_API.c \
+PHP_INIT_DTRACE([Zend/zend_dtrace.d],[Zend/zend_dtrace_gen.h],[main/main.c 
Zend/zend_API.c \
   Zend/zend_execute.c Zend/zend_exceptions.c \
   Zend/zend_dtrace.c Zend/zend.c])
 AC_DEFINE(HAVE_DTRACE, 1, [Whether to enable DTrace support])
-PHP_INIT_DTRACE([Zend/zend_dtrace.d], [Zend/zend_dtrace_gen.h])
+PHP_SUBST(PHP_DTRACE_OBJS)
   ], [
 AC_MSG_ERROR([Cannot find sys/sdt.h which is required for DTrace support])
   ])
-  PHP_SUBST(PHP_DTRACE_OBJS)
 fi

 AC_MSG_CHECKING([how big to make fd sets])
@@ -1447,13 +1446,6 @@
 PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/Makefile.frag,$abs_srcdir/Zend,Zend)
 

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ acinclude.m4

[Jani Taskinen]

jani Sat, 13 Nov 2010 22:51:11 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=305330

Log:
- Using ifelse() here is safer, also eases debugging generated configure.

Changed paths:
U   php/php-src/branches/PHP_5_3/acinclude.m4

Modified: php/php-src/branches/PHP_5_3/acinclude.m4
===
--- php/php-src/branches/PHP_5_3/acinclude.m4   2010-11-13 22:22:51 UTC (rev 
305329)
+++ php/php-src/branches/PHP_5_3/acinclude.m4   2010-11-13 22:51:11 UTC (rev 
305330)
@@ -711,10 +711,7 @@
 AC_ARG_WITH($1,[$3],$5=[$]withval,
 [
   $5=ifelse($4,,no,$4)
-
-  if test $PHP_ENABLE_ALL  test $6 = yes; then
-$5=$PHP_ENABLE_ALL
-  fi
+  ifelse($6,yes,[test $PHP_ENABLE_ALL  $5=$PHP_ENABLE_ALL])
 ])
 PHP_ARG_ANALYZE($5,[$2],$6)
 ])
@@ -739,10 +736,7 @@
 AC_ARG_ENABLE($1,[$3],$5=[$]enableval,
 [
   $5=ifelse($4,,no,$4)
-
-  if test $PHP_ENABLE_ALL  test $6 = yes; then
-$5=$PHP_ENABLE_ALL
-  fi
+  ifelse($6,yes,[test $PHP_ENABLE_ALL  $5=$PHP_ENABLE_ALL])
 ])
 PHP_ARG_ANALYZE($5,[$2],$6)
 ])

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

[PHP-CVS] svn: /php/php-src/trunk/ Makefile.global NEWS acinclude.m4 configure.in sapi/cgi/Makefile.frag sapi/cgi/config9.m4 sapi/cli/Makefile.frag sapi/cli/config.m4 sapi/fpm/Makefile.frag sapi/fpm/c

[Jani Taskinen]

jani Sat, 13 Nov 2010 23:13:07 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=305331

Log:
- Implemented FR #53271, FR #52410 (Building multiple PHP binary SAPIs and one 
SAPI module the same time)
# Bug #53271, Bug #52410

Bugs: http://bugs.php.net/53271 (Open) --enable-fpm and --enable-cgi do not 
produce php-cgi binaries
  http://bugs.php.net/52410 (Bogus) Namespaces affects existing code after 
upgrade
  
Changed paths:
U   php/php-src/trunk/Makefile.global
U   php/php-src/trunk/NEWS
U   php/php-src/trunk/acinclude.m4
U   php/php-src/trunk/configure.in
U   php/php-src/trunk/sapi/cgi/Makefile.frag
U   php/php-src/trunk/sapi/cgi/config9.m4
U   php/php-src/trunk/sapi/cli/Makefile.frag
U   php/php-src/trunk/sapi/cli/config.m4
U   php/php-src/trunk/sapi/fpm/Makefile.frag
U   php/php-src/trunk/sapi/fpm/config.m4
U   php/php-src/trunk/sapi/litespeed/Makefile.frag
U   php/php-src/trunk/sapi/litespeed/config.m4
U   php/php-src/trunk/sapi/milter/Makefile.frag
U   php/php-src/trunk/sapi/milter/config.m4

Modified: php/php-src/trunk/Makefile.global
===
--- php/php-src/trunk/Makefile.global	2010-11-13 22:51:11 UTC (rev 305330)
+++ php/php-src/trunk/Makefile.global	2010-11-13 23:13:07 UTC (rev 305331)
@@ -13,6 +13,8 @@

 build-modules: $(PHP_MODULES) $(PHP_ZEND_EX)

+build-binaries: $(PHP_BINARIES)
+
 libphp$(PHP_MAJOR_VERSION).la: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
 	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
 	-...@$(LIBTOOL) --silent --mode=install cp $@ $(phptempdir)/$@ /dev/null 21
@@ -35,6 +37,8 @@
 	fi
 	@$(INSTALL_IT)

+install-binaries: build-binaries $(install_binary_targets)
+
 install-modules: build-modules
 	@test -d modules  \
 	$(mkinstalldirs) $(INSTALL_ROOT)$(EXTENSION_DIR)

Modified: php/php-src/trunk/NEWS
===
--- php/php-src/trunk/NEWS	2010-11-13 22:51:11 UTC (rev 305330)
+++ php/php-src/trunk/NEWS	2010-11-13 23:13:07 UTC (rev 305331)
@@ -136,6 +136,8 @@

 - Deprecated mysql_list_dbs() (Request #50667). (Andrey)

+- Implemented FR #53271, FR #52410 (Building multiple PHP binary SAPIs and
+  one SAPI module the same time). (Jani)
 - Implemented FR #53238 (Make third parameter of preg_match_all optional).
   (Adam)
 - Implemented FR #53213 (Adler32 algorithm is very slow).

Modified: php/php-src/trunk/acinclude.m4
===
--- php/php-src/trunk/acinclude.m4	2010-11-13 22:51:11 UTC (rev 305330)
+++ php/php-src/trunk/acinclude.m4	2010-11-13 23:13:07 UTC (rev 305331)
@@ -194,7 +194,7 @@
 dnl
 dnl which array to append to?
 AC_DEFUN([PHP_ADD_SOURCES],[
-  PHP_ADD_SOURCES_X($1, $2, $3, ifelse($4,cli,PHP_CLI_OBJS,ifelse($4,sapi,PHP_SAPI_OBJS,PHP_GLOBAL_OBJS)))
+  PHP_ADD_SOURCES_X($1, $2, $3, ifelse($4,sapi,PHP_SAPI_OBJS,PHP_GLOBAL_OBJS))
 ])

 dnl
@@ -777,7 +777,7 @@
 AC_DEFUN([PHP_BUILD_SHARED],[
   PHP_BUILD_PROGRAM
   OVERALL_TARGET=libphp[]$PHP_MAJOR_VERSION[.la]
-  php_build_target=shared
+  php_sapi_module=shared

   php_c_pre=$shared_c_pre
   php_c_meta=$shared_c_meta
@@ -794,7 +794,7 @@
 AC_DEFUN([PHP_BUILD_STATIC],[
   PHP_BUILD_PROGRAM
   OVERALL_TARGET=libphp[]$PHP_MAJOR_VERSION[.la]
-  php_build_target=static
+  php_sapi_module=static
 ])

 dnl
@@ -803,14 +803,13 @@
 AC_DEFUN([PHP_BUILD_BUNDLE],[
   PHP_BUILD_PROGRAM
   OVERALL_TARGET=libs/libphp[]$PHP_MAJOR_VERSION[.bundle]
-  php_build_target=static
+  php_sapi_module=static
 ])

 dnl
 dnl PHP_BUILD_PROGRAM
 dnl
 AC_DEFUN([PHP_BUILD_PROGRAM],[
-  OVERALL_TARGET=[]ifelse($1,,php,$1)
   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
   php_c_post=
@@ -832,7 +831,7 @@
   shared_cxx_post=
   shared_lo=lo

-  php_build_target=program
+  php_sapi_module=program
 ])

 dnl
@@ -878,21 +877,46 @@
 dnl
 dnl PHP_SELECT_SAPI(name, type[, sources [, extra-cflags [, build-target]]])
 dnl
-dnl Selects the SAPI name and type (static, shared, programm)
+dnl Selects the SAPI name and type (static, shared, bundle, program)
 dnl and optionally also the source-files for the SAPI-specific
 dnl objects.
 dnl
 AC_DEFUN([PHP_SELECT_SAPI],[
-  PHP_SAPI=$1
-
+  if test $2 = program; then
+PHP_BINARIES=$PHP_BINARIES $1
+  elif test $PHP_SAPI != none; then
+AC_MSG_ERROR([
+++
+|*** ATTENTION ***   |
+||
+| You've configured multiple SAPIs to be build. You can build only   |
+| one SAPI module plus CGI, CLI and FPM binaries at the same time.   |

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/configure.in branches/PHP_5_3/scripts/phpize.m4 trunk/configure.in trunk/scripts/phpize.m4

[Jani Taskinen]

jani Tue, 02 Nov 2010 09:58:08 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=305025

Log:
- Fixed -g adding for gcc and g++ (former got it twice, latter not at all)

Changed paths:
U   php/php-src/branches/PHP_5_3/configure.in
U   php/php-src/branches/PHP_5_3/scripts/phpize.m4
U   php/php-src/trunk/configure.in
U   php/php-src/trunk/scripts/phpize.m4

Modified: php/php-src/branches/PHP_5_3/configure.in
===
--- php/php-src/branches/PHP_5_3/configure.in   2010-11-02 09:33:19 UTC (rev 
305024)
+++ php/php-src/branches/PHP_5_3/configure.in   2010-11-02 09:58:08 UTC (rev 
305025)
@@ -764,7 +764,7 @@
   changequote([,])
   dnl add -O0 only if GCC or ICC is used
   if test $GCC = yes || test $ICC = yes; then
-CFLAGS=$CFLAGS -g -O0
+CFLAGS=$CFLAGS -O0
 CXXFLAGS=$CXXFLAGS -g -O0
   fi
   if test $SUNCC = yes; then

Modified: php/php-src/branches/PHP_5_3/scripts/phpize.m4
===
--- php/php-src/branches/PHP_5_3/scripts/phpize.m4  2010-11-02 09:33:19 UTC 
(rev 305024)
+++ php/php-src/branches/PHP_5_3/scripts/phpize.m4  2010-11-02 09:58:08 UTC 
(rev 305025)
@@ -111,7 +111,7 @@
   dnl add -O0 only if GCC or ICC is used
   if test $GCC = yes || test $ICC = yes; then
 CFLAGS=$CFLAGS -O0
-CXXFLAGS=$CXXFLAGS -O0
+CXXFLAGS=$CXXFLAGS -g -O0
   fi
   if test $SUNCC = yes; then
 if test -n $auto_cflags; then

Modified: php/php-src/trunk/configure.in
===
--- php/php-src/trunk/configure.in  2010-11-02 09:33:19 UTC (rev 305024)
+++ php/php-src/trunk/configure.in  2010-11-02 09:58:08 UTC (rev 305025)
@@ -764,7 +764,7 @@
   changequote([,])
   dnl add -O0 only if GCC or ICC is used
   if test $GCC = yes || test $ICC = yes; then
-CFLAGS=$CFLAGS -g -O0
+CFLAGS=$CFLAGS -O0
 CXXFLAGS=$CXXFLAGS -g -O0
   fi
   if test $SUNCC = yes; then

Modified: php/php-src/trunk/scripts/phpize.m4
===
--- php/php-src/trunk/scripts/phpize.m4 2010-11-02 09:33:19 UTC (rev 305024)
+++ php/php-src/trunk/scripts/phpize.m4 2010-11-02 09:58:08 UTC (rev 305025)
@@ -111,7 +111,7 @@
   dnl add -O0 only if GCC or ICC is used
   if test $GCC = yes || test $ICC = yes; then
 CFLAGS=$CFLAGS -O0
-CXXFLAGS=$CXXFLAGS -O0
+CXXFLAGS=$CXXFLAGS -g -O0
   fi
   if test $SUNCC = yes; then
 if test -n $auto_cflags; then

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

Re: [PHP-CVS] svn: /php/php-src/branches/ PHP_5_2/configure.in PHP_5_2/ext/standard/file.c PHP_5_2/main/SAPI.c PHP_5_2/main/SAPI.h PHP_5_2/main/rfc1867.c PHP_5_3/configure.in PHP_5_3/ext/standard/file

[Jani Taskinen]

Dude, you need to write a RFC first, then mail the RMs and wait for a reply 
which you quite likely will never get, then try same on the list and see nobody 
is interested.


Fun, isn't it? :D

--Jani


19.3.2010 0:37, Andrei Zmievski wrote:

andrei   Thu, 18 Mar 2010 22:37:25 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=296362

Log:
I am sorry I tried fixing PHP without extensive discussion on the mailing list.
I am sorry I tried fixing PHP without extensive discussion on the mailing list.
I am sorry I tried fixing PHP without extensive discussion on the mailing list.

Hope all the relevant parties are satisfied.

Changed paths:
 U   php/php-src/branches/PHP_5_2/configure.in
 U   php/php-src/branches/PHP_5_2/ext/standard/file.c
 U   php/php-src/branches/PHP_5_2/main/SAPI.c
 U   php/php-src/branches/PHP_5_2/main/SAPI.h
 U   php/php-src/branches/PHP_5_2/main/rfc1867.c
 U   php/php-src/branches/PHP_5_3/configure.in
 U   php/php-src/branches/PHP_5_3/ext/standard/file.c
 U   php/php-src/branches/PHP_5_3/main/SAPI.c
 U   php/php-src/branches/PHP_5_3/main/SAPI.h
 U   php/php-src/branches/PHP_5_3/main/rfc1867.c





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

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ README.NEW-OUTPUT-API Zend/zend_highlight.c Zend/zend_indent.c ext/iconv/iconv.c ext/session/session.c ext/soap/soap.c ext/standard/basic_functions.c ext/

[Jani Taskinen]

jani Fri, 12 Mar 2010 10:28:59 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=296107

Log:
- Reverted r296062 and r296065

Changed paths:
D   php/php-src/branches/PHP_5_3/README.NEW-OUTPUT-API
U   php/php-src/branches/PHP_5_3/Zend/zend_highlight.c
U   php/php-src/branches/PHP_5_3/Zend/zend_indent.c
U   php/php-src/branches/PHP_5_3/ext/iconv/iconv.c
U   php/php-src/branches/PHP_5_3/ext/session/session.c
U   php/php-src/branches/PHP_5_3/ext/soap/soap.c
U   php/php-src/branches/PHP_5_3/ext/standard/basic_functions.c
U   php/php-src/branches/PHP_5_3/ext/standard/exec.c
U   php/php-src/branches/PHP_5_3/ext/standard/head.c
U   php/php-src/branches/PHP_5_3/ext/standard/info.c
U   
php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/ob_get_flush_error.phpt
U   
php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/phpinfo.phpt
U   php/php-src/branches/PHP_5_3/ext/standard/url_scanner_ex.c
U   php/php-src/branches/PHP_5_3/ext/standard/url_scanner_ex.re
U   php/php-src/branches/PHP_5_3/ext/standard/var.c
U   php/php-src/branches/PHP_5_3/ext/tidy/php_tidy.h
U   php/php-src/branches/PHP_5_3/ext/tidy/tidy.c
U   php/php-src/branches/PHP_5_3/ext/zlib/CREDITS
U   php/php-src/branches/PHP_5_3/ext/zlib/config0.m4
U   php/php-src/branches/PHP_5_3/ext/zlib/php_zlib.h
U   php/php-src/branches/PHP_5_3/ext/zlib/tests/005.phpt
U   php/php-src/branches/PHP_5_3/ext/zlib/tests/006.phpt
U   php/php-src/branches/PHP_5_3/ext/zlib/tests/007.phpt
U   php/php-src/branches/PHP_5_3/ext/zlib/tests/gzcompress_basic1.phpt
U   php/php-src/branches/PHP_5_3/ext/zlib/tests/gzcompress_error1.phpt
U   php/php-src/branches/PHP_5_3/ext/zlib/tests/gzcompress_variation1.phpt
U   php/php-src/branches/PHP_5_3/ext/zlib/tests/gzdeflate_basic1.phpt
U   php/php-src/branches/PHP_5_3/ext/zlib/tests/gzdeflate_error1.phpt
U   php/php-src/branches/PHP_5_3/ext/zlib/tests/gzdeflate_variation1.phpt
U   php/php-src/branches/PHP_5_3/ext/zlib/tests/gzencode_basic1.phpt
U   php/php-src/branches/PHP_5_3/ext/zlib/tests/gzencode_error1.phpt
U   php/php-src/branches/PHP_5_3/ext/zlib/tests/gzencode_variation1.phpt
D   
php/php-src/branches/PHP_5_3/ext/zlib/tests/gzencode_variation2-win32.phpt
U   php/php-src/branches/PHP_5_3/ext/zlib/tests/gzencode_variation2.phpt
U   php/php-src/branches/PHP_5_3/ext/zlib/tests/gzfile_variation10.phpt
U   php/php-src/branches/PHP_5_3/ext/zlib/tests/gzfilegzreadfile.phpt
U   php/php-src/branches/PHP_5_3/ext/zlib/tests/gzinflate-bug42663.phpt
U   php/php-src/branches/PHP_5_3/ext/zlib/tests/gzinflate_length.phpt
U   php/php-src/branches/PHP_5_3/ext/zlib/tests/gzopen_variation5.phpt
U   php/php-src/branches/PHP_5_3/ext/zlib/tests/gzopen_variation8.phpt
U   php/php-src/branches/PHP_5_3/ext/zlib/tests/gzread_variation1.phpt
U   php/php-src/branches/PHP_5_3/ext/zlib/tests/gzreadgzwrite.phpt
U   php/php-src/branches/PHP_5_3/ext/zlib/tests/gzreadgzwriteplain.phpt
U   php/php-src/branches/PHP_5_3/ext/zlib/tests/gzuncompress_basic1.phpt
U   php/php-src/branches/PHP_5_3/ext/zlib/tests/gzuncompress_error1.phpt
U   php/php-src/branches/PHP_5_3/ext/zlib/tests/gzwrite_basic.phpt
U   php/php-src/branches/PHP_5_3/ext/zlib/tests/gzwrite_variation1.phpt
D   php/php-src/branches/PHP_5_3/ext/zlib/tests/ob_001.phpt
D   php/php-src/branches/PHP_5_3/ext/zlib/tests/ob_002.phpt
D   php/php-src/branches/PHP_5_3/ext/zlib/tests/ob_003.phpt
D   php/php-src/branches/PHP_5_3/ext/zlib/tests/ob_004.phpt
D   php/php-src/branches/PHP_5_3/ext/zlib/tests/ob_005.phpt
U   php/php-src/branches/PHP_5_3/ext/zlib/tests/readgzfile_variation10.phpt
U   php/php-src/branches/PHP_5_3/ext/zlib/tests/readgzfile_variation14.phpt
U   php/php-src/branches/PHP_5_3/ext/zlib/tests/readgzfile_variation4.phpt
U   php/php-src/branches/PHP_5_3/ext/zlib/tests/readgzfile_variation5.phpt
U   php/php-src/branches/PHP_5_3/ext/zlib/tests/readgzfile_variation6.phpt
U   php/php-src/branches/PHP_5_3/ext/zlib/tests/readgzfile_variation7.phpt
U   php/php-src/branches/PHP_5_3/ext/zlib/tests/zlib_filter_inflate2.phpt
U   
php/php-src/branches/PHP_5_3/ext/zlib/tests/zlib_scheme_copy_variation2.phpt
U   php/php-src/branches/PHP_5_3/ext/zlib/zlib.c
U   php/php-src/branches/PHP_5_3/ext/zlib/zlib_filter.c
U   php/php-src/branches/PHP_5_3/ext/zlib/zlib_fopen_wrapper.c
U   php/php-src/branches/PHP_5_3/main/SAPI.c
U   php/php-src/branches/PHP_5_3/main/main.c
U   php/php-src/branches/PHP_5_3/main/output.c
U   php/php-src/branches/PHP_5_3/main/php.h
U   php/php-src/branches/PHP_5_3/main/php_logos.c
U   php/php-src/branches/PHP_5_3/main/php_output.h
U   php/php-src/branches/PHP_5_3/sapi/apache/libpre.c
U   php/php-src/branches/PHP_5_3/sapi/apache/mod_php5.c
U   

[PHP-CVS] svn: /php/php-src/branches/PHP_5_4/main/streams/ transports.c xp_socket.c

[Jani Taskinen]

jani Fri, 12 Mar 2010 11:43:01 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=296108

Log:
MF53:- Added backlog socket context option for stream_socket_server(). (Mike)

Changed paths:
U   php/php-src/branches/PHP_5_4/main/streams/transports.c
U   php/php-src/branches/PHP_5_4/main/streams/xp_socket.c

Modified: php/php-src/branches/PHP_5_4/main/streams/transports.c
===
--- php/php-src/branches/PHP_5_4/main/streams/transports.c  2010-03-12 
10:28:59 UTC (rev 296107)
+++ php/php-src/branches/PHP_5_4/main/streams/transports.c  2010-03-12 
11:43:01 UTC (rev 296108)
@@ -157,7 +157,20 @@
ERR_RETURN(error_string, error_text, 
bind() failed: %s);
failed = 1;
} else if (flags  STREAM_XPORT_LISTEN) {
-   if (0 != 
php_stream_xport_listen(stream, 5, error_text TSRMLS_CC)) {
+   zval **zbacklog = NULL;
+   int backlog = 32;
+
+   if (stream-context  
php_stream_context_get_option(stream-context, socket, backlog, zbacklog) 
== SUCCESS) {
+   zval *ztmp = *zbacklog;
+
+   convert_to_long_ex(ztmp);
+   backlog = Z_LVAL_P(ztmp);
+   if (ztmp != *zbacklog) {
+   zval_ptr_dtor(ztmp);
+   }
+   }
+
+   if (0 != 
php_stream_xport_listen(stream, backlog, error_text TSRMLS_CC)) {
ERR_RETURN(error_string, 
error_text, listen() failed: %s);
failed = 1;
}

Modified: php/php-src/branches/PHP_5_4/main/streams/xp_socket.c
===
--- php/php-src/branches/PHP_5_4/main/streams/xp_socket.c   2010-03-12 
10:28:59 UTC (rev 296107)
+++ php/php-src/branches/PHP_5_4/main/streams/xp_socket.c   2010-03-12 
11:43:01 UTC (rev 296108)
@@ -324,7 +324,7 @@

switch (xparam-op) {
case STREAM_XPORT_OP_LISTEN:
-   xparam-outputs.returncode = 
(listen(sock-socket, 5) == 0) ?  0: -1;
+   xparam-outputs.returncode = 
(listen(sock-socket, xparam-inputs.backlog) == 0) ?  0: -1;
return PHP_STREAM_OPTION_RETURN_OK;

case STREAM_XPORT_OP_GET_NAME:

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

[PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ext/pgsql/ pgsql.c

[Jani Taskinen]

jani Fri, 12 Mar 2010 11:50:14 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=296109

Log:
Merged r296086

Changed paths:
U   php/php-src/branches/PHP_5_4/ext/pgsql/pgsql.c

Modified: php/php-src/branches/PHP_5_4/ext/pgsql/pgsql.c
===
--- php/php-src/branches/PHP_5_4/ext/pgsql/pgsql.c  2010-03-12 11:43:01 UTC 
(rev 296108)
+++ php/php-src/branches/PHP_5_4/ext/pgsql/pgsql.c  2010-03-12 11:50:14 UTC 
(rev 296109)
@@ -3303,7 +3303,7 @@

tbytes = 0;
while ((nbytes = lo_read((PGconn *)pgsql-conn, pgsql-lofd, buf, 
PGSQL_LO_READ_BUF_SIZE))0) {
-   php_body_write(buf, nbytes TSRMLS_CC);
+   PHPWRITE(buf, nbytes);
tbytes += nbytes;
}
RETURN_LONG(tbytes);

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

[PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ ext/dba/tests/dba012.phpt ext/dba/tests/dba013.phpt ext/dba/tests/dba014.phpt ext/dba/tests/dba015.phpt ext/dba/tests/dba_db4_003.phpt

[Jani Taskinen]

jani Fri, 12 Mar 2010 11:51:40 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=296110

Log:
MF53: New and improved DBA tests

Changed paths:
_U  php/php-src/branches/PHP_5_4/
A + php/php-src/branches/PHP_5_4/ext/dba/tests/dba012.phpt
(from php/php-src/branches/PHP_5_3/ext/dba/tests/dba012.phpt:r296095)
A + php/php-src/branches/PHP_5_4/ext/dba/tests/dba013.phpt
(from php/php-src/branches/PHP_5_3/ext/dba/tests/dba013.phpt:r296095)
A + php/php-src/branches/PHP_5_4/ext/dba/tests/dba014.phpt
(from php/php-src/branches/PHP_5_3/ext/dba/tests/dba014.phpt:r296095)
A + php/php-src/branches/PHP_5_4/ext/dba/tests/dba015.phpt
(from php/php-src/branches/PHP_5_3/ext/dba/tests/dba015.phpt:r296095)
U   php/php-src/branches/PHP_5_4/ext/dba/tests/dba_db4_003.phpt


Property changes on: php/php-src/branches/PHP_5_4
___
Modified: svn:mergeinfo
   - /php/php-src/trunk:284726
   + /php/php-src/branches/PHP_5_3:296076-296095
/php/php-src/trunk:284726

Copied: php/php-src/branches/PHP_5_4/ext/dba/tests/dba012.phpt (from rev 
296095, php/php-src/branches/PHP_5_3/ext/dba/tests/dba012.phpt)
===
--- php/php-src/branches/PHP_5_4/ext/dba/tests/dba012.phpt  
(rev 0)
+++ php/php-src/branches/PHP_5_4/ext/dba/tests/dba012.phpt  2010-03-12 
11:51:40 UTC (rev 296110)
@@ -0,0 +1,42 @@
+--TEST--
+DBA dba.default_handler tests
+--SKIPIF--
+?php
+$handler = flatfile;
+require_once(dirname(__FILE__) .'/skipif.inc');
+?
+--INI--
+dba.default_handler=flatfile
+--FILE--
+?php
+$handler = flatfile;
+require_once(dirname(__FILE__) .'/test.inc');
+echo database handler: $handler\n;
+
+echo Test 1\n;
+
+ini_set('dba.default_handler', 'does_not_exist');
+
+var_dump(dba_open($db_filename, 'c'));
+
+echo Test 2\n;
+
+ini_set('dba.default_handler', '');
+
+var_dump(dba_open($db_filename, 'n'));
+
+?
+--CLEAN--
+?php
+require(dirname(__FILE__) .'/clean.inc');
+?
+--EXPECTF--
+database handler: flatfile
+Test 1
+
+Warning: ini_set(): No such handler: does_not_exist in %sdba012.php on line %d
+resource(%d) of type (dba)
+Test 2
+
+Warning: dba_open(%stest0.dbm,n): No default handler selected in %sdba012.php 
on line %d
+bool(false)

Copied: php/php-src/branches/PHP_5_4/ext/dba/tests/dba013.phpt (from rev 
296095, php/php-src/branches/PHP_5_3/ext/dba/tests/dba013.phpt)
===
--- php/php-src/branches/PHP_5_4/ext/dba/tests/dba013.phpt  
(rev 0)
+++ php/php-src/branches/PHP_5_4/ext/dba/tests/dba013.phpt  2010-03-12 
11:51:40 UTC (rev 296110)
@@ -0,0 +1,27 @@
+--TEST--
+DBA with array key with empty array
+--SKIPIF--
+?php
+require_once(dirname(__FILE__) .'/skipif.inc');
+die(info $HND handler used);
+?
+--FILE--
+?php
+require_once(dirname(__FILE__) .'/test.inc');
+echo database handler: $handler\n;
+
+if (($db_file=dba_open($db_file, n, $handler))!==FALSE) {
+dba_insert(array(), Content String 1, $db_file);
+} else {
+echo Error creating database\n;
+}
+
+?
+--CLEAN--
+?php
+require(dirname(__FILE__) .'/clean.inc');
+?
+--EXPECTF--
+database handler: %s
+
+Catchable fatal error: dba_insert(): Key does not have exactly two elements: 
(key, name) in %sdba013.php on line %d

Copied: php/php-src/branches/PHP_5_4/ext/dba/tests/dba014.phpt (from rev 
296095, php/php-src/branches/PHP_5_3/ext/dba/tests/dba014.phpt)
===
--- php/php-src/branches/PHP_5_4/ext/dba/tests/dba014.phpt  
(rev 0)
+++ php/php-src/branches/PHP_5_4/ext/dba/tests/dba014.phpt  2010-03-12 
11:51:40 UTC (rev 296110)
@@ -0,0 +1,27 @@
+--TEST--
+DBA with array key with array containing too many elements
+--SKIPIF--
+?php
+require_once(dirname(__FILE__) .'/skipif.inc');
+die(info $HND handler used);
+?
+--FILE--
+?php
+require_once(dirname(__FILE__) .'/test.inc');
+echo database handler: $handler\n;
+
+if (($db_file=dba_open($db_file, n, $handler))!==FALSE) {
+dba_insert(array(a, b, c), Content String 2, $db_file);
+} else {
+echo Error creating database\n;
+}
+
+?
+--CLEAN--
+?php
+require(dirname(__FILE__) .'/clean.inc');
+?
+--EXPECTF--
+database handler: %s
+
+Catchable fatal error: dba_insert(): Key does not have exactly two elements: 
(key, name) in %sdba014.php on line %d

Copied: php/php-src/branches/PHP_5_4/ext/dba/tests/dba015.phpt (from rev 
296095, php/php-src/branches/PHP_5_3/ext/dba/tests/dba015.phpt)
===
--- php/php-src/branches/PHP_5_4/ext/dba/tests/dba015.phpt  
(rev 0)
+++ php/php-src/branches/PHP_5_4/ext/dba/tests/dba015.phpt  2010-03-12 
11:51:40 UTC (rev 296110)
@@ -0,0 +1,76 @@
+--TEST--
+DBA with persistent connections

[PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ ChangeLog ChangeLog.1999.gz ChangeLog.2000.gz ChangeLog.2001.gz ChangeLog.2002.gz ChangeLog.2003.gz ChangeLog.2004.gz

[Jani Taskinen]

jani Fri, 12 Mar 2010 13:01:56 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=296111

Log:
- These are no longer relevant

Changed paths:
D   php/php-src/branches/PHP_5_4/ChangeLog
D   php/php-src/branches/PHP_5_4/ChangeLog.1999.gz
D   php/php-src/branches/PHP_5_4/ChangeLog.2000.gz
D   php/php-src/branches/PHP_5_4/ChangeLog.2001.gz
D   php/php-src/branches/PHP_5_4/ChangeLog.2002.gz
D   php/php-src/branches/PHP_5_4/ChangeLog.2003.gz
D   php/php-src/branches/PHP_5_4/ChangeLog.2004.gz

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

[PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ TODO TODO-5.1 TODO-PHP5

[Jani Taskinen]

jani Fri, 12 Mar 2010 13:09:27 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=296113

Log:
- Merged 2 of these, nuke one totally outdated and irrelevant.
# Quite likely most if not all of TODO is also replaced by some Wiki page.
# If so, replace the file contents with URL to the correct place :)

Changed paths:
U   php/php-src/branches/PHP_5_4/TODO
D   php/php-src/branches/PHP_5_4/TODO-5.1
D   php/php-src/branches/PHP_5_4/TODO-PHP5

Modified: php/php-src/branches/PHP_5_4/TODO
===
--- php/php-src/branches/PHP_5_4/TODO   2010-03-12 13:03:46 UTC (rev 296112)
+++ php/php-src/branches/PHP_5_4/TODO   2010-03-12 13:09:27 UTC (rev 296113)
@@ -11,8 +11,9 @@
 * Const'ify APIs. Right now, many functions leave parameters untouched,
   but don't declare those as const. This makes interaction with other
   interfaces difficult which pass const parameters to us.
+* Look at making zend_constant value member be a zval* instead of zval. 
(Andi)
+* Implement inheritance rules for type hints. (Marcus)

-
 global
 --
 * Make sure that all ZTS globals get destructed. Most ts_allocate_id()

Deleted: php/php-src/branches/PHP_5_4/TODO-5.1
===
--- php/php-src/branches/PHP_5_4/TODO-5.1   2010-03-12 13:03:46 UTC (rev 
296112)
+++ php/php-src/branches/PHP_5_4/TODO-5.1   2010-03-12 13:09:27 UTC (rev 
296113)
@@ -1,4 +0,0 @@
-Zend Engine

-  - Look at making zend_constant value member be a zval* instead of zval. 
(Andi)
-  - Implement inheritance rules for type hints. (Marcus)

Deleted: php/php-src/branches/PHP_5_4/TODO-PHP5
===
--- php/php-src/branches/PHP_5_4/TODO-PHP5  2010-03-12 13:03:46 UTC (rev 
296112)
+++ php/php-src/branches/PHP_5_4/TODO-PHP5  2010-03-12 13:09:27 UTC (rev 
296113)
@@ -1,89 +0,0 @@
-Component:  Zend Engine 2
-
-Important stuff to finish: PPP members/PPP methods,
-support of overloaded extensions, possibly differentiate
-between class and namespace as discussed with Stig in
-Germany.
-Responsibility: Zeev, Andi, Stas
-Time frame: Couple of months for first part and extensions will be
-ongoing while PHP is being fixed.
-Things to leave for later versions: Native aggregation
-support, accessing static members via object and not class.
-
-
-Component:  Aggregation
-Responsibility: Andi, Stig?
-Time frame: ?
-
-
-Component:  Redesign of API Versioning
-Responsibility: ?
-Time frame: 1 month
-
-
-Component:  Thread Safety
-Identify the extensions that are not thread safe by design
-or due to dependant libraries and identify them as such.
-If possible try to resolve thread safety issue via code
-improvements (if php code or patches will be accepted by
-library maintainers).   For situations where thread safety
-cannot easily be acheived a flag in the extension API is
-set so PHP can identify non-thread safe extensions.  These
-extensions will not be loaded in a ZTS compiled binary
-(unless it is cli/cgi).
-
-Responsibility: ?
-Time frame: ?
-
-
-Component:  SAPI
-Environment variables defined in the CGI spec need to be
-verified in each SAPI module that they conform to the CGI
-spec correctly.  If they do not, the SAPI module needs to
-fix the variable prior to script execution.  Having this
-conformity will aid in having PHP scripts run correctly
-under different sapi modules.
-
-Responsibility: Shane Caraveo  each sapi module owner
-Timeframe:  ? (but shouldn't be much effort, most modules are probably ok)
-
-
-Component:  RPC Abstraction Layer
-Porting java, com, dotnet, xmlrpc, corba, soap and python, srm
-(are there more ?) to work with the new oo api and preferably
-by using ext/rpc.
-Responsibility: Harald
-Time frame: 2 months (but i have to wait for a few engine features first)
-
-
-Component:  OO Extensions
-Each OO extension has to be revised and rewritten to fit into
-the new OO model. We should decide which extensions are a must
-to have for the release and which can be ported by the 
maintainer
-later as a separate pecl release.
-A list of extensions to be extended that have to be 
investigated:
-  * browscap
-  * aggregate
-  * all *sql extensions (*_fetch_object)
-  * domxml (seems like christian is rewriting 

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ README.NEW-OUTPUT-API Zend/zend_highlight.c Zend/zend_indent.c ext/iconv/iconv.c ext/session/session.c ext/soap/soap.c ext/standard/basic_functions.c ext/

[Jani Taskinen]

jani Thu, 11 Mar 2010 10:24:29 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=296062

Log:
MFH: Improved / fixed output buffering (Michael Wallner)

Changed paths:
A   php/php-src/branches/PHP_5_3/README.NEW-OUTPUT-API
U   php/php-src/branches/PHP_5_3/Zend/zend_highlight.c
U   php/php-src/branches/PHP_5_3/Zend/zend_indent.c
U   php/php-src/branches/PHP_5_3/ext/iconv/iconv.c
U   php/php-src/branches/PHP_5_3/ext/session/session.c
U   php/php-src/branches/PHP_5_3/ext/soap/soap.c
U   php/php-src/branches/PHP_5_3/ext/standard/basic_functions.c
U   php/php-src/branches/PHP_5_3/ext/standard/exec.c
U   php/php-src/branches/PHP_5_3/ext/standard/head.c
U   php/php-src/branches/PHP_5_3/ext/standard/info.c
U   
php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/ob_get_flush_error.phpt
U   
php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/phpinfo.phpt
U   php/php-src/branches/PHP_5_3/ext/standard/url_scanner_ex.c
U   php/php-src/branches/PHP_5_3/ext/standard/url_scanner_ex.re
U   php/php-src/branches/PHP_5_3/ext/standard/var.c
U   php/php-src/branches/PHP_5_3/ext/tidy/php_tidy.h
U   php/php-src/branches/PHP_5_3/ext/tidy/tidy.c
U   php/php-src/branches/PHP_5_3/ext/zlib/CREDITS
U   php/php-src/branches/PHP_5_3/ext/zlib/config0.m4
U   php/php-src/branches/PHP_5_3/ext/zlib/php_zlib.h
U   php/php-src/branches/PHP_5_3/ext/zlib/tests/005.phpt
U   php/php-src/branches/PHP_5_3/ext/zlib/tests/006.phpt
U   php/php-src/branches/PHP_5_3/ext/zlib/tests/007.phpt
U   php/php-src/branches/PHP_5_3/ext/zlib/tests/gzcompress_basic1.phpt
U   php/php-src/branches/PHP_5_3/ext/zlib/tests/gzcompress_error1.phpt
U   php/php-src/branches/PHP_5_3/ext/zlib/tests/gzcompress_variation1.phpt
U   php/php-src/branches/PHP_5_3/ext/zlib/tests/gzdeflate_basic1.phpt
U   php/php-src/branches/PHP_5_3/ext/zlib/tests/gzdeflate_error1.phpt
U   php/php-src/branches/PHP_5_3/ext/zlib/tests/gzdeflate_variation1.phpt
U   php/php-src/branches/PHP_5_3/ext/zlib/tests/gzencode_basic1.phpt
U   php/php-src/branches/PHP_5_3/ext/zlib/tests/gzencode_error1.phpt
U   php/php-src/branches/PHP_5_3/ext/zlib/tests/gzencode_variation1.phpt
A   
php/php-src/branches/PHP_5_3/ext/zlib/tests/gzencode_variation2-win32.phpt
U   php/php-src/branches/PHP_5_3/ext/zlib/tests/gzencode_variation2.phpt
U   php/php-src/branches/PHP_5_3/ext/zlib/tests/gzfile_variation10.phpt
U   php/php-src/branches/PHP_5_3/ext/zlib/tests/gzfilegzreadfile.phpt
U   php/php-src/branches/PHP_5_3/ext/zlib/tests/gzinflate-bug42663.phpt
U   php/php-src/branches/PHP_5_3/ext/zlib/tests/gzinflate_length.phpt
U   php/php-src/branches/PHP_5_3/ext/zlib/tests/gzopen_variation5.phpt
U   php/php-src/branches/PHP_5_3/ext/zlib/tests/gzopen_variation8.phpt
U   php/php-src/branches/PHP_5_3/ext/zlib/tests/gzread_variation1.phpt
U   php/php-src/branches/PHP_5_3/ext/zlib/tests/gzreadgzwrite.phpt
U   php/php-src/branches/PHP_5_3/ext/zlib/tests/gzreadgzwriteplain.phpt
U   php/php-src/branches/PHP_5_3/ext/zlib/tests/gzuncompress_basic1.phpt
U   php/php-src/branches/PHP_5_3/ext/zlib/tests/gzuncompress_error1.phpt
U   php/php-src/branches/PHP_5_3/ext/zlib/tests/gzwrite_basic.phpt
U   php/php-src/branches/PHP_5_3/ext/zlib/tests/gzwrite_variation1.phpt
A   php/php-src/branches/PHP_5_3/ext/zlib/tests/ob_001.phpt
A   php/php-src/branches/PHP_5_3/ext/zlib/tests/ob_002.phpt
A   php/php-src/branches/PHP_5_3/ext/zlib/tests/ob_003.phpt
A   php/php-src/branches/PHP_5_3/ext/zlib/tests/ob_004.phpt
A   php/php-src/branches/PHP_5_3/ext/zlib/tests/ob_005.phpt
U   php/php-src/branches/PHP_5_3/ext/zlib/tests/readgzfile_variation10.phpt
U   php/php-src/branches/PHP_5_3/ext/zlib/tests/readgzfile_variation14.phpt
U   php/php-src/branches/PHP_5_3/ext/zlib/tests/readgzfile_variation4.phpt
U   php/php-src/branches/PHP_5_3/ext/zlib/tests/readgzfile_variation5.phpt
U   php/php-src/branches/PHP_5_3/ext/zlib/tests/readgzfile_variation6.phpt
U   php/php-src/branches/PHP_5_3/ext/zlib/tests/readgzfile_variation7.phpt
U   php/php-src/branches/PHP_5_3/ext/zlib/tests/zlib_filter_inflate2.phpt
U   
php/php-src/branches/PHP_5_3/ext/zlib/tests/zlib_scheme_copy_variation2.phpt
U   php/php-src/branches/PHP_5_3/ext/zlib/zlib.c
U   php/php-src/branches/PHP_5_3/ext/zlib/zlib_filter.c
U   php/php-src/branches/PHP_5_3/ext/zlib/zlib_fopen_wrapper.c
U   php/php-src/branches/PHP_5_3/main/SAPI.c
U   php/php-src/branches/PHP_5_3/main/main.c
U   php/php-src/branches/PHP_5_3/main/output.c
U   php/php-src/branches/PHP_5_3/main/php.h
U   php/php-src/branches/PHP_5_3/main/php_logos.c
U   php/php-src/branches/PHP_5_3/main/php_output.h
U   php/php-src/branches/PHP_5_3/sapi/apache/libpre.c
U   

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/main/ main.c

[Jani Taskinen]

jani Thu, 11 Mar 2010 11:23:38 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=296065

Log:
- Fix conflict

Changed paths:
U   php/php-src/branches/PHP_5_3/main/main.c

Modified: php/php-src/branches/PHP_5_3/main/main.c
===
--- php/php-src/branches/PHP_5_3/main/main.c2010-03-11 10:32:17 UTC (rev 
296064)
+++ php/php-src/branches/PHP_5_3/main/main.c2010-03-11 11:23:38 UTC (rev 
296065)
@@ -1088,19 +1088,7 @@
php_log_err(log_buffer TSRMLS_CC);
efree(log_buffer);
}
- .mine
if (PG(display_errors)  ((module_initialized  
!PG(during_request_startup)) || (PG(display_startup_errors {
-===
-
-   if (PG(display_errors)
-((module_initialized  !PG(during_request_startup))
-   || (PG(display_startup_errors)
-
(OG(php_body_write)==php_default_output_func || 
OG(php_body_write)==php_ub_body_write_no_header || 
OG(php_body_write)==php_ub_body_write)
-   )
-   )
-   ) {
-
- .r294302
if (PG(xmlrpc_errors)) {
php_printf(?xml 
version=\1.0\?methodResponsefaultvaluestructmembernamefaultCode/namevalueint%ld/int/value/membermembernamefaultString/namevaluestring%s:%s
 in %s on line 
%d/string/value/member/struct/value/fault/methodResponse, 
PG(xmlrpc_error_number), error_type_str, buffer, error_filename, error_lineno);
} else {

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

[PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ configure.in main/php_version.h

[Jani Taskinen]

jani Thu, 11 Mar 2010 16:52:44 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=296081

Log:
- This is 5.4.0 (for now..:)

Changed paths:
U   php/php-src/branches/PHP_5_4/configure.in
U   php/php-src/branches/PHP_5_4/main/php_version.h

Modified: php/php-src/branches/PHP_5_4/configure.in
===
--- php/php-src/branches/PHP_5_4/configure.in   2010-03-11 16:52:05 UTC (rev 
296080)
+++ php/php-src/branches/PHP_5_4/configure.in   2010-03-11 16:52:44 UTC (rev 
296081)
@@ -40,8 +40,8 @@
 AC_CONFIG_HEADER(main/php_config.h)

 PHP_MAJOR_VERSION=5
-PHP_MINOR_VERSION=3
-PHP_RELEASE_VERSION=3
+PHP_MINOR_VERSION=4
+PHP_RELEASE_VERSION=0
 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`

Modified: php/php-src/branches/PHP_5_4/main/php_version.h
===
--- php/php-src/branches/PHP_5_4/main/php_version.h 2010-03-11 16:52:05 UTC 
(rev 296080)
+++ php/php-src/branches/PHP_5_4/main/php_version.h 2010-03-11 16:52:44 UTC 
(rev 296081)
@@ -1,8 +1,8 @@
 /* automatically generated by configure */
 /* edit configure.in to change version number */
 #define PHP_MAJOR_VERSION 5
-#define PHP_MINOR_VERSION 3
-#define PHP_RELEASE_VERSION 3
+#define PHP_MINOR_VERSION 4
+#define PHP_RELEASE_VERSION 0
 #define PHP_EXTRA_VERSION -dev
-#define PHP_VERSION 5.3.3-dev
-#define PHP_VERSION_ID 50303
+#define PHP_VERSION 5.4.0-dev
+#define PHP_VERSION_ID 50400

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

Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ext/pgsql/ pgsql.c

[Jani Taskinen]

11.3.2010 22:14, Johannes Schlüter wrote:

On Thu, 2010-03-11 at 21:06 +0100, Hannes Magnusson wrote:

I cannot see any possible reasons why the build has to be broken.
If it should be reverted then go for it, until then we would like to
be able to build PHP.


Following a discussion with Jani I assumed he'd revert the change from
this branch. (  Jani  And then reverting is done..how?) I will do it
if this doesn't happen soonish.


I was kinda hoping someone knew some clever and easy commands to do that with 
SVN? I can do it, but it'll have to wait til tomorrow.  :(


--Jani

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

[PHP-CVS] svn: /php/php-src/branches/

[Jani Taskinen]

jani Thu, 11 Mar 2010 16:09:37 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=296076

Log:
Hello PHP 5.4, open for all new stuff.

Changed paths:
A + php/php-src/branches/PHP_5_4/
(from php/php-src/branches/PHP_5_3/:r296075)


Property changes on: php/php-src/branches/PHP_5_4
___
Added: svn:ignore
   + Makefile.objects
Makefile.fragments
Makefile
acconfig.h
aclocal.m4
autom4te.cache
bsd_converted
buildmk.stamp
buildconf.stamp
config.h.in
config.cache
config.log
config.status
config_vars.mk
configuration-parser.c
configuration-parser.h
configuration-parser.output
configuration-scanner.c
configure
configure.bat
conftest
conftest.c
generated_lists
meta_cc
meta_ccld
mkinstalldirs
missing
install-sh
internal_functions.c
libtool
shlibtool
php
php5.spec
stamp-h
test.php3
*.lo
*.la
libs
modules
php-*.tar.gz
want_dependencies
deps
config.nice
php_version.h
*.plg
*.opt
*.ncb
Release
Release_inline
Debug
Release_TS
Release_TSDbg
Release_TS_inline
Debug_TS
results.txt
libs
_libs
include
autom4te.cache
FBCIndex
FBCLockFolder
debug.log
confdefs.h
configure.js
config.nice.bat
configure.bat
ZendEngine1
php_test_results_*.txt
*.gcda
*.gcno
lcov_data
lcov_html
php_lcov.info
tmp-php.ini
diff

Added: svn:mergeinfo
   + /php/php-src/trunk:284726

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

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ NEWS

[Jani Taskinen]

jani Mon, 22 Feb 2010 09:06:06 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=295366

Log:
- Fixed NEWS entry order + removed aliases (only real names here!)

Changed paths:
U   php/php-src/branches/PHP_5_3/NEWS

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2010-02-22 07:22:23 UTC (rev 295365)
+++ php/php-src/branches/PHP_5_3/NEWS   2010-02-22 09:06:06 UTC (rev 295366)
@@ -3,17 +3,17 @@
 ?? ??? 20??, PHP 5.3.3
 - Upgraded bundled PCRE to version 8.01. (Ilia)

+- Improved crypt support for edge cases (UFC compatibility). (Joey, Pierre)
+
 - Added stream filter support to mcrypt extension (ported from
   mcrypt_filter). (Stas)

-- Improved crypt support for edge cases (UFC compatibility) (Solar Designer,
-  Joey, Pierre)
-
 - Fixed crypt's blowfish sanity check of the setting string, to reject 
iteration
-  counts encoded as 36 through 39. (Solar Designer)
+  counts encoded as 36 through 39. (Pierre)

 - Fixed #51059 (crypt crashes when invalid salt are given). (Pierre)

+
 ?? ??? 20??, PHP 5.3.2
 - Upgraded bundled sqlite to version 3.6.22. (Ilia)
 - Upgraded bundled libmagic to version 5.03. (Mikko)

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

Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/build/shtool branches/PHP_5_3/build/shtool trunk/build/shtool

[Jani Taskinen]

If this wasn't in mainstream shtool, then report it there instead. We do 
NOT start patching this ourselves.


--Jani


On 02/18/2010 02:30 AM, Raphael Geissert wrote:

geissert Thu, 18 Feb 2010 00:30:12 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=295225

Log:
Fix race condition in shtool's mkdir -p implementation (bug #51076)

Bug: http://bugs.php.net/51076 (Open) race condition in shtool's mkdir -p 
implementation

Changed paths:
 U   php/php-src/branches/PHP_5_2/build/shtool
 U   php/php-src/branches/PHP_5_3/build/shtool
 U   php/php-src/trunk/build/shtool

Modified: php/php-src/branches/PHP_5_2/build/shtool
===
--- php/php-src/branches/PHP_5_2/build/shtool   2010-02-18 00:10:10 UTC (rev 
295224)
+++ php/php-src/branches/PHP_5_2/build/shtool   2010-02-18 00:30:12 UTC (rev 
295225)
@@ -991,7 +991,11 @@
  if [ .$opt_t = .yes ]; then
  echo mkdir $pathcomp 12
  fi
-mkdir $pathcomp || errstatus=$?
+mkdir $pathcomp || {
+_errstatus=$?
+[ -d $pathcomp ] || errstatus=${_errstatus}
+unset _errstatus
+}
  if [ .$opt_o != . ]; then
  if [ .$opt_t = .yes ]; then
  echo chown $opt_o $pathcomp 12

Modified: php/php-src/branches/PHP_5_3/build/shtool
===
--- php/php-src/branches/PHP_5_3/build/shtool   2010-02-18 00:10:10 UTC (rev 
295224)
+++ php/php-src/branches/PHP_5_3/build/shtool   2010-02-18 00:30:12 UTC (rev 
295225)
@@ -991,7 +991,11 @@
  if [ .$opt_t = .yes ]; then
  echo mkdir $pathcomp 12
  fi
-mkdir $pathcomp || errstatus=$?
+mkdir $pathcomp || {
+_errstatus=$?
+[ -d $pathcomp ] || errstatus=${_errstatus}
+unset _errstatus
+}
  if [ .$opt_o != . ]; then
  if [ .$opt_t = .yes ]; then
  echo chown $opt_o $pathcomp 12

Modified: php/php-src/trunk/build/shtool
===
--- php/php-src/trunk/build/shtool  2010-02-18 00:10:10 UTC (rev 295224)
+++ php/php-src/trunk/build/shtool  2010-02-18 00:30:12 UTC (rev 295225)
@@ -991,7 +991,11 @@
  if [ .$opt_t = .yes ]; then
  echo mkdir $pathcomp 12
  fi
-mkdir $pathcomp || errstatus=$?
+mkdir $pathcomp || {
+_errstatus=$?
+[ -d $pathcomp ] || errstatus=${_errstatus}
+unset _errstatus
+}
  if [ .$opt_o != . ]; then
  if [ .$opt_t = .yes ]; then
  echo chown $opt_o $pathcomp 12





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

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/ext/standard/tests/general_functions/var_dump_64bit.phpt branches/PHP_5_3/ext/standard/tests/general_functions/var_dump_64bit.phpt trunk/ext/standard/test

[Jani Taskinen]

jani Sat, 13 Feb 2010 15:43:45 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=295009

Log:
- Fix test

Changed paths:
UU  
php/php-src/branches/PHP_5_2/ext/standard/tests/general_functions/var_dump_64bit.phpt
UU  
php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/var_dump_64bit.phpt
UU  
php/php-src/trunk/ext/standard/tests/general_functions/var_dump_64bit.phpt

Modified: 
php/php-src/branches/PHP_5_2/ext/standard/tests/general_functions/var_dump_64bit.phpt
===
--- 
php/php-src/branches/PHP_5_2/ext/standard/tests/general_functions/var_dump_64bit.phpt
   2010-02-13 09:11:30 UTC (rev 295008)
+++ 
php/php-src/branches/PHP_5_2/ext/standard/tests/general_functions/var_dump_64bit.phpt
   2010-02-13 15:43:45 UTC (rev 295009)
@@ -462,7 +462,7 @@
 -- Iteration 14 --
 string(22) 1234
 5678
-   9100
+   9100
 abcda

 *** Testing var_dump() on boolean variables ***
@@ -1303,7 +1303,7 @@
   [13]=
   string(22) 1234
 5678
-   9100
+   9100
 abcda
 }
 array(15) {


Property changes on: 
php/php-src/branches/PHP_5_2/ext/standard/tests/general_functions/var_dump_64bit.phpt
___
Deleted: svn:eol-style
   - native

Modified: 
php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/var_dump_64bit.phpt
===
--- 
php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/var_dump_64bit.phpt
   2010-02-13 09:11:30 UTC (rev 295008)
+++ 
php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/var_dump_64bit.phpt
   2010-02-13 15:43:45 UTC (rev 295009)
@@ -462,7 +462,7 @@
 -- Iteration 14 --
 string(22) 1234
 5678
-   9100
+   9100
 abcda

 *** Testing var_dump() on boolean variables ***
@@ -1303,7 +1303,7 @@
   [13]=
   string(22) 1234
 5678
-   9100
+   9100
 abcda
 }
 array(15) {


Property changes on: 
php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/var_dump_64bit.phpt
___
Deleted: svn:eol-style
   - native

Modified: 
php/php-src/trunk/ext/standard/tests/general_functions/var_dump_64bit.phpt
===
--- php/php-src/trunk/ext/standard/tests/general_functions/var_dump_64bit.phpt  
2010-02-13 09:11:30 UTC (rev 295008)
+++ php/php-src/trunk/ext/standard/tests/general_functions/var_dump_64bit.phpt  
2010-02-13 15:43:45 UTC (rev 295009)
@@ -462,7 +462,7 @@
 -- Iteration 14 --
 unicode(22) 1234
 5678
-   9100
+   9100
 abcda

 *** Testing var_dump() on boolean variables ***
@@ -1303,7 +1303,7 @@
   [13]=
   unicode(22) 1234
 5678
-   9100
+   9100
 abcda
 }
 array(15) {


Property changes on: 
php/php-src/trunk/ext/standard/tests/general_functions/var_dump_64bit.phpt
___
Deleted: svn:eol-style
   - native

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

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/ext/xmlrpc/tests/bug18916.phpt branches/PHP_5_2/ext/xmlrpc/tests/bug44996.phpt branches/PHP_5_2/ext/xmlrpc/tests/bug45226.phpt branches/PHP_5_2/ext/xmlrpc

[Jani Taskinen]

jani Fri, 12 Feb 2010 16:53:44 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=294996

Log:
- Added missing SKIPIF section to tests (bug #51014)

Bug: http://bugs.php.net/51014 (Closed) ext/xmlrpc/tests/bug18916.phpt is 
missing the SKIPIF section
  
Changed paths:
U   php/php-src/branches/PHP_5_2/ext/xmlrpc/tests/bug18916.phpt
U   php/php-src/branches/PHP_5_2/ext/xmlrpc/tests/bug44996.phpt
U   php/php-src/branches/PHP_5_2/ext/xmlrpc/tests/bug45226.phpt
U   php/php-src/branches/PHP_5_2/ext/xmlrpc/tests/bug4.phpt
U   php/php-src/branches/PHP_5_2/ext/xmlrpc/tests/bug45556.phpt
U   php/php-src/branches/PHP_5_2/ext/xmlrpc/tests/bug47818.phpt
U   php/php-src/branches/PHP_5_2/ext/xmlrpc/tests/bug50285.phpt
U   php/php-src/branches/PHP_5_2/ext/xmlrpc/tests/bug50761.phpt
U   php/php-src/branches/PHP_5_3/ext/xmlrpc/tests/bug18916.phpt
U   php/php-src/branches/PHP_5_3/ext/xmlrpc/tests/bug44996.phpt
U   php/php-src/branches/PHP_5_3/ext/xmlrpc/tests/bug45226.phpt
U   php/php-src/branches/PHP_5_3/ext/xmlrpc/tests/bug4.phpt
U   php/php-src/branches/PHP_5_3/ext/xmlrpc/tests/bug45556.phpt
U   php/php-src/branches/PHP_5_3/ext/xmlrpc/tests/bug47818.phpt
U   php/php-src/branches/PHP_5_3/ext/xmlrpc/tests/bug50285.phpt
U   php/php-src/branches/PHP_5_3/ext/xmlrpc/tests/bug50761.phpt
U   php/php-src/trunk/ext/xmlrpc/tests/bug18916.phpt
U   php/php-src/trunk/ext/xmlrpc/tests/bug44996.phpt
U   php/php-src/trunk/ext/xmlrpc/tests/bug45226.phpt
U   php/php-src/trunk/ext/xmlrpc/tests/bug4.phpt
U   php/php-src/trunk/ext/xmlrpc/tests/bug45556.phpt
U   php/php-src/trunk/ext/xmlrpc/tests/bug47818.phpt
U   php/php-src/trunk/ext/xmlrpc/tests/bug50285.phpt
U   php/php-src/trunk/ext/xmlrpc/tests/bug50761.phpt

Modified: php/php-src/branches/PHP_5_2/ext/xmlrpc/tests/bug18916.phpt
===
--- php/php-src/branches/PHP_5_2/ext/xmlrpc/tests/bug18916.phpt	2010-02-12 12:44:36 UTC (rev 294995)
+++ php/php-src/branches/PHP_5_2/ext/xmlrpc/tests/bug18916.phpt	2010-02-12 16:53:44 UTC (rev 294996)
@@ -1,5 +1,7 @@
 --TEST--
 Bug #18916 (xmlrpc_set_type() not working)
+--SKIPIF--
+?php if (!extension_loaded(xmlrpc)) print skip; ?
 --INI--
 date.timezone=America/Sao_Paulo
 --FILE--

Modified: php/php-src/branches/PHP_5_2/ext/xmlrpc/tests/bug44996.phpt
===
--- php/php-src/branches/PHP_5_2/ext/xmlrpc/tests/bug44996.phpt	2010-02-12 12:44:36 UTC (rev 294995)
+++ php/php-src/branches/PHP_5_2/ext/xmlrpc/tests/bug44996.phpt	2010-02-12 16:53:44 UTC (rev 294996)
@@ -1,5 +1,7 @@
 --TEST--
 Bug #44996 (xmlrpc_decode() ignores time zone on iso8601.datetime)
+--SKIPIF--
+?php if (!extension_loaded(xmlrpc)) print skip; ?
 --FILE--
 ?php


Modified: php/php-src/branches/PHP_5_2/ext/xmlrpc/tests/bug45226.phpt
===
--- php/php-src/branches/PHP_5_2/ext/xmlrpc/tests/bug45226.phpt	2010-02-12 12:44:36 UTC (rev 294995)
+++ php/php-src/branches/PHP_5_2/ext/xmlrpc/tests/bug45226.phpt	2010-02-12 16:53:44 UTC (rev 294996)
@@ -1,5 +1,7 @@
 --TEST--
 Bug #45226 (xmlrpc_set_type() segfaults with valid ISO8601 date string)
+--SKIPIF--
+?php if (!extension_loaded(xmlrpc)) print skip; ?
 --INI--
 date.timezone=America/Sao_Paulo
 --FILE--

Modified: php/php-src/branches/PHP_5_2/ext/xmlrpc/tests/bug4.phpt
===
--- php/php-src/branches/PHP_5_2/ext/xmlrpc/tests/bug4.phpt	2010-02-12 12:44:36 UTC (rev 294995)
+++ php/php-src/branches/PHP_5_2/ext/xmlrpc/tests/bug4.phpt	2010-02-12 16:53:44 UTC (rev 294996)
@@ -1,5 +1,7 @@
 --TEST--
 Bug #4 (Segfault with invalid non-string as register_introspection_callback)
+--SKIPIF--
+?php if (!extension_loaded(xmlrpc)) print skip; ?
 --FILE--
 ?php


Modified: php/php-src/branches/PHP_5_2/ext/xmlrpc/tests/bug45556.phpt
===
--- php/php-src/branches/PHP_5_2/ext/xmlrpc/tests/bug45556.phpt	2010-02-12 12:44:36 UTC (rev 294995)
+++ php/php-src/branches/PHP_5_2/ext/xmlrpc/tests/bug45556.phpt	2010-02-12 16:53:44 UTC (rev 294996)
@@ -1,5 +1,7 @@
 --TEST--
 Bug #45556 (Return value from callback isn't freed)
+--SKIPIF--
+?php if (!extension_loaded(xmlrpc)) print skip; ?
 --FILE--
 ?php


Modified: php/php-src/branches/PHP_5_2/ext/xmlrpc/tests/bug47818.phpt
===
--- php/php-src/branches/PHP_5_2/ext/xmlrpc/tests/bug47818.phpt	2010-02-12 12:44:36 UTC (rev 294995)
+++ php/php-src/branches/PHP_5_2/ext/xmlrpc/tests/bug47818.phpt	2010-02-12 16:53:44 UTC (rev 294996)
@@ -1,5 +1,7 @@
 --TEST--
 Bug #47818 (Segfault due to bound callback param)
+--SKIPIF--
+?php if (!extension_loaded(xmlrpc)) print skip; ?
 --FILE--
 ?php

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/ext/posix/tests/posix_uname.phpt branches/PHP_5_3/ext/posix/tests/posix_uname.phpt trunk/ext/posix/tests/posix_uname.phpt

[Jani Taskinen]

jani Fri, 12 Feb 2010 17:09:09 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=294998

Log:
- Removed duplicate tests (bug #51007)

Bug: http://bugs.php.net/51007 (Open) posix_uname{,_basic}.phpt are duplicates 
and lack handling of domainname
  
Changed paths:
D   php/php-src/branches/PHP_5_2/ext/posix/tests/posix_uname.phpt
D   php/php-src/branches/PHP_5_3/ext/posix/tests/posix_uname.phpt
D   php/php-src/trunk/ext/posix/tests/posix_uname.phpt

Deleted: php/php-src/branches/PHP_5_2/ext/posix/tests/posix_uname.phpt
===
--- php/php-src/branches/PHP_5_2/ext/posix/tests/posix_uname.phpt   
2010-02-12 17:08:30 UTC (rev 294997)
+++ php/php-src/branches/PHP_5_2/ext/posix/tests/posix_uname.phpt   
2010-02-12 17:09:09 UTC (rev 294998)
@@ -1,35 +0,0 @@
---TEST--
-Test posix_uname()
---DESCRIPTION--
-Gets information about the system.
-Source code: ext/posix/posix.c
---CREDITS--
-Falko Menge, mail at falko-menge dot de
-PHP Testfest Berlin 2009-05-10
---SKIPIF--
-?php
-   if (!extension_loaded('posix')) {
-die('SKIP - POSIX extension not available');
-}
-?
---FILE--
-?php
-$uname = posix_uname();
-unset($uname['domainname']);
-var_dump($uname);
-?
-===DONE===
---EXPECTF--
-array(5) {
-  [sysname]=
-  string(%d) %s
-  [nodename]=
-  string(%d) %s
-  [release]=
-  string(%d) %s
-  [version]=
-  string(%d) %s
-  [machine]=
-  string(%d) %s
-}
-===DONE===

Deleted: php/php-src/branches/PHP_5_3/ext/posix/tests/posix_uname.phpt
===
--- php/php-src/branches/PHP_5_3/ext/posix/tests/posix_uname.phpt   
2010-02-12 17:08:30 UTC (rev 294997)
+++ php/php-src/branches/PHP_5_3/ext/posix/tests/posix_uname.phpt   
2010-02-12 17:09:09 UTC (rev 294998)
@@ -1,35 +0,0 @@
---TEST--
-Test posix_uname()
---DESCRIPTION--
-Gets information about the system.
-Source code: ext/posix/posix.c
---CREDITS--
-Falko Menge, mail at falko-menge dot de
-PHP Testfest Berlin 2009-05-10
---SKIPIF--
-?php
-   if (!extension_loaded('posix')) {
-die('SKIP - POSIX extension not available');
-}
-?
---FILE--
-?php
-$uname = posix_uname();
-unset($uname['domainname']);
-var_dump($uname);
-?
-===DONE===
---EXPECTF--
-array(5) {
-  [sysname]=
-  string(%d) %s
-  [nodename]=
-  string(%d) %s
-  [release]=
-  string(%d) %s
-  [version]=
-  string(%d) %s
-  [machine]=
-  string(%d) %s
-}
-===DONE===

Deleted: php/php-src/trunk/ext/posix/tests/posix_uname.phpt
===
--- php/php-src/trunk/ext/posix/tests/posix_uname.phpt  2010-02-12 17:08:30 UTC 
(rev 294997)
+++ php/php-src/trunk/ext/posix/tests/posix_uname.phpt  2010-02-12 17:09:09 UTC 
(rev 294998)
@@ -1,35 +0,0 @@
---TEST--
-Test posix_uname()
---DESCRIPTION--
-Gets information about the system.
-Source code: ext/posix/posix.c
---CREDITS--
-Falko Menge, mail at falko-menge dot de
-PHP Testfest Berlin 2009-05-10
---SKIPIF--
-?php
-   if (!extension_loaded('posix')) {
-die('SKIP - POSIX extension not available');
-}
-?
---FILE--
-?php
-$uname = posix_uname();
-unset($uname['domainname']);
-var_dump($uname);
-?
-===DONE===
---EXPECTF--
-array(5) {
-  [usysname]=
-  string(%d) %s
-  [unodename]=
-  string(%d) %s
-  [urelease]=
-  string(%d) %s
-  [uversion]=
-  string(%d) %s
-  [umachine]=
-  string(%d) %s
-}
-===DONE===

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

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/tests/classes/constants_error_004.phpt branches/PHP_5_2/tests/lang/bug44827.phpt branches/PHP_5_3/tests/classes/constants_error_004.phpt branches/PHP_5_3/

[Jani Taskinen]

jani Sat, 13 Feb 2010 01:08:04 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=295003

Log:
- Fixed tests

Changed paths:
U   php/php-src/branches/PHP_5_2/tests/classes/constants_error_004.phpt
U   php/php-src/branches/PHP_5_2/tests/lang/bug44827.phpt
U   php/php-src/branches/PHP_5_3/tests/classes/constants_error_004.phpt
U   php/php-src/branches/PHP_5_3/tests/lang/bug44827.phpt
U   php/php-src/trunk/tests/classes/constants_error_004.phpt
U   php/php-src/trunk/tests/lang/bug44827.phpt

Modified: php/php-src/branches/PHP_5_2/tests/classes/constants_error_004.phpt
===
--- php/php-src/branches/PHP_5_2/tests/classes/constants_error_004.phpt 
2010-02-12 23:38:25 UTC (rev 295002)
+++ php/php-src/branches/PHP_5_2/tests/classes/constants_error_004.phpt 
2010-02-13 01:08:04 UTC (rev 295003)
@@ -10,4 +10,4 @@
   $a = new C();
 ?
 --EXPECTF--
-Fatal error: Class 'D' not found in %s on line %d
+Fatal error: Undefined class constant 'D::hello' in %s on line %d

Modified: php/php-src/branches/PHP_5_2/tests/lang/bug44827.phpt
===
--- php/php-src/branches/PHP_5_2/tests/lang/bug44827.phpt   2010-02-12 
23:38:25 UTC (rev 295002)
+++ php/php-src/branches/PHP_5_2/tests/lang/bug44827.phpt   2010-02-13 
01:08:04 UTC (rev 295003)
@@ -9,6 +9,8 @@
 define('::', true);
 var_dump(constant('::'));
 ?
---EXPECTREGEX--
-.*Fatal.*
+--EXPECTF--
+Warning: Class constants cannot be defined or redefined in %s on line %d

+Warning: constant(): Couldn't find constant :: in %s on line %d
+NULL

Modified: php/php-src/branches/PHP_5_3/tests/classes/constants_error_004.phpt
===
--- php/php-src/branches/PHP_5_3/tests/classes/constants_error_004.phpt 
2010-02-12 23:38:25 UTC (rev 295002)
+++ php/php-src/branches/PHP_5_3/tests/classes/constants_error_004.phpt 
2010-02-13 01:08:04 UTC (rev 295003)
@@ -10,4 +10,4 @@
   $a = new C();
 ?
 --EXPECTF--
-Fatal error: Class 'D' not found in %s on line %d
+Fatal error: Undefined class constant 'D::hello' in %s on line %d

Modified: php/php-src/branches/PHP_5_3/tests/lang/bug44827.phpt
===
--- php/php-src/branches/PHP_5_3/tests/lang/bug44827.phpt   2010-02-12 
23:38:25 UTC (rev 295002)
+++ php/php-src/branches/PHP_5_3/tests/lang/bug44827.phpt   2010-02-13 
01:08:04 UTC (rev 295003)
@@ -9,6 +9,9 @@
 define('::', true);
 var_dump(constant('::'));
 ?
---EXPECTREGEX--
-.*Fatal.*
+--EXPECTF--
+Warning: Class constants cannot be defined or redefined in %s on line %d

+Warning: constant(): Couldn't find constant :: in %s on line %d
+NULL
+

Modified: php/php-src/trunk/tests/classes/constants_error_004.phpt
===
--- php/php-src/trunk/tests/classes/constants_error_004.phpt2010-02-12 
23:38:25 UTC (rev 295002)
+++ php/php-src/trunk/tests/classes/constants_error_004.phpt2010-02-13 
01:08:04 UTC (rev 295003)
@@ -10,4 +10,4 @@
   $a = new C();
 ?
 --EXPECTF--
-Fatal error: Class 'D' not found in %s on line %d
+Fatal error: Undefined class constant 'D::hello' in %s on line %d

Modified: php/php-src/trunk/tests/lang/bug44827.phpt
===
--- php/php-src/trunk/tests/lang/bug44827.phpt  2010-02-12 23:38:25 UTC (rev 
295002)
+++ php/php-src/trunk/tests/lang/bug44827.phpt  2010-02-13 01:08:04 UTC (rev 
295003)
@@ -9,6 +9,8 @@
 define('::', true);
 var_dump(constant('::'));
 ?
---EXPECTREGEX--
-.*Fatal.*
+--EXPECTF--
+Warning: Class constants cannot be defined or redefined in %s on line %d

+Warning: constant(): Couldn't find constant :: in %s on line %d
+NULL

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

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/Zend/zend_ini_scanner.l trunk/Zend/zend_ini_scanner.l

[Jani Taskinen]

jani Sun, 07 Feb 2010 11:40:29 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=294695

Log:
-  Fixed bug #50952 (allow underscore _ in constants parsed in php.ini files)

Bug: http://bugs.php.net/50952 (Open) parse_ini_file() not parsing constants
  
Changed paths:
U   php/php-src/branches/PHP_5_3/Zend/zend_ini_scanner.l
U   php/php-src/trunk/Zend/zend_ini_scanner.l

Modified: php/php-src/branches/PHP_5_3/Zend/zend_ini_scanner.l
===
--- php/php-src/branches/PHP_5_3/Zend/zend_ini_scanner.l2010-02-06 
23:59:23 UTC (rev 294694)
+++ php/php-src/branches/PHP_5_3/Zend/zend_ini_scanner.l2010-02-07 
11:40:29 UTC (rev 294695)
@@ -336,7 +336,7 @@
 NEWLINE(\r|\n|\r\n)
 TABS_AND_SPACES [ \t]
 WHITESPACE [ \t]+
-CONSTANT [a-zA-Z][a-zA-Z0-9_]*
+CONSTANT [a-zA-Z_][a-zA-Z0-9_]*
 LABEL [^=\n\r\t;|$~(){}!\[]+
 TOKENS [:,.\[\]'()|^+-/*=%$!~?...@{}]
 OPERATORS [|~()!]

Modified: php/php-src/trunk/Zend/zend_ini_scanner.l
===
--- php/php-src/trunk/Zend/zend_ini_scanner.l   2010-02-06 23:59:23 UTC (rev 
294694)
+++ php/php-src/trunk/Zend/zend_ini_scanner.l   2010-02-07 11:40:29 UTC (rev 
294695)
@@ -336,7 +336,7 @@
 NEWLINE(\r|\n|\r\n)
 TABS_AND_SPACES [ \t]
 WHITESPACE [ \t]+
-CONSTANT [a-zA-Z][a-zA-Z0-9_]*
+CONSTANT [a-zA-Z_][a-zA-Z0-9_]*
 LABEL [^=\n\r\t;|$~(){}!\[]+
 TOKENS [:,.\[\]'()|^+-/*=%$!~?...@{}]
 OPERATORS [|~()!]

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

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ NEWS

[Jani Taskinen]

jani Sun, 07 Feb 2010 11:41:44 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=294696

Log:
bfn

Changed paths:
U   php/php-src/branches/PHP_5_3/NEWS

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2010-02-07 11:40:29 UTC (rev 294695)
+++ php/php-src/branches/PHP_5_3/NEWS   2010-02-07 11:41:44 UTC (rev 294696)
@@ -23,7 +23,9 @@
   links or invalid paths. (Pierre)
 - Fixed error output to stderr on Windows. (Pierre)

-- Fixed bug #50940 Custom content-length set incorrectly in Apache sapis.
+- Fixed bug #50952 (allow underscore _ in constants parsed in php.ini files).
+  (Jani)
+- Fixed bug #50940 (Custom content-length set incorrectly in Apache SAPIs).
   (Brian France, Rasmus)
 - Fixed bug #50907 (X-PHP-Originating-Script adding two new lines in *NIX).
   (Ilia)

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

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/Zend/zend_ini_scanner.c branches/PHP_5_3/Zend/zend_ini_scanner_defs.h trunk/Zend/zend_ini_scanner.c trunk/Zend/zend_ini_scanner_defs.h

[Jani Taskinen]

jani Sun, 07 Feb 2010 11:42:52 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=294697

Log:
touch

Changed paths:
U   php/php-src/branches/PHP_5_3/Zend/zend_ini_scanner.c
U   php/php-src/branches/PHP_5_3/Zend/zend_ini_scanner_defs.h
U   php/php-src/trunk/Zend/zend_ini_scanner.c
U   php/php-src/trunk/Zend/zend_ini_scanner_defs.h

Modified: php/php-src/branches/PHP_5_3/Zend/zend_ini_scanner.c
===
--- php/php-src/branches/PHP_5_3/Zend/zend_ini_scanner.c	2010-02-07 11:41:44 UTC (rev 294696)
+++ php/php-src/branches/PHP_5_3/Zend/zend_ini_scanner.c	2010-02-07 11:42:52 UTC (rev 294697)
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Tue Dec  8 12:24:52 2009 */
+/* Generated by re2c 0.13.5 on Sun Feb  7 13:25:37 2010 */
 #line 1 Zend/zend_ini_scanner.l
 /*
+--+
@@ -1273,7 +1273,7 @@
 		YYDEBUG(84, *YYCURSOR);
 		YYFILL(2);
 		yych = *YYCURSOR;
-		if (yych = ',') {
+		if (yych = '-') {
 			if (yych = ' ') {
 if (yych = '\n') {
 	if (yych = 0x08) goto yy86;
@@ -1284,29 +1284,30 @@
 	if (yych = ' ') goto yy88;
 }
 			} else {
-if (yych = '#') {
+if (yych = '$') {
 	if (yych == '') goto yy91;
+	if (yych = '$') goto yy93;
 } else {
-	if (yych = '$') goto yy93;
 	if (yych == '\'') goto yy94;
+	if (yych = '-') goto yy95;
 }
 			}
 		} else {
-			if (yych = '@') {
-if (yych = '/') {
-	if (yych = '-') goto yy95;
+			if (yych = 'Z') {
+if (yych = '9') {
 	if (yych = '.') goto yy96;
+	if (yych = '0') goto yy97;
 } else {
-	if (yych = '9') goto yy97;
 	if (yych == ';') goto yy89;
+	if (yych = 'A') goto yy99;
 }
 			} else {
-if (yych = '\\') {
-	if (yych = 'Z') goto yy99;
-	if (yych = '\\') goto yy101;
+if (yych = '^') {
+	if (yych = '[') goto yy86;
+	if (yych = '\\') goto yy101;
+	if (yych = ']') goto yy102;
 } else {
-	if (yych = ']') goto yy102;
-	if (yych = '`') goto yy86;
+	if (yych == '`') goto yy86;
 	if (yych = 'z') goto yy99;
 }
 			}
@@ -1323,7 +1324,7 @@
 		{ /* Get rest as section/offset value */
 	RETURN_TOKEN(TC_STRING, yytext, yyleng);
 }
-#line 1327 Zend/zend_ini_scanner.c
+#line 1328 Zend/zend_ini_scanner.c
 yy88:
 		YYDEBUG(88, *YYCURSOR);
 		yyaccept = 0;
@@ -1344,7 +1345,7 @@
 		{
 	return 0;
 }
-#line 1348 Zend/zend_ini_scanner.c
+#line 1349 Zend/zend_ini_scanner.c
 yy91:
 		YYDEBUG(91, *YYCURSOR);
 		++YYCURSOR;
@@ -1356,7 +1357,7 @@
 	yy_push_state(ST_DOUBLE_QUOTES TSRMLS_CC);
 	return '';
 }
-#line 1360 Zend/zend_ini_scanner.c
+#line 1361 Zend/zend_ini_scanner.c
 yy93:
 		YYDEBUG(93, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -1422,7 +1423,7 @@
 		{ /* Get number option value as string */
 	RETURN_TOKEN(TC_NUMBER, yytext, yyleng);
 }
-#line 1426 Zend/zend_ini_scanner.c
+#line 1427 Zend/zend_ini_scanner.c
 yy99:
 		YYDEBUG(99, *YYCURSOR);
 		yyaccept = 3;
@@ -1452,7 +1453,7 @@
 		{ /* Get constant option value */
 	RETURN_TOKEN(TC_CONSTANT, yytext, yyleng);
 }
-#line 1456 Zend/zend_ini_scanner.c
+#line 1457 Zend/zend_ini_scanner.c
 yy101:
 		YYDEBUG(101, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -1468,7 +1469,7 @@
 	BEGIN(INITIAL);
 	return ']';
 }
-#line 1472 Zend/zend_ini_scanner.c
+#line 1473 Zend/zend_ini_scanner.c
 yy104:
 		YYDEBUG(104, *YYCURSOR);
 		yyaccept = 0;
@@ -1767,7 +1768,7 @@
 	}
 	RETURN_TOKEN(TC_RAW, yytext, yyleng);
 }
-#line 1771 Zend/zend_ini_scanner.c
+#line 1772 Zend/zend_ini_scanner.c
 yy129:
 		YYDEBUG(129, *YYCURSOR);
 		++YYCURSOR;
@@ -1778,7 +1779,7 @@
 	yy_push_state(ST_VARNAME TSRMLS_CC);
 	return TC_DOLLAR_CURLY;
 }
-#line 1782 Zend/zend_ini_scanner.c
+#line 1783 Zend/zend_ini_scanner.c
 yy131:
 		YYDEBUG(131, *YYCURSOR);
 		yyaccept = 0;
@@ -1891,7 +1892,7 @@
 	}
 	RETURN_TOKEN(TC_RAW, yytext, yyleng);
 }
-#line 1895 Zend/zend_ini_scanner.c
+#line 1896 Zend/zend_ini_scanner.c
 yy139:
 		YYDEBUG(139, *YYCURSOR);
 		yyaccept = 0;
@@ -1919,7 +1920,7 @@
 	SCNG(lineno)++;
 	return END_OF_LINE;
 }
-#line 1923 Zend/zend_ini_scanner.c
+#line 1924 Zend/zend_ini_scanner.c
 yy142:
 		YYDEBUG(142, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -1937,7 +1938,7 @@
 	BEGIN(INITIAL);
 	return END_OF_LINE;
 }
-#line 1941 Zend/zend_ini_scanner.c
+#line 1942 Zend/zend_ini_scanner.c
 yy145:
 		YYDEBUG(145, *YYCURSOR);
 		++YYCURSOR;
@@ -1961,7 +1962,7 @@
 	SCNG(lineno)++;
 	return END_OF_LINE;
 }
-#line 1965 Zend/zend_ini_scanner.c
+#line 1966 Zend/zend_ini_scanner.c
 yy149:
 		YYDEBUG(149, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -2063,7 +2064,7 @@
 		{ /* Raw value, only used when SCNG(scanner_mode) == ZEND_INI_SCANNER_RAW. */
 	RETURN_TOKEN(TC_RAW, yytext, yyleng);
 }
-#line 2067 Zend/zend_ini_scanner.c
+#line 2068 Zend/zend_ini_scanner.c
 yy160:
 		YYDEBUG(160, *YYCURSOR);
 		++YYCURSOR;
@@ -2073,7 +2074,7 @@
 		{
 	return 0;
 }
-#line 2077 Zend/zend_ini_scanner.c

Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/ext/imap/config.m4 branches/PHP_5_2/ext/imap/php_imap.c branches/PHP_5_2/ext/imap/tests/bug44098.phpt branches/PHP_5_3/NEWS branches/PHP_5_3/ext/imap/

[Jani Taskinen]

[snip]
AC_MSG_ERROR([utf8_mime2text() has old signature, but U8T_CANONICAL is present. 
This should not happen. Check config.log for additional information.])

[endsnip]

Might as well fix those errors too..

--Jani


7.2.2010 15:06, Pierre Joye wrote:

pajoye   Sun, 07 Feb 2010 13:06:54 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=294699

Log:
- Fixed #44098, imap_utf8() returns only capital letters

Bug: http://bugs.php.net/44098 (No Feedback) imap_utf8() returns only capital 
letters

Changed paths:
 U   php/php-src/branches/PHP_5_2/ext/imap/config.m4
 U   php/php-src/branches/PHP_5_2/ext/imap/php_imap.c
 A   php/php-src/branches/PHP_5_2/ext/imap/tests/bug44098.phpt
 U   php/php-src/branches/PHP_5_3/NEWS
 U   php/php-src/branches/PHP_5_3/ext/imap/config.m4
 U   php/php-src/branches/PHP_5_3/ext/imap/config.w32
 U   php/php-src/branches/PHP_5_3/ext/imap/php_imap.c
 A   php/php-src/branches/PHP_5_3/ext/imap/tests/bug44098.phpt
 U   php/php-src/branches/PHP_5_3_2/ext/imap/config.m4
 U   php/php-src/branches/PHP_5_3_2/ext/imap/config.w32
 U   php/php-src/branches/PHP_5_3_2/ext/imap/php_imap.c
 A   php/php-src/branches/PHP_5_3_2/ext/imap/tests/bug44098.phpt
 U   php/php-src/trunk/ext/imap/config.m4
 U   php/php-src/trunk/ext/imap/config.w32
 U   php/php-src/trunk/ext/imap/php_imap.c
 A   php/php-src/trunk/ext/imap/tests/bug44098.phpt





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

[PHP-CVS] svn: /php/php-src/branches/PHP_5_2/ NEWS

[Jani Taskinen]

jani Mon, 01 Feb 2010 11:46:57 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=294300

Log:
fix news

Changed paths:
U   php/php-src/branches/PHP_5_2/NEWS

Modified: php/php-src/branches/PHP_5_2/NEWS
===
--- php/php-src/branches/PHP_5_2/NEWS   2010-02-01 11:38:50 UTC (rev 294299)
+++ php/php-src/branches/PHP_5_2/NEWS   2010-02-01 11:46:57 UTC (rev 294300)
@@ -4,7 +4,10 @@
 - Fixed a possible open_basedir/safe_mode bypass in session extension
   identified by Grzegorz Stachowiak. (Ilia)

+- Fixed bug #50727 (Accesing mysqli-affected_rows on no connection causes
+  segfault). (Andrey, Johannes)

+
 28 Jan 2010, PHP 5.2.13RC1
 - Updated timezone database to version 2010.2. (Derick)
 - Upgraded bundled PCRE to version 8.01. (Ilia)
@@ -40,8 +43,6 @@
 - Fixed bug #50732 (exec() adds single byte twice to $output array). (Ilia)
 - Fixed bug #50728 (All PDOExceptions hardcode 'code' property to 0). (Joey,
   Ilia)
-- Fixed bug #50727 Accesing mysqli-affected_rows on no connection causes
-  segfault). (Andrey, Johannes)
 - Fixed bug #50680 (strtotime() does not support eighth ordinal number).
   (Ilia)
 - Fixed bug #50661 (DOMDocument::loadXML does not allow UTF-16). (Rob)

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

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ NEWS

[Jani Taskinen]

jani Sun, 31 Jan 2010 22:48:09 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=294284

Log:
pff

Changed paths:
U   php/php-src/branches/PHP_5_3/NEWS

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2010-01-31 22:35:55 UTC (rev 294283)
+++ php/php-src/branches/PHP_5_3/NEWS   2010-01-31 22:48:09 UTC (rev 294284)
@@ -5,8 +5,6 @@
 - Upgraded bundled sqlite to version 3.6.22. (Ilia)
 - Upgraded bundled libmagic to version 5.03. (Mikko)

-- Fixed a possible open_basedir/safe_mode bypass in session extension
-  identified by Grzegorz Stachowiak. (Ilia)
 - Improved LCG entropy. (Rasmus, Samy Kamkar)

 - Added libpng 1.4.0 support. (Pierre)
@@ -17,6 +15,8 @@
 - Added stream filter support to mcrypt extension (ported from
   mcrypt_filter). (Stas)

+- Fixed a possible open_basedir/safe_mode bypass in session extension
+  identified by Grzegorz Stachowiak. (Ilia)
 - Fixed possible crash when a error/warning is raised during php startup.
   (Pierre)
 - Fixed possible bad behavior of rename on windows when used with symbolic

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

Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/main/php.h trunk/main/php.h

[Jani Taskinen]

On 01/27/2010 09:48 AM, Pierre Joye wrote:

pajoye   Wed, 27 Jan 2010 07:48:31 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=294075

Log:
- #50854, fix build on non windows

Bug: http://bugs.php.net/50854 (Open) DWORD and TSRMLS_DC undefined in php.h

Changed paths:
 U   php/php-src/branches/PHP_5_3/main/php.h
 U   php/php-src/trunk/main/php.h

Modified: php/php-src/branches/PHP_5_3/main/php.h
===
--- php/php-src/branches/PHP_5_3/main/php.h 2010-01-27 05:00:04 UTC (rev 
294074)
+++ php/php-src/branches/PHP_5_3/main/php.h 2010-01-27 07:48:31 UTC (rev 
294075)
@@ -309,8 +309,9 @@
PHP_ATTRIBUTE_FORMAT(printf, PHP_ATTR_FMT_OFFSET + 4, 
PHP_ATTR_FMT_OFFSET + 5);
  PHPAPI void php_error_docref2(const char *docref TSRMLS_DC, const char 
*param1, const char *param2, int type, const char *format, ...)
PHP_ATTRIBUTE_FORMAT(printf, PHP_ATTR_FMT_OFFSET + 5, 
PHP_ATTR_FMT_OFFSET + 6);
+#ifdef PHP_WIN32
  PHPAPI void php_win32_docref2_from_error(DWORD error, const char *param1, 
const char *param2 TSRMLS_DC);
-
+#endif
  END_EXTERN_C()

  #define php_error_docref php_error_docref0

Modified: php/php-src/trunk/main/php.h
===
--- php/php-src/trunk/main/php.h2010-01-27 05:00:04 UTC (rev 294074)
+++ php/php-src/trunk/main/php.h2010-01-27 07:48:31 UTC (rev 294075)
@@ -305,8 +305,10 @@
  /* PHPAPI void php_error(int type, const char *format, ...); */
  PHPAPI void php_error_docref0(const char *docref TSRMLS_DC, int type, const 
char *format, ...);
  PHPAPI void php_error_docref1(const char *docref TSRMLS_DC, const char 
*param1, int type, const char *format, ...);
+#ifdef PHP_WIN32
  PHPAPI void php_error_docref2(const char *docref TSRMLS_DC, 
conshp_error_docref2t char *param1, const char *param2, int type, const char 
*format, ...);
  PHPAPI void php_win32_docref2_from_error(DWORD error, const char *param1, 
const char *param2 TSRMLS_DC);
+#endif
  END_EXTERN_C()


Are you really sure? I didn't know php_error_docref2() was also win32 only?

--Jani

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

Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ NEWS

[Jani Taskinen]

On 01/27/2010 10:14 AM, Pierre Joye wrote:

pajoye   Wed, 27 Jan 2010 08:14:50 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=294076

Log:
- update

Changed paths:
 U   php/php-src/branches/PHP_5_3/NEWS

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2010-01-27 07:48:31 UTC (rev 294075)
+++ php/php-src/branches/PHP_5_3/NEWS   2010-01-27 08:14:50 UTC (rev 294076)
@@ -17,6 +17,10 @@

  - Fixed possible crash when a error/warning is raised during php startup.
(Pierre)
+- Fixed possible bad behavior of rename on windows when used with symbolic
+  links or invalid paths. (Pierre)
+- Fixed stderr output of errors messages on windows, it is now print out
+  synchronously as on most unix platforms. (Pierre)


Fail? Try again please. That last entry doesn't make much sense. Grammar 
fail. :)


--Jani



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

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ NEWS

[Jani Taskinen]

jani Wed, 27 Jan 2010 16:14:53 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=294099

Log:
- Short is enough, people will not understand it anyway. And this is not a 
TODO, this is what was already done..

Changed paths:
U   php/php-src/branches/PHP_5_3/NEWS

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2010-01-27 15:38:35 UTC (rev 294098)
+++ php/php-src/branches/PHP_5_3/NEWS   2010-01-27 16:14:53 UTC (rev 294099)
@@ -19,8 +19,7 @@
   (Pierre)
 - Fixed possible bad behavior of rename on windows when used with symbolic
   links or invalid paths. (Pierre)
-- Remove output buffering for error messages sent through stderr on
-  Windows. (Pierre)
+- Fixed error output to stderr on Windows. (Pierre)

 - Fixed bug #50859 (build fails with openssl 1.0 due to md2 deprecation).
   (Ilia, hanno at hboeck dot de)

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

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/NEWS branches/PHP_5_2/ext/standard/http_fopen_wrapper.c branches/PHP_5_3/NEWS branches/PHP_5_3/ext/standard/http_fopen_wrapper.c trunk/ext/standard/http_f

[Jani Taskinen]

jani Mon, 25 Jan 2010 16:28:13 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=293998

Log:
- Fixed bug #50832 (HTTP fopen wrapper does not support passwordless HTTP 
authentication)

Bug: http://bugs.php.net/50832 (Assigned) HTTP fopen wrapper does not support 
passwordless HTTP authentication
  
Changed paths:
U   php/php-src/branches/PHP_5_2/NEWS
U   php/php-src/branches/PHP_5_2/ext/standard/http_fopen_wrapper.c
U   php/php-src/branches/PHP_5_3/NEWS
U   php/php-src/branches/PHP_5_3/ext/standard/http_fopen_wrapper.c
U   php/php-src/trunk/ext/standard/http_fopen_wrapper.c

Modified: php/php-src/branches/PHP_5_2/NEWS
===
--- php/php-src/branches/PHP_5_2/NEWS   2010-01-25 16:21:23 UTC (rev 293997)
+++ php/php-src/branches/PHP_5_2/NEWS   2010-01-25 16:28:13 UTC (rev 293998)
@@ -18,6 +18,8 @@
   gdImageFilledPolygon (libgd #100). (Takeshi Abe)
 - Fixed build of mysqli with MySQL 5.5.0-m2. (Andrey)

+- Fixed bug #50832 (HTTP fopen wrapper does not support passwordless HTTP
+  authentication). (Jani)
 - Fixed bug #50823 (ReflectionFunction::isDeprecated producing cannot be 
called
   statically error). (Jani, Felipe)
 - Fixed bug #50791 (Compile failure: Bad logic in defining fopencookie

Modified: php/php-src/branches/PHP_5_2/ext/standard/http_fopen_wrapper.c
===
--- php/php-src/branches/PHP_5_2/ext/standard/http_fopen_wrapper.c  
2010-01-25 16:21:23 UTC (rev 293997)
+++ php/php-src/branches/PHP_5_2/ext/standard/http_fopen_wrapper.c  
2010-01-25 16:28:13 UTC (rev 293998)
@@ -415,16 +415,20 @@
}

/* auth header if it was specified */
-   if (((have_header  HTTP_HEADER_AUTH) == 0)  resource-user  
resource-pass){
+   if (((have_header  HTTP_HEADER_AUTH) == 0)  resource-user) {
/* decode the strings first */
php_url_decode(resource-user, strlen(resource-user));
-   php_url_decode(resource-pass, strlen(resource-pass));

/* scratch is large enough, since it was made large enough for 
the whole URL */
strcpy(scratch, resource-user);
strcat(scratch, :);
-   strcat(scratch, resource-pass);

+   /* Note: password is optional! */
+   if (resource-pass) {
+   php_url_decode(resource-pass, strlen(resource-pass));
+   strcat(scratch, resource-pass);
+   }
+
tmp = (char*)php_base64_encode((unsigned char*)scratch, 
strlen(scratch), NULL);

if (snprintf(scratch, scratch_len, Authorization: Basic 
%s\r\n, tmp)  0) {
@@ -719,7 +723,7 @@
s++;\
}   \
}   \
-}  \
+}
/* check for control characters in login, password  
path */
if (strncasecmp(new_path, http://;, sizeof(http://;) 
- 1) || strncasecmp(new_path, https://;, sizeof(https://;) - 1)) {
CHECK_FOR_CNTRL_CHARS(resource-user)

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2010-01-25 16:21:23 UTC (rev 293997)
+++ php/php-src/branches/PHP_5_3/NEWS   2010-01-25 16:28:13 UTC (rev 293998)
@@ -18,6 +18,8 @@
 - Fixed possible crash when a error/warning is raised during php startup.
   (Pierre)

+- Fixed bug #50832 (HTTP fopen wrapper does not support passwordless HTTP
+  authentication). (Jani)
 - Fixed bug #50787 (stream_set_write_buffer() has no effect on socket streams).
   (vnegrier at optilian dot com, Ilia)
 - Fixed bug #50761 (system.multiCall crashes in xmlrpc extension).

Modified: php/php-src/branches/PHP_5_3/ext/standard/http_fopen_wrapper.c
===
--- php/php-src/branches/PHP_5_3/ext/standard/http_fopen_wrapper.c  
2010-01-25 16:21:23 UTC (rev 293997)
+++ php/php-src/branches/PHP_5_3/ext/standard/http_fopen_wrapper.c  
2010-01-25 16:28:13 UTC (rev 293998)
@@ -416,16 +416,20 @@
}

/* auth header if it was specified */
-   if (((have_header  HTTP_HEADER_AUTH) == 0)  resource-user  
resource-pass){
+   if (((have_header  HTTP_HEADER_AUTH) == 0)  resource-user) {
/* decode the strings first */
php_url_decode(resource-user, strlen(resource-user));
-   php_url_decode(resource-pass, strlen(resource-pass));

/* scratch is large enough, since it was made large enough for 
the whole URL */
strcpy(scratch, resource-user);
strcat(scratch, :);
-   strcat(scratch, resource-pass);

+   /* Note: password is optional! */
+   if (resource-pass) {
+   

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ NEWS

[Jani Taskinen]

jani Sun, 24 Jan 2010 18:39:14 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=293926

Log:
fix entries..can you count to 80?

Changed paths:
U   php/php-src/branches/PHP_5_3/NEWS

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2010-01-24 18:37:37 UTC (rev 293925)
+++ php/php-src/branches/PHP_5_3/NEWS   2010-01-24 18:39:14 UTC (rev 293926)
@@ -15,24 +15,23 @@
 - Added stream filter support to mcrypt extension (ported from
   mcrypt_filter). (Stas)

-- Fixed possible crash when a error/warning is raised during php
-  startup. (Pierre)
+- Fixed possible crash when a error/warning is raised during php startup.
+  (Pierre)

-- Fixed bug #50787 (stream_set_write_buffer() has no effect on socket
-  streams). (vnegrier at optilian dot com, Ilia)
-- Fixed bug #50761 (system.multiCall crashes in xmlrpc extension). (hiroaki
-  dot kawai at gmail dot com, Ilia)
+- Fixed bug #50787 (stream_set_write_buffer() has no effect on socket streams).
+  (vnegrier at optilian dot com, Ilia)
+- Fixed bug #50761 (system.multiCall crashes in xmlrpc extension).
+  (hiroaki dot kawai at gmail dot com, Ilia)
 - Fixed bug #50756 (CURLOPT_FTP_SKIP_PASV_IP does not exist). (Sriram)
 - Fixed bug #50732 (exec() adds single byte twice to $output array). (Ilia)
-- Fixed bug #50728 (All PDOExceptions hardcode 'code' property to 0). (Joey,
-  Ilia)
-- Fixed bug #50690 (putenv does not set ENV when the value is only
-  one char). (Pierre)
-- Fixed bug #50680 (strtotime() does not support eighth ordinal number).
-  (Ilia)
+- Fixed bug #50728 (All PDOExceptions hardcode 'code' property to 0).
+  (Joey, Ilia)
+- Fixed bug #50690 (putenv does not set ENV when the value is only one char).
+  (Pierre)
+- Fixed bug #50680 (strtotime() does not support eighth ordinal number). (Ilia)
 - Fixed bug #50661 (DOMDocument::loadXML does not allow UTF-16). (Rob)
-- Fixed bug #50657 (copy() with an empty (zero-byte) HTTP source succeeds
-  but returns false). (Ilia)
+- Fixed bug #50657 (copy() with an empty (zero-byte) HTTP source succeeds but
+  returns false). (Ilia)
 - Fixed bug #50636 (MySQLi_Result sets values before calling constructor).
   (Pierrick)
 - Fixed bug #50632 (filter_input() does not return default value if the

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

[PHP-CVS] svn: /php/php-src/branches/PHP_5_2/ NEWS ext/reflection/php_reflection.c

[Jani Taskinen]

jani Fri, 22 Jan 2010 14:21:17 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=293850

Log:
- Fixed bug #50823 (ReflectionFunction::isDeprecated producing cannot be 
called statically error)
# Partial MF53 of r273045 by Felipe :)

Bug: http://bugs.php.net/50823 (Open) ReflectionFunction::isDeprecated 
producing cannot be called statically error
  
Changed paths:
U   php/php-src/branches/PHP_5_2/NEWS
U   php/php-src/branches/PHP_5_2/ext/reflection/php_reflection.c

Modified: php/php-src/branches/PHP_5_2/NEWS
===
--- php/php-src/branches/PHP_5_2/NEWS	2010-01-22 13:27:38 UTC (rev 293849)
+++ php/php-src/branches/PHP_5_2/NEWS	2010-01-22 14:21:17 UTC (rev 293850)
@@ -17,6 +17,8 @@
   gdImageFilledPolygon (libgd #100). (Takeshi Abe)
 - Fixed build of mysqli with MySQL 5.5.0-m2. (Andrey)

+- Fixed bug #50823 (ReflectionFunction::isDeprecated producing cannot be called
+  statically error). (Jani, Felipe)
 - Fixed bug #50791 (Compile failure: Bad logic in defining fopencookie
   emulation). (Jani)
 - Fixed bug #50787 (stream_set_write_buffer() has no effect on socket

Modified: php/php-src/branches/PHP_5_2/ext/reflection/php_reflection.c
===
--- php/php-src/branches/PHP_5_2/ext/reflection/php_reflection.c	2010-01-22 13:27:38 UTC (rev 293849)
+++ php/php-src/branches/PHP_5_2/ext/reflection/php_reflection.c	2010-01-22 14:21:17 UTC (rev 293850)
@@ -82,8 +82,8 @@
 		return; \
 	}   \

-#define METHOD_NOTSTATIC_NUMPARAMS(ce, c) METHOD_NOTSTATIC(ce)  \
-	if (ZEND_NUM_ARGS()  c) {  \
+#define METHOD_NOPARAMS()   \
+	if (ZEND_NUM_ARGS()  0) {  \
 		ZEND_WRONG_PARAM_COUNT();   \
 	}   \

@@ -1018,7 +1018,7 @@
 	reflection_object *intern;
 	zend_function *mptr;

-	METHOD_NOTSTATIC_NUMPARAMS(reflection_method_ptr, 0);
+	METHOD_NOPARAMS();
 	GET_REFLECTION_OBJECT_PTR(mptr);
 	RETURN_BOOL(mptr-common.fn_flags  mask);
 }
@@ -1420,7 +1420,7 @@
 	zend_function *fptr;
 	string str;

-	METHOD_NOTSTATIC_NUMPARAMS(reflection_function_abstract_ptr, 0);
+	METHOD_NOPARAMS();
 	GET_REFLECTION_OBJECT_PTR(fptr);
 	string_init(str);
 	_function_string(str, fptr, intern-ce,  TSRMLS_CC);
@@ -1432,7 +1432,7 @@
Returns this function's name */
 ZEND_METHOD(reflection, function_getName)
 {
-	METHOD_NOTSTATIC_NUMPARAMS(reflection_function_abstract_ptr, 0);
+	METHOD_NOPARAMS();
 	_default_get_entry(getThis(), name, sizeof(name), return_value TSRMLS_CC);
 }
 /* }}} */
@@ -1444,7 +1444,7 @@
 	reflection_object *intern;
 	zend_function *fptr;

-	METHOD_NOTSTATIC_NUMPARAMS(reflection_function_abstract_ptr, 0);
+	METHOD_NOPARAMS();
 	GET_REFLECTION_OBJECT_PTR(fptr);
 	RETURN_BOOL(fptr-type == ZEND_INTERNAL_FUNCTION);
 }
@@ -1457,7 +1457,7 @@
 	reflection_object *intern;
 	zend_function *fptr;

-	METHOD_NOTSTATIC_NUMPARAMS(reflection_function_abstract_ptr, 0);
+	METHOD_NOPARAMS();
 	GET_REFLECTION_OBJECT_PTR(fptr);
 	RETURN_BOOL(fptr-type == ZEND_USER_FUNCTION);
 }
@@ -1483,7 +1483,7 @@
 	reflection_object *intern;
 	zend_function *fptr;

-	METHOD_NOTSTATIC_NUMPARAMS(reflection_function_abstract_ptr, 0);
+	METHOD_NOPARAMS();
 	GET_REFLECTION_OBJECT_PTR(fptr);
 	if (fptr-type == ZEND_USER_FUNCTION) {
 		RETURN_STRING(fptr-op_array.filename, 1);
@@ -1499,7 +1499,7 @@
 	reflection_object *intern;
 	zend_function *fptr;

-	METHOD_NOTSTATIC_NUMPARAMS(reflection_function_abstract_ptr, 0);
+	METHOD_NOPARAMS();
 	GET_REFLECTION_OBJECT_PTR(fptr);
 	if (fptr-type == ZEND_USER_FUNCTION) {
 		RETURN_LONG(fptr-op_array.line_start);
@@ -1515,7 +1515,7 @@
 	reflection_object *intern;
 	zend_function *fptr;

-	METHOD_NOTSTATIC_NUMPARAMS(reflection_function_abstract_ptr, 0);
+	METHOD_NOPARAMS();
 	GET_REFLECTION_OBJECT_PTR(fptr);
 	if (fptr-type == ZEND_USER_FUNCTION) {
 		RETURN_LONG(fptr-op_array.line_end);
@@ -1531,7 +1531,7 @@
 	reflection_object *intern;
 	zend_function *fptr;

-	METHOD_NOTSTATIC_NUMPARAMS(reflection_function_abstract_ptr, 0);
+	METHOD_NOPARAMS();
 	GET_REFLECTION_OBJECT_PTR(fptr);
 	if (fptr-type == ZEND_USER_FUNCTION  fptr-op_array.doc_comment) {
 		RETURN_STRINGL(fptr-op_array.doc_comment, fptr-op_array.doc_comment_len, 1);
@@ -1548,7 +1548,7 @@
 	reflection_object *intern;
 	zend_function *fptr;

-	

[PHP-CVS] svn: /php/php-src/branches/PHP_5_2/ NEWS

[Jani Taskinen]

jani Wed, 20 Jan 2010 09:55:04 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=293763

Log:
BFN

Changed paths:
U   php/php-src/branches/PHP_5_2/NEWS

Modified: php/php-src/branches/PHP_5_2/NEWS
===
--- php/php-src/branches/PHP_5_2/NEWS   2010-01-20 09:39:06 UTC (rev 293762)
+++ php/php-src/branches/PHP_5_2/NEWS   2010-01-20 09:55:04 UTC (rev 293763)
@@ -11,6 +11,8 @@

 - Improved LCG entropy. (Rasmus, Samy Kamkar)

+- Fixed bug in bundled libgd causing spurious horizontal lines drawn by
+  gdImageFilledPolygon (libgd #100). (Takeshi Abe)
 - Fixed build of mysqli with MySQL 5.5.0-m2. (Andrey)

 - Fixed bug #50791 (Compile failure: Bad logic in defining fopencookie

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

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/main/streams/cast.c branches/PHP_5_3/main/streams/cast.c trunk/main/streams/cast.c

[Jani Taskinen]

jani Tue, 19 Jan 2010 12:03:07 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=293724

Log:
- WS + CS fixes

Changed paths:
U   php/php-src/branches/PHP_5_2/main/streams/cast.c
U   php/php-src/branches/PHP_5_3/main/streams/cast.c
U   php/php-src/trunk/main/streams/cast.c

Modified: php/php-src/branches/PHP_5_2/main/streams/cast.c
===
--- php/php-src/branches/PHP_5_2/main/streams/cast.c	2010-01-19 11:44:43 UTC (rev 293723)
+++ php/php-src/branches/PHP_5_2/main/streams/cast.c	2010-01-19 12:03:07 UTC (rev 293724)
@@ -55,6 +55,7 @@
 {
 	int ret;
 	TSRMLS_FETCH();
+
 	ret = php_stream_read((php_stream*)cookie, buffer, size);
 	return ret;
 }
@@ -62,12 +63,14 @@
 static int stream_cookie_writer(void *cookie, const char *buffer, int size)
 {
 	TSRMLS_FETCH();
+
 	return php_stream_write((php_stream *)cookie, (char *)buffer, size);
 }

 static fpos_t stream_cookie_seeker(void *cookie, off_t position, int whence)
 {
 	TSRMLS_FETCH();
+
 	return (fpos_t)php_stream_seek((php_stream *)cookie, position, whence);
 }

@@ -86,6 +89,7 @@
 {
 	ssize_t ret;
 	TSRMLS_FETCH();
+
 	ret = php_stream_read(((php_stream *)cookie), buffer, size);
 	return ret;
 }
@@ -93,6 +97,7 @@
 static ssize_t stream_cookie_writer(void *cookie, const char *buffer, size_t size)
 {
 	TSRMLS_FETCH();
+
 	return php_stream_write(((php_stream *)cookie), (char *)buffer, size);
 }

@@ -103,14 +108,16 @@

 	*position = php_stream_seek((php_stream *)cookie, (off_t)*position, whence);

-	if (*position == -1)
+	if (*position == -1) {
 		return -1;
+	}
 	return 0;
 }
 #else
 static int stream_cookie_seeker(void *cookie, off_t position, int whence)
 {
 	TSRMLS_FETCH();
+
 	return php_stream_seek((php_stream *)cookie, position, whence);
 }
 #endif
@@ -153,9 +160,9 @@
 			stream-readpos = stream-writepos = 0;
 		}
 	}
-
+
 	/* filtered streams can only be cast as stdio, and only when fopencookie is present */
-
+
 	if (castas == PHP_STREAM_AS_STDIO) {
 		if (stream-stdiocast) {
 			if (ret) {
@@ -167,31 +174,33 @@
 		/* if the stream is a stdio stream let's give it a chance to respond
 		 * first, to avoid doubling up the layers of stdio with an fopencookie */
 		if (php_stream_is(stream, PHP_STREAM_IS_STDIO) 
-stream-ops-cast 
-!php_stream_is_filtered(stream) 
-stream-ops-cast(stream, castas, ret TSRMLS_CC) == SUCCESS)
-		{
+			stream-ops-cast 
+			!php_stream_is_filtered(stream) 
+			stream-ops-cast(stream, castas, ret TSRMLS_CC) == SUCCESS
+		) {
 			goto exit_success;
 		}
-
+
 #if HAVE_FOPENCOOKIE
 		/* if just checking, say yes we can be a FILE*, but don't actually create it yet */
-		if (ret == NULL)
+		if (ret == NULL) {
 			goto exit_success;
+		}

 		*(FILE**)ret = fopencookie(stream, stream-mode, PHP_STREAM_COOKIE_FUNCTIONS);

 		if (*ret != NULL) {
 			off_t pos;
-
+
 			stream-fclose_stdiocast = PHP_STREAM_FCLOSE_FOPENCOOKIE;

 			/* If the stream position is not at the start, we need to force
 			 * the stdio layer to believe it's real location. */
 			pos = php_stream_tell(stream);
-			if (pos  0)
+			if (pos  0) {
 fseek(*ret, pos, SEEK_SET);
-
+			}
+
 			goto exit_success;
 		}

@@ -221,9 +230,10 @@
 } else {
 	int retcode = php_stream_cast(newstream, castas | flags, (void **)ret, show_err);

-	if (retcode == SUCCESS)
+	if (retcode == SUCCESS) {
 		rewind(*(FILE**)ret);
-
+	}
+
 	/* do some specialized cleanup */
 	if ((flags  PHP_STREAM_CAST_RELEASE)) {
 		php_stream_free(stream, PHP_STREAM_FREE_CLOSE_CASTED);
@@ -245,13 +255,13 @@
 	if (show_err) {
 		/* these names depend on the values of the PHP_STREAM_AS_XXX defines in php_streams.h */
 		static const char *cast_names[4] = {
-			STDIO FILE*, File Descriptor, Socket Descriptor, select()able descriptor
+			STDIO FILE*,
+			File Descriptor,
+			Socket Descriptor,
+			select()able descriptor
 		};

-		php_error_docref(NULL TSRMLS_CC, E_WARNING, cannot represent a stream of type %s as a %s,
-			stream-ops-label,
-			cast_names[castas]
-			);
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, cannot represent a stream of type %s as a %s, stream-ops-label, cast_names[castas]);
 	}

 	return FAILURE;
@@ -259,20 +269,20 @@
 exit_success:

 	if ((stream-writepos - stream-readpos)  0 
-			stream-fclose_stdiocast != PHP_STREAM_FCLOSE_FOPENCOOKIE 
-			(flags  PHP_STREAM_CAST_INTERNAL) == 0) {
+		stream-fclose_stdiocast != PHP_STREAM_FCLOSE_FOPENCOOKIE 
+		(flags  PHP_STREAM_CAST_INTERNAL) == 0
+	) {
 		/* the data we have buffered will be lost to the third party library that
 		 * will be accessing the stream.  Emit a warning so that the end-user will
 		 * know that they should try something else */
-
-		php_error_docref(NULL TSRMLS_CC, E_WARNING,
-%ld bytes of buffered data lost during stream conversion!,
-(long)(stream-writepos - stream-readpos));
+
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, %ld bytes of 

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/ext/standard/tests/misc/time_sleep_until_error2.phpt branches/PHP_5_3/ext/standard/tests/misc/time_sleep_until_error2.phpt trunk/ext/standard/tests/misc/t

[Jani Taskinen]

jani Tue, 19 Jan 2010 12:31:29 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=293726

Log:
- Add missing skipif

Changed paths:
U   
php/php-src/branches/PHP_5_2/ext/standard/tests/misc/time_sleep_until_error2.phpt
U   
php/php-src/branches/PHP_5_3/ext/standard/tests/misc/time_sleep_until_error2.phpt
U   php/php-src/trunk/ext/standard/tests/misc/time_sleep_until_error2.phpt

Modified: 
php/php-src/branches/PHP_5_2/ext/standard/tests/misc/time_sleep_until_error2.phpt
===
--- 
php/php-src/branches/PHP_5_2/ext/standard/tests/misc/time_sleep_until_error2.phpt
   2010-01-19 12:13:06 UTC (rev 293725)
+++ 
php/php-src/branches/PHP_5_2/ext/standard/tests/misc/time_sleep_until_error2.phpt
   2010-01-19 12:31:29 UTC (rev 293726)
@@ -1,5 +1,9 @@
 --TEST--
 time_sleep_until() function - error test for time_sleep_until()
+--SKIPIF--
+?php
+   function_exists('time_sleep_until') or die('skip time_sleep_until() is 
not supported in this build.');
+?
 --CREDITS--
 Filippo De Santis f...@ideato.it
 #PHPTestFest Cesena Italia on 2009-06-20

Modified: 
php/php-src/branches/PHP_5_3/ext/standard/tests/misc/time_sleep_until_error2.phpt
===
--- 
php/php-src/branches/PHP_5_3/ext/standard/tests/misc/time_sleep_until_error2.phpt
   2010-01-19 12:13:06 UTC (rev 293725)
+++ 
php/php-src/branches/PHP_5_3/ext/standard/tests/misc/time_sleep_until_error2.phpt
   2010-01-19 12:31:29 UTC (rev 293726)
@@ -1,5 +1,9 @@
 --TEST--
 time_sleep_until() function - error test for time_sleep_until()
+--SKIPIF--
+?php
+   function_exists('time_sleep_until') or die('skip time_sleep_until() is 
not supported in this build.');
+?
 --CREDITS--
 Filippo De Santis f...@ideato.it
 #PHPTestFest Cesena Italia on 2009-06-20

Modified: php/php-src/trunk/ext/standard/tests/misc/time_sleep_until_error2.phpt
===
--- php/php-src/trunk/ext/standard/tests/misc/time_sleep_until_error2.phpt  
2010-01-19 12:13:06 UTC (rev 293725)
+++ php/php-src/trunk/ext/standard/tests/misc/time_sleep_until_error2.phpt  
2010-01-19 12:31:29 UTC (rev 293726)
@@ -1,5 +1,9 @@
 --TEST--
 time_sleep_until() function - error test for time_sleep_until()
+--SKIPIF--
+?php
+   function_exists('time_sleep_until') or die('skip time_sleep_until() is 
not supported in this build.');
+?
 --CREDITS--
 Filippo De Santis f...@ideato.it
 #PHPTestFest Cesena Italia on 2009-06-20

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

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/NEWS branches/PHP_5_2/ext/curl/streams.c branches/PHP_5_2/main/streams/cast.c branches/PHP_5_3/ext/curl/streams.c branches/PHP_5_3/main/streams/cast.c tru

[Jani Taskinen]

jani Tue, 19 Jan 2010 13:44:08 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=293732

Log:
- Fixed bug #50791 (Compile failure: Bad logic in defining fopencookie 
emulation)

Bug: http://bugs.php.net/50791 (Assigned) Bad logic in defining fopencookie 
emulation
  
Changed paths:
U   php/php-src/branches/PHP_5_2/NEWS
U   php/php-src/branches/PHP_5_2/ext/curl/streams.c
U   php/php-src/branches/PHP_5_2/main/streams/cast.c
U   php/php-src/branches/PHP_5_3/ext/curl/streams.c
U   php/php-src/branches/PHP_5_3/main/streams/cast.c
U   php/php-src/trunk/ext/curl/streams.c
U   php/php-src/trunk/main/streams/cast.c

Modified: php/php-src/branches/PHP_5_2/NEWS
===
--- php/php-src/branches/PHP_5_2/NEWS	2010-01-19 13:28:26 UTC (rev 293731)
+++ php/php-src/branches/PHP_5_2/NEWS	2010-01-19 13:44:08 UTC (rev 293732)
@@ -13,6 +13,8 @@

 - Fixed build of mysqli with MySQL 5.5.0-m2. (Andrey)

+- Fixed bug #50791 (Compile failure: Bad logic in defining fopencookie
+  emulation). (Jani)
 - Fixed bug #50787 (stream_set_write_buffer() has no effect on socket
   streams). (vnegrier at optilian dot com, Ilia)
 - Fixed bug #50761 (system.multiCall crashes in xmlrpc extension). (hiroaki

Modified: php/php-src/branches/PHP_5_2/ext/curl/streams.c
===
--- php/php-src/branches/PHP_5_2/ext/curl/streams.c	2010-01-19 13:28:26 UTC (rev 293731)
+++ php/php-src/branches/PHP_5_2/ext/curl/streams.c	2010-01-19 13:44:08 UTC (rev 293732)
@@ -277,7 +277,7 @@
 	 * have a FILE* associated with it.
 	 * Otherwise, use the smart memory stream that will turn itself into a file
 	 * when it gets large */
-#if !HAVE_FOPENCOOKIE
+#ifndef HAVE_FOPENCOOKIE
 	if (options  STREAM_WILL_CAST) {
 		curlstream-readbuffer.buf = php_stream_fopen_tmpfile();
 	} else
@@ -442,7 +442,7 @@
 	php_stream_to_zval(curlstream-readbuffer.buf, tmp);
 	add_assoc_zval(stream-wrapperdata, readbuf, tmp);

-#if !HAVE_FOPENCOOKIE
+#ifndef HAVE_FOPENCOOKIE
 	if (options  STREAM_WILL_CAST) {
 		/* we will need to download the whole resource now,
 		 * since we cannot get the actual FD for the download,

Modified: php/php-src/branches/PHP_5_2/main/streams/cast.c
===
--- php/php-src/branches/PHP_5_2/main/streams/cast.c	2010-01-19 13:28:26 UTC (rev 293731)
+++ php/php-src/branches/PHP_5_2/main/streams/cast.c	2010-01-19 13:44:08 UTC (rev 293732)
@@ -30,7 +30,7 @@
 #include php_streams_int.h

 /* Under BSD, emulate fopencookie using funopen */
-#if HAVE_FUNOPEN
+#if defined(HAVE_FUNOPEN)  !defined(HAVE_FOPENCOOKIE)
 typedef struct {
 	int (*reader)(void *, char *, int);
 	int (*writer)(void *, const char *, int);
@@ -43,13 +43,14 @@
 	return funopen(cookie, funcs-reader, funcs-writer, funcs-seeker, funcs-closer);
 }
 # define HAVE_FOPENCOOKIE 1
+# define PHP_EMULATE_FOPENCOOKIE 1
 # define PHP_STREAM_COOKIE_FUNCTIONS	stream_cookie_functions
-#elif HAVE_FOPENCOOKIE
+#elif defined(HAVE_FOPENCOOKIE)
 # define PHP_STREAM_COOKIE_FUNCTIONS	stream_cookie_functions
 #endif

 /* {{{ STDIO with fopencookie */
-#if HAVE_FUNOPEN
+#if defined(PHP_EMULATE_FOPENCOOKIE)
 /* use our fopencookie emulation */
 static int stream_cookie_reader(void *cookie, char *buffer, int size)
 {
@@ -83,8 +84,7 @@
 	stream-fclose_stdiocast = PHP_STREAM_FCLOSE_NONE;
 	return php_stream_close(stream);
 }
-
-#elif HAVE_FOPENCOOKIE
+#elif defined(HAVE_FOPENCOOKIE)
 static ssize_t stream_cookie_reader(void *cookie, char *buffer, size_t size)
 {
 	ssize_t ret;
@@ -101,7 +101,7 @@
 	return php_stream_write(((php_stream *)cookie), (char *)buffer, size);
 }

-#ifdef COOKIE_SEEKER_USES_OFF64_T
+# ifdef COOKIE_SEEKER_USES_OFF64_T
 static int stream_cookie_seeker(void *cookie, __off64_t *position, int whence)
 {
 	TSRMLS_FETCH();
@@ -113,14 +113,14 @@
 	}
 	return 0;
 }
-#else
+# else
 static int stream_cookie_seeker(void *cookie, off_t position, int whence)
 {
 	TSRMLS_FETCH();

 	return php_stream_seek((php_stream *)cookie, position, whence);
 }
-#endif
+# endif

 static int stream_cookie_closer(void *cookie)
 {
@@ -131,7 +131,7 @@
 	stream-fclose_stdiocast = PHP_STREAM_FCLOSE_NONE;
 	return php_stream_close(stream);
 }
-#endif /* elif HAVE_FOPENCOOKIE */
+#endif /* elif defined(HAVE_FOPENCOOKIE) */

 #if HAVE_FOPENCOOKIE
 static COOKIE_IO_FUNCTIONS_T stream_cookie_functions =

Modified: php/php-src/branches/PHP_5_3/ext/curl/streams.c
===
--- php/php-src/branches/PHP_5_3/ext/curl/streams.c	2010-01-19 13:28:26 UTC (rev 293731)
+++ php/php-src/branches/PHP_5_3/ext/curl/streams.c	2010-01-19 13:44:08 UTC (rev 293732)
@@ -280,7 +280,7 @@
 	 * have a FILE* associated with it.
 	 * Otherwise, use the smart memory stream that will turn itself into a file
 	 * when it gets large */
-#if !HAVE_FOPENCOOKIE

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/main/php_ini.c trunk/main/php_ini.c

[Jani Taskinen]

jani Sat, 16 Jan 2010 21:01:12 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=293627

Log:
- Fixed bug #48811 (Directives in PATH section do not get applied to 
subdirectories)

Bug: http://bugs.php.net/48811 (Assigned) Directives in PATH section do not get 
applied to subdirectories
  
Changed paths:
U   php/php-src/branches/PHP_5_3/NEWS
U   php/php-src/branches/PHP_5_3/main/php_ini.c
U   php/php-src/trunk/main/php_ini.c

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2010-01-16 20:55:07 UTC (rev 293626)
+++ php/php-src/branches/PHP_5_3/NEWS   2010-01-16 21:01:12 UTC (rev 293627)
@@ -28,6 +28,8 @@
 - Fixed bug #50576 (XML_OPTION_SKIP_TAGSTART option has no effect). (Pierrick)
 - Fixed bug #49560 (oci8: using LOBs causes slow PHP shutdown). (Oracle Corp.)
 - Fixed bug #49463 (setAttributeNS fails setting default namespace). (Rob)
+- Fixed bug #48811 (Directives in PATH section do not get applied to
+  subdirectories). (Patch by: ct at swin dot edu dot au)
 - Fixed bug #48590 (SoapClient does not honor max_redirects). (Sriram)
 - Fixed bug #48190 (Content-type parameter boundary is not case-insensitive
   in HTTP uploads). (Ilia)

Modified: php/php-src/branches/PHP_5_3/main/php_ini.c
===
--- php/php-src/branches/PHP_5_3/main/php_ini.c 2010-01-16 20:55:07 UTC (rev 
293626)
+++ php/php-src/branches/PHP_5_3/main/php_ini.c 2010-01-16 21:01:12 UTC (rev 
293627)
@@ -807,7 +807,7 @@
while ((ptr = strchr(ptr, '/')) != NULL) {
*ptr = 0;
/* Search for source array matching the path from 
configuration_hash */
-   if (zend_hash_find(configuration_hash, path, path_len, 
(void **) tmp) == SUCCESS) {
+   if (zend_hash_find(configuration_hash, path, 
strlen(path) + 1, (void **) tmp) == SUCCESS) {
php_ini_activate_config(Z_ARRVAL_P(tmp), 
PHP_INI_SYSTEM, PHP_INI_STAGE_ACTIVATE TSRMLS_CC);
}
*ptr = '/';

Modified: php/php-src/trunk/main/php_ini.c
===
--- php/php-src/trunk/main/php_ini.c2010-01-16 20:55:07 UTC (rev 293626)
+++ php/php-src/trunk/main/php_ini.c2010-01-16 21:01:12 UTC (rev 293627)
@@ -814,7 +814,7 @@
while ((ptr = strchr(ptr, '/')) != NULL) {
*ptr = 0;
/* Search for source array matching the path from 
configuration_hash */
-   if (zend_hash_find(configuration_hash, path, path_len, 
(void **) tmp) == SUCCESS) {
+   if (zend_hash_find(configuration_hash, path, 
strlen(path) + 1, (void **) tmp) == SUCCESS) {
php_ini_activate_config(Z_ARRVAL_P(tmp), 
PHP_INI_SYSTEM, PHP_INI_STAGE_ACTIVATE TSRMLS_CC);
}
*ptr = '/';

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

[PHP-CVS] svn: /php/php-src/branches/ PHP_5_2/NEWS PHP_5_3/NEWS

[Jani Taskinen]

jani Fri, 08 Jan 2010 09:56:38 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=293254

Log:
fix news

Changed paths:
U   php/php-src/branches/PHP_5_2/NEWS
U   php/php-src/branches/PHP_5_3/NEWS

Modified: php/php-src/branches/PHP_5_2/NEWS
===
--- php/php-src/branches/PHP_5_2/NEWS   2010-01-08 09:43:14 UTC (rev 293253)
+++ php/php-src/branches/PHP_5_2/NEWS   2010-01-08 09:56:38 UTC (rev 293254)
@@ -9,10 +9,10 @@
 - Added missing host validation for HTTP urls inside FILTER_VALIDATE_URL.
   (Ilia)

+- Improved LCG entropy. (Rasmus, Samy Kamkar)
+
 - Fixed build of mysqli with MySQL 5.5.0-m2. (Andrey)

-- Improved LCG entropy (Rasmus, Samy Kamkar)
-
 - Fixed bug #50680 (strtotime() does not support eighth ordinal number).
   (Ilia)
 - Fixed bug #50661 (DOMDocument::loadXML does not allow UTF-16). (Rob)

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2010-01-08 09:43:14 UTC (rev 293253)
+++ php/php-src/branches/PHP_5_3/NEWS   2010-01-08 09:56:38 UTC (rev 293254)
@@ -3,11 +3,12 @@
 ?? ??? 20??, PHP 5.3.3
 - Upgraded bundled libmagic to version 5.03. (Mikko)

+- Improved LCG entropy. (Rasmus, Samy Kamkar)
+
 - Added support for DISABLE_AUTHENTICATOR for imap_open. (Pierre)
 - Added missing host validation for HTTP urls inside FILTER_VALIDATE_URL.
   (Ilia)
 - Added stream_resolve_include_path(). (Mikko)
-- Improved LCG entropy (Rasmus, Samy Kamkar)

 - Fixed bug #50680 (strtotime() does not support eighth ordinal number).
   (Ilia)

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

Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ext/standard/ basic_functions.c dns.c php_dns.h

[Jani Taskinen]

On 01/07/2010 01:02 PM, Sebastian Bergmann wrote:

sebastianThu, 07 Jan 2010 11:02:39 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=293211

Log:
sed -i s#1997-2008#1997-2010#g **/*.c **/*.h

Bug: http://bugs.php.net/1997 (Bogus) Compilation Problems


Why is that commit script picking these without word 'bug' in the commit 
message? Sebastian spammed a few reports now unintentionally..


--Jani





Changed paths:
 U   php/php-src/branches/PHP_5_3/ext/standard/basic_functions.c
 U   php/php-src/branches/PHP_5_3/ext/standard/dns.c
 U   php/php-src/branches/PHP_5_3/ext/standard/php_dns.h

Modified: php/php-src/branches/PHP_5_3/ext/standard/basic_functions.c
===
--- php/php-src/branches/PHP_5_3/ext/standard/basic_functions.c 2010-01-07 
10:51:05 UTC (rev 293210)
+++ php/php-src/branches/PHP_5_3/ext/standard/basic_functions.c 2010-01-07 
11:02:39 UTC (rev 293211)
@@ -2,7 +2,7 @@
 +--+
 | PHP Version 5|
 +--+
-   | Copyright (c) 1997-2008 The PHP Group|
+   | Copyright (c) 1997-2010 The PHP Group|
 +--+
 | This source file is subject to version 3.01 of the PHP license,  |
 | that is bundled with this package in the file LICENSE, and is|

Modified: php/php-src/branches/PHP_5_3/ext/standard/dns.c
===
--- php/php-src/branches/PHP_5_3/ext/standard/dns.c 2010-01-07 10:51:05 UTC 
(rev 293210)
+++ php/php-src/branches/PHP_5_3/ext/standard/dns.c 2010-01-07 11:02:39 UTC 
(rev 293211)
@@ -2,7 +2,7 @@
 +--+
 | PHP Version 5|
 +--+
-   | Copyright (c) 1997-2008 The PHP Group|
+   | Copyright (c) 1997-2010 The PHP Group|
 +--+
 | This source file is subject to version 3.01 of the PHP license,  |
 | that is bundled with this package in the file LICENSE, and is|

Modified: php/php-src/branches/PHP_5_3/ext/standard/php_dns.h
===
--- php/php-src/branches/PHP_5_3/ext/standard/php_dns.h 2010-01-07 10:51:05 UTC 
(rev 293210)
+++ php/php-src/branches/PHP_5_3/ext/standard/php_dns.h 2010-01-07 11:02:39 UTC 
(rev 293211)
@@ -2,7 +2,7 @@
 +--+
 | PHP Version 5|
 +--+
-   | Copyright (c) 1997-2008 The PHP Group|
+   | Copyright (c) 1997-2010 The PHP Group|
 +--+
 | This source file is subject to version 3.01 of the PHP license,  |
 | that is bundled with this package in the file LICENSE, and is|





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

[PHP-CVS] svn: /php/php-src/branches/PHP_5_2/ NEWS

[Jani Taskinen]

jani Tue, 29 Dec 2009 10:27:54 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=292736

Log:
order

Changed paths:
U   php/php-src/branches/PHP_5_2/NEWS

Modified: php/php-src/branches/PHP_5_2/NEWS
===
--- php/php-src/branches/PHP_5_2/NEWS   2009-12-29 09:43:03 UTC (rev 292735)
+++ php/php-src/branches/PHP_5_2/NEWS   2009-12-29 10:27:54 UTC (rev 292736)
@@ -1,12 +1,14 @@
 PHPNEWS
 |||
 ?? ??? 2010, PHP 5.2.13
-- Added missing host validation for HTTP urls inside FILTER_VALIDATE_URL.
-  (Ilia)
 - Removed automatic file descriptor unlocking happening on shutdown and/or
   stream close (on all OSes excluding Windows). (Tony, Ilia)
+
 - Changed tidyNode class to disallow manual node creation. (Pierrick)

+- Added missing host validation for HTTP urls inside FILTER_VALIDATE_URL.
+  (Ilia)
+
 - Fixed build of mysqli with MySQL 5.5.0-m2. (Andrey)

 - Fixed bug #50575 (PDO_PGSQL LOBs are not compatible with PostgreSQL 8.5).

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

[PHP-CVS] svn: /php/php-src/trunk/ext/tidy/ tidy.c

[Jani Taskinen]

jani Tue, 29 Dec 2009 12:46:48 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=292756

Log:
- WS + CS

Changed paths:
U   php/php-src/trunk/ext/tidy/tidy.c

Modified: php/php-src/trunk/ext/tidy/tidy.c
===
--- php/php-src/trunk/ext/tidy/tidy.c	2009-12-29 12:45:51 UTC (rev 292755)
+++ php/php-src/trunk/ext/tidy/tidy.c	2009-12-29 12:46:48 UTC (rev 292756)
@@ -45,7 +45,7 @@
 #define FIX_BUFFER(bptr) do { if ((bptr)-size) { (bptr)-bp[(bptr)-size-1] = '\0'; } } while(0)

 #define TIDY_SET_CONTEXT \
-zval *object = getThis();
+	zval *object = getThis();

 #define TIDY_FETCH_OBJECT	\
 	PHPTidyObj *obj;	\
@@ -70,22 +70,22 @@
 	obj = (PHPTidyObj *) zend_object_store_get_object(object TSRMLS_CC);	\

 #define TIDY_APPLY_CONFIG_ZVAL(_doc, _val) \
-if(_val) { \
-if(Z_TYPE_PP(_val) == IS_ARRAY) { \
-_php_tidy_apply_config_array(_doc, HASH_OF(*_val) TSRMLS_CC); \
-} else if (Z_TYPE_PP(_val) != IS_NULL) { \
-convert_to_string_ex(_val); \
-TIDY_OPEN_BASEDIR_CHECK(Z_STRVAL_PP(_val)); \
-switch (tidyLoadConfig(_doc, Z_STRVAL_PP(_val))) { \
-  case -1: \
-php_error_docref(NULL TSRMLS_CC, E_WARNING, Could not load configuration file '%s', Z_STRVAL_PP(_val)); \
-break; \
-  case 1: \
-php_error_docref(NULL TSRMLS_CC, E_NOTICE, There were errors while parsing the configuration file '%s', Z_STRVAL_PP(_val)); \
-break; \
-} \
-} \
-}
+	if (_val) { \
+		if (Z_TYPE_PP(_val) == IS_ARRAY) { \
+			_php_tidy_apply_config_array(_doc, HASH_OF(*_val) TSRMLS_CC); \
+		} else if (Z_TYPE_PP(_val) != IS_NULL) { \
+			convert_to_string_ex(_val); \
+			TIDY_OPEN_BASEDIR_CHECK(Z_STRVAL_PP(_val)); \
+			switch (tidyLoadConfig(_doc, Z_STRVAL_PP(_val))) { \
+case -1: \
+	php_error_docref(NULL TSRMLS_CC, E_WARNING, Could not load configuration file '%s', Z_STRVAL_PP(_val)); \
+break; \
+case 1: \
+	php_error_docref(NULL TSRMLS_CC, E_NOTICE, There were errors while parsing the configuration file '%s', Z_STRVAL_PP(_val)); \
+break; \
+			} \
+		} \
+	}

 #define REGISTER_TIDY_CLASS(classname, name, parent, __flags) \
 	{ \
@@ -122,16 +122,16 @@
 	}

 #define ADD_PROPERTY_STRINGL(_conv, _table, _key, _string, _len) \
-   { \
-   zval *tmp; \
-   MAKE_STD_ZVAL(tmp); \
-   if (_string) { \
-   ZVAL_U_STRINGL(_conv, tmp, (char *)_string, _len, 1); \
-   } else { \
-   ZVAL_EMPTY_STRING(tmp); \
-   } \
-   zend_ascii_hash_update(_table, #_key, sizeof(#_key), (void *)tmp, sizeof(zval *), NULL); \
-   }
+	{ \
+		zval *tmp; \
+		MAKE_STD_ZVAL(tmp); \
+		if (_string) { \
+			ZVAL_U_STRINGL(_conv, tmp, (char *)_string, _len, 1); \
+		} else { \
+			ZVAL_EMPTY_STRING(tmp); \
+		} \
+		zend_ascii_hash_update(_table, #_key, sizeof(#_key), (void *)tmp, sizeof(zval *), NULL); \
+}

 #define ADD_PROPERTY_LONG(_table, _key, _long) \
 	{ \
@@ -150,11 +150,11 @@
 	}

 #define ADD_PROPERTY_BOOL(_table, _key, _bool) \
-{ \
-   zval *tmp; \
-   MAKE_STD_ZVAL(tmp); \
-   ZVAL_BOOL(tmp, _bool); \
-   zend_ascii_hash_update(_table, #_key, sizeof(#_key), (void *)tmp, sizeof(zval *), NULL); \
+	{ \
+		zval *tmp; \
+		MAKE_STD_ZVAL(tmp); \
+		ZVAL_BOOL(tmp, _bool); \
+		zend_ascii_hash_update(_table, #_key, sizeof(#_key), (void *)tmp, sizeof(zval *), NULL); \
}

 #define TIDY_OPEN_BASEDIR_CHECK(filename) \
@@ -170,7 +170,7 @@
 	}
 /* }}} */

-/* {{{ ext/tidy structs
+/* {{{ ext/tidy structs
 */
 typedef struct _PHPTidyDoc PHPTidyDoc;
 typedef struct _PHPTidyObj PHPTidyObj;
@@ -188,22 +188,22 @@
 } tidy_base_nodetypes;

 struct _PHPTidyDoc {
-	TidyDoc doc;
-	TidyBuffer  *errbuf;
-	unsigned int ref_count;
+	TidyDoc			doc;
+	TidyBuffer		*errbuf;
+	unsigned int	ref_count;
 };

 typedef struct _PHPTidyConv {
-	UConverter *conv;
-	unsigned long ref_count;
+	UConverter		*conv;
+	unsigned long	ref_count;
 } PHPTidyConv;

 struct _PHPTidyObj {
-	zend_object std;
-	TidyNodenode;
-	tidy_obj_type   type;
-	PHPTidyDoc  *ptdoc;
-	PHPTidyConv *converter;
+	zend_object		std;
+	TidyNode		node;
+	tidy_obj_type	type;
+	PHPTidyDoc		*ptdoc;
+	PHPTidyConv		*converter;
 };
 /* }}} */

@@ -384,7 +384,7 @@
 	PHP_FE(tidy_parse_string,   arginfo_tidy_parse_string)
 	PHP_FE(tidy_parse_file, arginfo_tidy_parse_file)
 	PHP_FE(tidy_get_output, arginfo_tidy_get_output)
-	PHP_FE(tidy_get_error_buffer,   arginfo_tidy_get_error_buffer)
+	PHP_FE(tidy_get_error_buffer,   arginfo_tidy_get_error_buffer)
 	PHP_FE(tidy_clean_repair,   arginfo_tidy_clean_repair)
 	PHP_FE(tidy_repair_string,	arginfo_tidy_repair_string)
 	PHP_FE(tidy_repair_file,	arginfo_tidy_repair_file)
@@ -398,7 +398,7 @@
 	PHP_FE(tidy_error_count,	arginfo_tidy_error_count)
 	

[PHP-CVS] svn: /php/php-src/trunk/ext/tidy/ tidy.c

[Jani Taskinen]

jani Tue, 29 Dec 2009 12:57:38 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=292757

Log:
- Try prevent accidents

Changed paths:
U   php/php-src/trunk/ext/tidy/tidy.c

Modified: php/php-src/trunk/ext/tidy/tidy.c
===
--- php/php-src/trunk/ext/tidy/tidy.c   2009-12-29 12:46:48 UTC (rev 292756)
+++ php/php-src/trunk/ext/tidy/tidy.c   2009-12-29 12:57:38 UTC (rev 292757)
@@ -59,7 +59,7 @@
RETURN_FALSE;   \
}   \
}   \
-   obj = (PHPTidyObj *) zend_object_store_get_object(object TSRMLS_CC);
\
+   obj = (PHPTidyObj *) zend_object_store_get_object(object TSRMLS_CC);

 #define TIDY_FETCH_ONLY_OBJECT \
PHPTidyObj *obj;\
@@ -67,7 +67,7 @@
if (zend_parse_parameters_none() == FAILURE) {  \
return; \
}   \
-   obj = (PHPTidyObj *) zend_object_store_get_object(object TSRMLS_CC);
\
+   obj = (PHPTidyObj *) zend_object_store_get_object(object TSRMLS_CC);

 #define TIDY_APPLY_CONFIG_ZVAL(_doc, _val) \
if (_val) { \
@@ -131,7 +131,7 @@
ZVAL_EMPTY_STRING(tmp); \
} \
zend_ascii_hash_update(_table, #_key, sizeof(#_key), (void 
*)tmp, sizeof(zval *), NULL); \
-}
+   }

 #define ADD_PROPERTY_LONG(_table, _key, _long) \
{ \
@@ -158,9 +158,9 @@
}

 #define TIDY_OPEN_BASEDIR_CHECK(filename) \
-if (php_check_open_basedir(filename TSRMLS_CC)) { \
-   RETURN_FALSE; \
-} \
+   if (php_check_open_basedir(filename TSRMLS_CC)) { \
+   RETURN_FALSE; \
+   }

 #define TIDY_SET_DEFAULT_CONFIG(_doc) \
if (TG(default_config)  TG(default_config)[0]) { \

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

[PHP-CVS] svn: /php/php-src/trunk/ext/tidy/ tidy.c

[Jani Taskinen]

jani Tue, 29 Dec 2009 13:00:09 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=292758

Log:
- Last ws pollution, I hope.

Changed paths:
U   php/php-src/trunk/ext/tidy/tidy.c

Modified: php/php-src/trunk/ext/tidy/tidy.c
===
--- php/php-src/trunk/ext/tidy/tidy.c   2009-12-29 12:57:38 UTC (rev 292757)
+++ php/php-src/trunk/ext/tidy/tidy.c   2009-12-29 13:00:09 UTC (rev 292758)
@@ -155,7 +155,7 @@
MAKE_STD_ZVAL(tmp); \
ZVAL_BOOL(tmp, _bool); \
zend_ascii_hash_update(_table, #_key, sizeof(#_key), (void 
*)tmp, sizeof(zval *), NULL); \
-   }
+   }

 #define TIDY_OPEN_BASEDIR_CHECK(filename) \
if (php_check_open_basedir(filename TSRMLS_CC)) { \

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

[PHP-CVS] svn: /php/php-src/branches/PHP_5_2/main/ rfc1867.c

[Jani Taskinen]

jani Tue, 29 Dec 2009 18:54:08 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=292770

Log:
MFH: clean some dead code (with static analysis help) (Approved by Ilia)

Changed paths:
U   php/php-src/branches/PHP_5_2/main/rfc1867.c

Modified: php/php-src/branches/PHP_5_2/main/rfc1867.c
===
--- php/php-src/branches/PHP_5_2/main/rfc1867.c 2009-12-29 17:25:12 UTC (rev 
292769)
+++ php/php-src/branches/PHP_5_2/main/rfc1867.c 2009-12-29 18:54:08 UTC (rev 
292770)
@@ -32,7 +32,6 @@
 #include php_globals.h
 #include php_variables.h
 #include rfc1867.h
-#include php_ini.h
 #include ext/standard/php_string.h

 #define DEBUG_FILE_UPLOAD ZEND_DEBUG
@@ -205,7 +204,8 @@
index = NULL;
}
}
-   *s++='\0';
+
+   *s = '\0';
 }


@@ -612,7 +612,7 @@
}
}

-   *resp++ = '\0';
+   *resp = '\0';
return result;
 }


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

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/main/ rfc1867.c

[Jani Taskinen]

jani Tue, 29 Dec 2009 18:59:58 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=292771

Log:
- WS + CS + folding tags

Changed paths:
U   php/php-src/branches/PHP_5_3/main/rfc1867.c

Modified: php/php-src/branches/PHP_5_3/main/rfc1867.c
===
--- php/php-src/branches/PHP_5_3/main/rfc1867.c	2009-12-29 18:54:08 UTC (rev 292770)
+++ php/php-src/branches/PHP_5_3/main/rfc1867.c	2009-12-29 18:59:58 UTC (rev 292771)
@@ -13,7 +13,7 @@
| lice...@php.net so we can mail you a copy immediately.   |
+--+
| Authors: Rasmus Lerdorf ras...@php.net |
-   |  Jani Taskinen sni...@php.net  |
+   |  Jani Taskinen j...@php.net|
+--+
  */

@@ -23,7 +23,7 @@
  *  This product includes software developed by the Apache Group
  *  for use in the Apache HTTP server project (http://www.apache.org/).
  *
- */
+ */

 #include stdio.h
 #include php.h
@@ -44,7 +44,7 @@
 static void safe_php_register_variable(char *var, char *strval, int val_len, zval *track_vars_array, zend_bool override_protection TSRMLS_DC);

 #define SAFE_RETURN { \
-php_mb_flush_gpc_variables(num_vars, val_list, len_list, array_ptr TSRMLS_CC); \
+	php_mb_flush_gpc_variables(num_vars, val_list, len_list, array_ptr TSRMLS_CC); \
 	if (lbuf) efree(lbuf); \
 	if (abuf) efree(abuf); \
 	if (array_index) efree(array_index); \
@@ -56,7 +56,7 @@
 	if (mbuff) efree(mbuff); \
 	return; }

-void php_mb_flush_gpc_variables(int num_vars, char **val_list, int *len_list, zval *array_ptr  TSRMLS_DC)
+void php_mb_flush_gpc_variables(int num_vars, char **val_list, int *len_list, zval *array_ptr  TSRMLS_DC) /* {{{ */
 {
 	int i;
 	if (php_mb_encoding_translation(TSRMLS_C)) {
@@ -64,17 +64,18 @@
 			php_mb_gpc_encoding_detector(val_list, len_list, num_vars, NULL TSRMLS_CC) == SUCCESS) {
 			php_mb_gpc_encoding_converter(val_list, len_list, num_vars, NULL, NULL TSRMLS_CC);
 		}
-		for (i=0; inum_vars; i+=2){
+		for (i = 0; inum_vars; i += 2) {
 			safe_php_register_variable(val_list[i], val_list[i+1], len_list[i+1], array_ptr, 0 TSRMLS_CC);
 			efree(val_list[i]);
 			efree(val_list[i+1]);
-		}
+		}
 		efree(val_list);
 		efree(len_list);
 	}
 }
+/* }}} */

-void php_mb_gpc_realloc_buffer(char ***pval_list, int **plen_list, int *num_vars_max, int inc  TSRMLS_DC)
+void php_mb_gpc_realloc_buffer(char ***pval_list, int **plen_list, int *num_vars_max, int inc  TSRMLS_DC) /* {{{ */
 {
 	/* allow only even increments */
 	if (inc  1) {
@@ -84,15 +85,15 @@
 	*pval_list = (char **)erealloc(*pval_list, (*num_vars_max+2)*sizeof(char *));
 	*plen_list = (int *)erealloc(*plen_list, (*num_vars_max+2)*sizeof(int));
 }
+/* }}} */

-void php_mb_gpc_stack_variable(char *param, char *value, char ***pval_list, int **plen_list, int *num_vars, int *num_vars_max TSRMLS_DC)
+void php_mb_gpc_stack_variable(char *param, char *value, char ***pval_list, int **plen_list, int *num_vars, int *num_vars_max TSRMLS_DC) /* {{{ */
 {
-	char **val_list=*pval_list;
-	int *len_list=*plen_list;
+	char **val_list = *pval_list;
+	int *len_list = *plen_list;

-	if (*num_vars=*num_vars_max){
-		php_mb_gpc_realloc_buffer(pval_list, plen_list, num_vars_max,
-  16 TSRMLS_CC);
+	if (*num_vars = *num_vars_max) {
+		php_mb_gpc_realloc_buffer(pval_list, plen_list, num_vars_max, 16 TSRMLS_CC);
 		/* in case realloc relocated the buffer */
 		val_list = *pval_list;
 		len_list = *plen_list;
@@ -105,6 +106,7 @@
 	len_list[*num_vars] = strlen(value);
 	(*num_vars)++;
 }
+/* }}} */

 #else

@@ -137,7 +139,7 @@
 #define UPLOAD_ERROR_F7  /* Failed to write file to disk */
 #define UPLOAD_ERROR_X8  /* File upload stopped by extension */

-void php_rfc1867_register_constants(TSRMLS_D)
+void php_rfc1867_register_constants(TSRMLS_D) /* {{{ */
 {
 	REGISTER_MAIN_LONG_CONSTANT(UPLOAD_ERR_OK, UPLOAD_ERROR_OK, CONST_CS | CONST_PERSISTENT);
 	REGISTER_MAIN_LONG_CONSTANT(UPLOAD_ERR_INI_SIZE,   UPLOAD_ERROR_A,  CONST_CS | CONST_PERSISTENT);
@@ -148,26 +150,27 @@
 	REGISTER_MAIN_LONG_CONSTANT(UPLOAD_ERR_CANT_WRITE, UPLOAD_ERROR_F,  CONST_CS | CONST_PERSISTENT);
 	REGISTER_MAIN_LONG_CONSTANT(UPLOAD_ERR_EXTENSION,  UPLOAD_ERROR_X,  CONST_CS | CONST_PERSISTENT);
 }
+/* }}} */

-static void normalize_protected_variable(char *varname TSRMLS_DC)
+static void normalize_protected_variable(char *varname TSRMLS_DC) /* {{{ */
 {
-	char *s=varname, *index=NULL, *indexend=NULL, *p;
-
+	char *s = varname, *index = NULL, *indexend = NULL, *p;
+
 	/* overjump leading space */
 	while (*s == ' ') {
 		s++;
 	}
-
+
 	/* and remove it */
 	if (s != varname) {
 		memmove(varname, s, strlen(s)+1);
 	}

-	for (p=varname; *p  *p != '['; p++) {
+	for (p = varname; *p  *p

[PHP-CVS] svn: /php/php-src/branches/PHP_5_2/main/ rfc1867.c

[Jani Taskinen]

jani Tue, 29 Dec 2009 19:01:03 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=292772

Log:
MF53: ws + cs + folding tags (99% sync :)

Changed paths:
U   php/php-src/branches/PHP_5_2/main/rfc1867.c

Modified: php/php-src/branches/PHP_5_2/main/rfc1867.c
===
--- php/php-src/branches/PHP_5_2/main/rfc1867.c	2009-12-29 18:59:58 UTC (rev 292771)
+++ php/php-src/branches/PHP_5_2/main/rfc1867.c	2009-12-29 19:01:03 UTC (rev 292772)
@@ -13,7 +13,7 @@
| lice...@php.net so we can mail you a copy immediately.   |
+--+
| Authors: Rasmus Lerdorf ras...@php.net |
-   |  Jani Taskinen sni...@php.net  |
+   |  Jani Taskinen j...@php.net|
+--+
  */

@@ -23,7 +23,7 @@
  *  This product includes software developed by the Apache Group
  *  for use in the Apache HTTP server project (http://www.apache.org/).
  *
- */
+ */

 #include stdio.h
 #include php.h
@@ -32,6 +32,7 @@
 #include php_globals.h
 #include php_variables.h
 #include rfc1867.h
+#include php_ini.h
 #include ext/standard/php_string.h

 #define DEBUG_FILE_UPLOAD ZEND_DEBUG
@@ -44,7 +45,7 @@
 static void safe_php_register_variable(char *var, char *strval, int val_len, zval *track_vars_array, zend_bool override_protection TSRMLS_DC);

 #define SAFE_RETURN { \
-php_mb_flush_gpc_variables(num_vars, val_list, len_list, array_ptr TSRMLS_CC); \
+	php_mb_flush_gpc_variables(num_vars, val_list, len_list, array_ptr TSRMLS_CC); \
 	if (lbuf) efree(lbuf); \
 	if (abuf) efree(abuf); \
 	if (array_index) efree(array_index); \
@@ -56,7 +57,7 @@
 	if (mbuff) efree(mbuff); \
 	return; }

-void php_mb_flush_gpc_variables(int num_vars, char **val_list, int *len_list, zval *array_ptr  TSRMLS_DC)
+void php_mb_flush_gpc_variables(int num_vars, char **val_list, int *len_list, zval *array_ptr  TSRMLS_DC) /* {{{ */
 {
 	int i;
 	if (php_mb_encoding_translation(TSRMLS_C)) {
@@ -64,17 +65,18 @@
 			php_mb_gpc_encoding_detector(val_list, len_list, num_vars, NULL TSRMLS_CC) == SUCCESS) {
 			php_mb_gpc_encoding_converter(val_list, len_list, num_vars, NULL, NULL TSRMLS_CC);
 		}
-		for (i=0; inum_vars; i+=2){
+		for (i = 0; inum_vars; i += 2) {
 			safe_php_register_variable(val_list[i], val_list[i+1], len_list[i+1], array_ptr, 0 TSRMLS_CC);
 			efree(val_list[i]);
 			efree(val_list[i+1]);
-		}
+		}
 		efree(val_list);
 		efree(len_list);
 	}
 }
+/* }}} */

-void php_mb_gpc_realloc_buffer(char ***pval_list, int **plen_list, int *num_vars_max, int inc  TSRMLS_DC)
+void php_mb_gpc_realloc_buffer(char ***pval_list, int **plen_list, int *num_vars_max, int inc  TSRMLS_DC) /* {{{ */
 {
 	/* allow only even increments */
 	if (inc  1) {
@@ -84,15 +86,15 @@
 	*pval_list = (char **)erealloc(*pval_list, (*num_vars_max+2)*sizeof(char *));
 	*plen_list = (int *)erealloc(*plen_list, (*num_vars_max+2)*sizeof(int));
 }
+/* }}} */

-void php_mb_gpc_stack_variable(char *param, char *value, char ***pval_list, int **plen_list, int *num_vars, int *num_vars_max TSRMLS_DC)
+void php_mb_gpc_stack_variable(char *param, char *value, char ***pval_list, int **plen_list, int *num_vars, int *num_vars_max TSRMLS_DC) /* {{{ */
 {
-	char **val_list=*pval_list;
-	int *len_list=*plen_list;
+	char **val_list = *pval_list;
+	int *len_list = *plen_list;

-	if (*num_vars=*num_vars_max){
-		php_mb_gpc_realloc_buffer(pval_list, plen_list, num_vars_max,
-  16 TSRMLS_CC);
+	if (*num_vars = *num_vars_max) {
+		php_mb_gpc_realloc_buffer(pval_list, plen_list, num_vars_max, 16 TSRMLS_CC);
 		/* in case realloc relocated the buffer */
 		val_list = *pval_list;
 		len_list = *plen_list;
@@ -105,6 +107,7 @@
 	len_list[*num_vars] = strlen(value);
 	(*num_vars)++;
 }
+/* }}} */

 #else

@@ -137,7 +140,7 @@
 #define UPLOAD_ERROR_F7  /* Failed to write file to disk */
 #define UPLOAD_ERROR_X8  /* File upload stopped by extension */

-void php_rfc1867_register_constants(TSRMLS_D)
+void php_rfc1867_register_constants(TSRMLS_D) /* {{{ */
 {
 	REGISTER_MAIN_LONG_CONSTANT(UPLOAD_ERR_OK, UPLOAD_ERROR_OK, CONST_CS | CONST_PERSISTENT);
 	REGISTER_MAIN_LONG_CONSTANT(UPLOAD_ERR_INI_SIZE,   UPLOAD_ERROR_A,  CONST_CS | CONST_PERSISTENT);
@@ -148,26 +151,27 @@
 	REGISTER_MAIN_LONG_CONSTANT(UPLOAD_ERR_CANT_WRITE, UPLOAD_ERROR_F,  CONST_CS | CONST_PERSISTENT);
 	REGISTER_MAIN_LONG_CONSTANT(UPLOAD_ERR_EXTENSION,  UPLOAD_ERROR_X,  CONST_CS | CONST_PERSISTENT);
 }
+/* }}} */

-static void normalize_protected_variable(char *varname TSRMLS_DC)
+static void normalize_protected_variable(char *varname TSRMLS_DC) /* {{{ */
 {
-	char *s=varname, *index=NULL, *indexend=NULL, *p;
-
+	char *s = varname, *index = NULL, *indexend = NULL, *p;
+
 	/* overjump leading

[PHP-CVS] svn: /php/php-src/trunk/main/ rfc1867.c

[Jani Taskinen]

jani Tue, 29 Dec 2009 19:23:41 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=292776

Log:
- CS + WS + folding tags

Changed paths:
U   php/php-src/trunk/main/rfc1867.c

Modified: php/php-src/trunk/main/rfc1867.c
===
--- php/php-src/trunk/main/rfc1867.c	2009-12-29 19:14:39 UTC (rev 292775)
+++ php/php-src/trunk/main/rfc1867.c	2009-12-29 19:23:41 UTC (rev 292776)
@@ -13,7 +13,7 @@
| lice...@php.net so we can mail you a copy immediately.   |
+--+
| Authors: Rasmus Lerdorf ras...@php.net |
-   |  Jani Taskinen sni...@php.net  |
+   |  Jani Taskinen j...@php.net|
+--+
  */

@@ -65,7 +65,7 @@
 #define UPLOAD_ERROR_F7  /* Failed to write file to disk */
 #define UPLOAD_ERROR_X8  /* File upload stopped by extension */

-void php_rfc1867_register_constants(TSRMLS_D)
+void php_rfc1867_register_constants(TSRMLS_D) /* {{{ */
 {
 	REGISTER_MAIN_LONG_CONSTANT(UPLOAD_ERR_OK, UPLOAD_ERROR_OK, CONST_CS | CONST_PERSISTENT);
 	REGISTER_MAIN_LONG_CONSTANT(UPLOAD_ERR_INI_SIZE,   UPLOAD_ERROR_A,  CONST_CS | CONST_PERSISTENT);
@@ -76,24 +76,24 @@
 	REGISTER_MAIN_LONG_CONSTANT(UPLOAD_ERR_CANT_WRITE, UPLOAD_ERROR_F,  CONST_CS | CONST_PERSISTENT);
 	REGISTER_MAIN_LONG_CONSTANT(UPLOAD_ERR_EXTENSION,  UPLOAD_ERROR_X,  CONST_CS | CONST_PERSISTENT);
 }
+/* }}} */

-static int unlink_filename(char **filename TSRMLS_DC)
+static int unlink_filename(char **filename TSRMLS_DC) /* {{{ */
 {
 	VCWD_UNLINK(*filename);
 	return 0;
 }
+/* }}} */

-void destroy_uploaded_files_hash(TSRMLS_D)
+void destroy_uploaded_files_hash(TSRMLS_D) /* {{{ */
 {
 	zend_hash_apply(SG(rfc1867_uploaded_files), (apply_func_t) unlink_filename TSRMLS_CC);
 	zend_hash_destroy(SG(rfc1867_uploaded_files));
 	FREE_HASHTABLE(SG(rfc1867_uploaded_files));
 }
+/* }}} */

-/*
- *  Following code is based on apache_multipart_buffer.c from libapreq-0.33 package.
- *
- */
+/* {{{ Following code is based on apache_multipart_buffer.c from libapreq-0.33 package. */

 #define FILLUNIT (1024 * 5)

@@ -118,9 +118,9 @@
 } mime_header_entry;

 /*
-  fill up the buffer with client data.
-  returns number of bytes added to buffer.
-*/
+ * Fill up the buffer with client data.
+ * Returns number of bytes added to buffer.
+ */
 static int fill_buffer(multipart_buffer *self TSRMLS_DC)
 {
 	int bytes_to_read, total_read = 0, actual_read = 0;
@@ -195,15 +195,15 @@
 }

 /*
-  gets the next CRLF terminated line from the input buffer.
-  if it doesn't find a CRLF, and the buffer isn't completely full, returns
-  NULL; otherwise, returns the beginning of the null-terminated line,
-  minus the CRLF.
-
-  note that we really just look for LF terminated lines. this works
-  around a bug in internet explorer for the macintosh which sends mime
-  boundaries that are only LF terminated when you use an image submit
-  button in a multipart/form-data form.
+ * Gets the next CRLF terminated line from the input buffer.
+ * If it doesn't find a CRLF, and the buffer isn't completely full, returns
+ * NULL; otherwise, returns the beginning of the null-terminated line,
+ * minus the CRLF.
+ *
+ * Note that we really just look for LF terminated lines. This works
+ * around a bug in internet explorer for the macintosh which sends mime
+ * boundaries that are only LF terminated when you use an image submit
+ * button in a multipart/form-data form.
  */
 static char *next_line(multipart_buffer *self)
 {
@@ -239,7 +239,7 @@
 	return line;
 }

-/* returns the next CRLF terminated line from the client */
+/* Returns the next CRLF terminated line from the client */
 static char *get_line(multipart_buffer *self TSRMLS_DC)
 {
 	char* ptr = next_line(self);
@@ -362,7 +362,6 @@
 	char *res;

 	while (*pos  *pos != stop) {
-
 		if ((quote = *pos) == '' || quote == '\'') {
 			++pos;
 			while (*pos  *pos != quote) {
@@ -376,7 +375,6 @@
 ++pos;
 			}
 		} else ++pos;
-
 	}
 	if (*pos == '\0') {
 		res = estrdup(*line);
@@ -467,10 +465,10 @@
 }

 /*
-  search for a string in a fixed-length byte string.
-  if partial is true, partial matches are allowed at the end of the buffer.
-  returns NULL if not found, or a pointer to the start of the first match.
-*/
+ * Search for a string in a fixed-length byte string.
+ * If partial is true, partial matches are allowed at the end of the buffer.
+ * Returns NULL if not found, or a pointer to the start of the first match.
+ */
 static void *php_ap_memstr(char *haystack, int haystacklen, char *needle, int needlen, int partial)
 {
 	int len = haystacklen;
@@ -559,13 +557,15 @@

 	return out;
 }
+/* }}} */

-static void register_raw_var_ex(char *var, zval *value, HashTable *array

[PHP-CVS] svn: /php/php-src/branches/ PHP_5_2/main/rfc1867.c PHP_5_3/main/rfc1867.c

[Jani Taskinen]

jani Tue, 29 Dec 2009 19:25:09 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=292777

Log:
- Sync with HEAD

Changed paths:
U   php/php-src/branches/PHP_5_2/main/rfc1867.c
U   php/php-src/branches/PHP_5_3/main/rfc1867.c

Modified: php/php-src/branches/PHP_5_2/main/rfc1867.c
===
--- php/php-src/branches/PHP_5_2/main/rfc1867.c 2009-12-29 19:23:41 UTC (rev 
292776)
+++ php/php-src/branches/PHP_5_2/main/rfc1867.c 2009-12-29 19:25:09 UTC (rev 
292777)
@@ -263,7 +263,7 @@
 }
 /* }}} */

-static int unlink_filename(char **filename TSRMLS_DC) /* {{{ */
+static int unlink_filename(char **filename TSRMLS_DC) /* {{{ */
 {
VCWD_UNLINK(*filename);
return 0;
@@ -304,7 +304,7 @@

 /*
  * Fill up the buffer with client data.
- * returns number of bytes added to buffer.
+ * Returns number of bytes added to buffer.
  */
 static int fill_buffer(multipart_buffer *self TSRMLS_DC)
 {
@@ -417,7 +417,7 @@
return line;
 }

-/* returns the next CRLF terminated line from the client */
+/* Returns the next CRLF terminated line from the client */
 static char *get_line(multipart_buffer *self TSRMLS_DC)
 {
char* ptr = next_line(self);
@@ -665,7 +665,7 @@
  * Search for a string in a fixed-length byte string.
  * If partial is true, partial matches are allowed at the end of the buffer.
  * Returns NULL if not found, or a pointer to the start of the first match.
-*/
+ */
 static void *php_ap_memstr(char *haystack, int haystacklen, char *needle, int 
needlen, int partial)
 {
int len = haystacklen;
@@ -747,12 +747,14 @@
total_bytes += read_bytes;
}

-   if (out) out[total_bytes] = '\0';
+   if (out) {
+   out[total_bytes] = '\0';
+   }
*len = total_bytes;

return out;
 }
-/* }}} */
+/* }}} */

 /*
  * The combined READER/HANDLER
@@ -773,7 +775,7 @@
 #endif
multipart_buffer *mbuff;
zval *array_ptr = (zval *) arg;
-   int fd=-1;
+   int fd = -1;
zend_llist header;
void *event_extra_data = NULL;
int llen = 0;
@@ -860,7 +862,7 @@
while (!multipart_buffer_eof(mbuff TSRMLS_CC))
{
char buff[FILLUNIT];
-   char *cd = NULL,*param = NULL, *filename = NULL, *tmp = NULL;
+   char *cd = NULL, *param = NULL, *filename = NULL, *tmp = NULL;
size_t blen = 0, wlen = 0;
off_t offset;

@@ -1084,7 +1086,6 @@
 #endif
cancel_upload = UPLOAD_ERROR_B;
} else if (blen  0) {
-
wlen = write(fd, buff, blen);

if (wlen == -1) {
@@ -1119,7 +1120,6 @@
cancel_upload = 5;
}
 #endif
-
if (php_rfc1867_callback != NULL) {
multipart_event_file_end event_file_end;

@@ -1153,7 +1153,7 @@
if (array_index) {
efree(array_index);
}
-   array_index = estrndup(start_arr+1, 
array_len-2);
+   array_index = estrndup(start_arr + 1, array_len 
- 2);
}

/* Add $foo_name */
@@ -1339,6 +1339,7 @@
efree(param);
}
}
+
 fileupload_done:
if (php_rfc1867_callback != NULL) {
multipart_event_end event_end;
@@ -1349,6 +1350,7 @@

SAFE_RETURN;
 }
+/* }}} */

 /*
  * Local variables:

Modified: php/php-src/branches/PHP_5_3/main/rfc1867.c
===
--- php/php-src/branches/PHP_5_3/main/rfc1867.c 2009-12-29 19:23:41 UTC (rev 
292776)
+++ php/php-src/branches/PHP_5_3/main/rfc1867.c 2009-12-29 19:25:09 UTC (rev 
292777)
@@ -262,7 +262,7 @@
 }
 /* }}} */

-static int unlink_filename(char **filename TSRMLS_DC) /* {{{ */
+static int unlink_filename(char **filename TSRMLS_DC) /* {{{ */
 {
VCWD_UNLINK(*filename);
return 0;
@@ -303,7 +303,7 @@

 /*
  * Fill up the buffer with client data.
- * returns number of bytes added to buffer.
+ * Returns number of bytes added to buffer.
  */
 static int fill_buffer(multipart_buffer *self TSRMLS_DC)
 {
@@ -416,7 +416,7 @@
return line;
 }

-/* returns the next CRLF terminated line from the client */
+/* Returns the next CRLF terminated line from the client */
 static char *get_line(multipart_buffer *self TSRMLS_DC)
 {
char* ptr = next_line(self);
@@ -664,7 +664,7 @@
  * Search for a string in a fixed-length byte string.
  * If partial is true, partial matches are allowed at the end of the buffer.
  * Returns NULL if not found, or a pointer to the start of the first match.
-*/
+ */
 

Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ext/imap/ php_imap.c

[Jani Taskinen]

And what about the merge to HEAD ?

--Jani


22.12.2009 16:57, Pierre Joye wrote:

pajoye   Tue, 22 Dec 2009 14:57:57 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=292481

Log:
- fix build and warning (introduced by my last commit)

Changed paths:
 U   php/php-src/branches/PHP_5_3/ext/imap/php_imap.c

Modified: php/php-src/branches/PHP_5_3/ext/imap/php_imap.c
===
--- php/php-src/branches/PHP_5_3/ext/imap/php_imap.c2009-12-22 14:06:04 UTC 
(rev 292480)
+++ php/php-src/branches/PHP_5_3/ext/imap/php_imap.c2009-12-22 14:57:57 UTC 
(rev 292481)
@@ -1276,19 +1276,18 @@
int folder_len, message_len, internal_date_len = 0, flags_len = 0;
pils *imap_le_struct;
STRING st;
-
-   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, 
rss|ss,streamind,folder,folder_len,message,message_len,flags,flags_len,internal_date,internal_date_len)
 == FAILURE) {
-   return;
-   }
-
char* regex = 
/[0-3][0-9]-((Jan)|(Feb)|(Mar)|(Apr)|(May)|(Jun)|(Jul)|(Aug)|(Sep)|(Oct)|(Nov)|(Dec))-[0-9]{4}
 [0-2][0-9]:[0-5][0-9]:[0-5][0-9] [+-][0-9]{4}/;
-   int regex_len = strlen(regex);
+   const int regex_len = strlen(regex);
pcre_cache_entry *pce;  /* Compiled regex */
zval *subpats = NULL;   /* Parts (not used) */
long regex_flags = 0;   /* Flags (not used) */
long start_offset = 0;  /* Start offset (not 
used) */
int global = 0;

+   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, 
rss|ss,streamind,folder,folder_len,message,message_len,flags,flags_len,internal_date,internal_date_len)
 == FAILURE) {
+   return;
+   }
+
if (internal_date) {
/* Make sure the given internal_date string matches the RFC 
specifiedformat */
if ((pce = pcre_get_compiled_regex_cache(regex, regex_len 
TSRMLS_CC))== NULL) {





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

Re: [PHP-CVS] svn: /php/php-src/branches/

[Jani Taskinen]

22.12.2009 23:43, Johannes Schlüter wrote:

johannes Tue, 22 Dec 2009 21:43:59 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=292499

Log:
release branch 5.3.2

Changed paths:
 A + php/php-src/branches/PHP_5_3_2/
 (from php/php-src/branches/PHP_5_3/:r292498)



Oh god, not this mess again..weren't you told not to do this again? And do it 
instead the way Ilia seems to be able to pull it off?


--Jani



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

Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ NEWS ext/standard/html.c ext/standard/tests/strings/html_entity_decode_html4.phpt ext/standard/tests/strings/htmlentities_html4.phpt

[Jani Taskinen]

You seem to have forgot to commit to HEAD first and then _merge_ to branch 
again. Or was this something that isn't needed in HEAD or what?


--Jani


22.12.2009 7:50, Moriyoshi Koizumi wrote:

moriyoshiTue, 22 Dec 2009 05:50:34 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=292467

Log:
- Fix bug #46478 (htmlentities() uses obsolete mapping table for character
   entity references)

Bug: http://bugs.php.net/46478 (Assigned) htmlentities() uses obsolete mapping 
table for character entity references

Changed paths:
 U   php/php-src/branches/PHP_5_3/NEWS
 U   php/php-src/branches/PHP_5_3/ext/standard/html.c
 A   
php/php-src/branches/PHP_5_3/ext/standard/tests/strings/html_entity_decode_html4.phpt
 A   
php/php-src/branches/PHP_5_3/ext/standard/tests/strings/htmlentities_html4.phpt





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

[PHP-CVS] svn: /php/php-src/branches/PHP_5_2/ NEWS

[Jani Taskinen]

jani Wed, 23 Dec 2009 21:00:46 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=292560

Log:
I really like the extra space.

Changed paths:
U   php/php-src/branches/PHP_5_2/NEWS

Modified: php/php-src/branches/PHP_5_2/NEWS
===
--- php/php-src/branches/PHP_5_2/NEWS   2009-12-23 20:36:35 UTC (rev 292559)
+++ php/php-src/branches/PHP_5_2/NEWS   2009-12-23 21:00:46 UTC (rev 292560)
@@ -16,6 +16,7 @@
 - Fixed bug #45599 (strip_tags() truncates rest of string with invalid
   attribute). (Ilia, hradtke)

+
 17 Dec 2009, PHP 5.2.12
 - Updated timezone database to version 2009.19 (2009s). (Derick)


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

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ NEWS

[Jani Taskinen]

jani Wed, 23 Dec 2009 21:02:12 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=292561

Log:
I really like the extra space.

Changed paths:
U   php/php-src/branches/PHP_5_3/NEWS

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2009-12-23 21:00:46 UTC (rev 292560)
+++ php/php-src/branches/PHP_5_3/NEWS   2009-12-23 21:02:12 UTC (rev 292561)
@@ -4,6 +4,7 @@
 - Fixed bug #47409 (extract() problem with array containing word this).
   (Ilia, chrisstocktonaz at gmail dot com)

+
 ?? ??? 20??, PHP 5.3.2
 - Upgraded bundled sqlite to version 3.6.21. (Ilia)
 - Upgraded bundled PCRE to version 8.00. (Scott)
@@ -148,6 +149,7 @@
 - Fixed bug #34852 (Failure in odbc_exec() using oracle-supplied odbc
   driver). (tim dot tassonis at trivadis dot com)

+
 19 Nov 2009, PHP 5.3.1
 - Upgraded bundled sqlite to version 3.6.19. (Scott)
 - Updated timezone database to version 2009.17 (2009q). (Derick)

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

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/ext/iconv/php_iconv.h branches/PHP_5_3/ext/iconv/php_iconv.h trunk/ext/iconv/php_iconv.h

[Jani Taskinen]

jani Wed, 23 Dec 2009 21:06:26 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=292562

Log:
- ws

Changed paths:
U   php/php-src/branches/PHP_5_2/ext/iconv/php_iconv.h
U   php/php-src/branches/PHP_5_3/ext/iconv/php_iconv.h
U   php/php-src/trunk/ext/iconv/php_iconv.h

Modified: php/php-src/branches/PHP_5_2/ext/iconv/php_iconv.h
===
--- php/php-src/branches/PHP_5_2/ext/iconv/php_iconv.h  2009-12-23 21:02:12 UTC 
(rev 292561)
+++ php/php-src/branches/PHP_5_2/ext/iconv/php_iconv.h  2009-12-23 21:06:26 UTC 
(rev 292562)
@@ -23,13 +23,13 @@
 #define PHP_ICONV_H

 #ifdef PHP_WIN32
-#ifdef PHP_ICONV_EXPORTS
-#define PHP_ICONV_API __declspec(dllexport)
+# ifdef PHP_ICONV_EXPORTS
+#  define PHP_ICONV_API __declspec(dllexport)
+# else
+#  define PHP_ICONV_API __declspec(dllimport)
+# endif
 #else
-#define PHP_ICONV_API __declspec(dllimport)
-#endif
-#else
-#define PHP_ICONV_API
+# define PHP_ICONV_API
 #endif

 #ifdef PHP_ATOM_INC
@@ -42,7 +42,6 @@
 #include ext/iconv/php_php_iconv_h_path.h
 #endif

-
 #ifdef HAVE_ICONV
 extern zend_module_entry iconv_module_entry;
 #define iconv_module_ptr iconv_module_entry
@@ -70,9 +69,9 @@
 ZEND_END_MODULE_GLOBALS(iconv)

 #ifdef ZTS
-#define ICONVG(v) TSRMG(iconv_globals_id, zend_iconv_globals *, v)
+# define ICONVG(v) TSRMG(iconv_globals_id, zend_iconv_globals *, v)
 #else
-#define ICONVG(v) (iconv_globals.v)
+# define ICONVG(v) (iconv_globals.v)
 #endif

 #define ICONV_INPUT_ENCODING ISO-8859-1
@@ -109,7 +108,6 @@

 #endif /* PHP_ICONV_H */

-
 /*
  * Local variables:
  * tab-width: 4

Modified: php/php-src/branches/PHP_5_3/ext/iconv/php_iconv.h
===
--- php/php-src/branches/PHP_5_3/ext/iconv/php_iconv.h  2009-12-23 21:02:12 UTC 
(rev 292561)
+++ php/php-src/branches/PHP_5_3/ext/iconv/php_iconv.h  2009-12-23 21:06:26 UTC 
(rev 292562)
@@ -23,15 +23,15 @@
 #define PHP_ICONV_H

 #ifdef PHP_WIN32
-#  ifdef PHP_ICONV_EXPORTS
-#  define PHP_ICONV_API __declspec(dllexport)
-#  else
-#  define PHP_ICONV_API __declspec(dllimport)
-#  endif
+# ifdef PHP_ICONV_EXPORTS
+#  define PHP_ICONV_API __declspec(dllexport)
+# else
+#  define PHP_ICONV_API __declspec(dllimport)
+# endif
 #elif defined(__GNUC__)  __GNUC__ = 4
-#  define PHP_ICONV_API __attribute__ ((visibility(default)))
+# define PHP_ICONV_API __attribute__ ((visibility(default)))
 #else
-#  define PHP_ICONV_API
+# define PHP_ICONV_API
 #endif

 #ifdef PHP_ATOM_INC
@@ -45,7 +45,6 @@
 #include ext/iconv/php_php_iconv_h_path.h
 #endif

-
 #ifdef HAVE_ICONV
 extern zend_module_entry iconv_module_entry;
 #define iconv_module_ptr iconv_module_entry
@@ -73,9 +72,9 @@
 ZEND_END_MODULE_GLOBALS(iconv)

 #ifdef ZTS
-#define ICONVG(v) TSRMG(iconv_globals_id, zend_iconv_globals *, v)
+# define ICONVG(v) TSRMG(iconv_globals_id, zend_iconv_globals *, v)
 #else
-#define ICONVG(v) (iconv_globals.v)
+# define ICONVG(v) (iconv_globals.v)
 #endif

 #ifdef HAVE_IBM_ICONV
@@ -122,7 +121,6 @@

 #endif /* PHP_ICONV_H */

-
 /*
  * Local variables:
  * tab-width: 4

Modified: php/php-src/trunk/ext/iconv/php_iconv.h
===
--- php/php-src/trunk/ext/iconv/php_iconv.h 2009-12-23 21:02:12 UTC (rev 
292561)
+++ php/php-src/trunk/ext/iconv/php_iconv.h 2009-12-23 21:06:26 UTC (rev 
292562)
@@ -23,15 +23,15 @@
 #define PHP_ICONV_H

 #ifdef PHP_WIN32
-#  ifdef PHP_ICONV_EXPORTS
-#  define PHP_ICONV_API __declspec(dllexport)
-#  else
-#  define PHP_ICONV_API __declspec(dllimport)
-#  endif
+# ifdef PHP_ICONV_EXPORTS
+#  define PHP_ICONV_API __declspec(dllexport)
+# else
+#  define PHP_ICONV_API __declspec(dllimport)
+# endif
 #elif defined(__GNUC__)  __GNUC__ = 4
-#  define PHP_ICONV_API __attribute__ ((visibility(default)))
+# define PHP_ICONV_API __attribute__ ((visibility(default)))
 #else
-#  define PHP_ICONV_API
+# define PHP_ICONV_API
 #endif

 #ifdef PHP_ATOM_INC
@@ -45,7 +45,6 @@
 #include ext/iconv/php_php_iconv_h_path.h
 #endif

-
 #ifdef HAVE_ICONV
 extern zend_module_entry iconv_module_entry;
 #define iconv_module_ptr iconv_module_entry
@@ -72,9 +71,9 @@
 ZEND_END_MODULE_GLOBALS(iconv)

 #ifdef ZTS
-#define ICONVG(v) TSRMG(iconv_globals_id, zend_iconv_globals *, v)
+# define ICONVG(v) TSRMG(iconv_globals_id, zend_iconv_globals *, v)
 #else
-#define ICONVG(v) (iconv_globals.v)
+# define ICONVG(v) (iconv_globals.v)
 #endif

 #ifdef HAVE_IBM_ICONV
@@ -92,7 +91,7 @@
 #endif

 #ifndef ICONV_CSNMAXLEN
-#define ICONV_CSNMAXLEN 64
+# define ICONV_CSNMAXLEN 64
 #endif

 /* {{{ typedef enum php_iconv_err_t */
@@ -121,7 +120,6 @@

 #endif /* PHP_ICONV_H */

-
 /*
  * Local variables:
  * tab-width: 4

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

Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_2/ NEWS ext/dbase/dbf_head.c

[Jani Taskinen]

I feel like broken record. Is this some PHP_5_2 only issue or why isn't this 
merged to other branches?


--Jani


23.12.2009 6:16, Ilia Alshanetsky wrote:

iliaaWed, 23 Dec 2009 04:16:13 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=292514

Log:
Fixed bug #47002 (Field truncation when reading from dbase dbs with more then 
1024 fields)

Bug: http://bugs.php.net/47002 (Verified) Fields truncated

Changed paths:
 U   php/php-src/branches/PHP_5_2/NEWS
 U   php/php-src/branches/PHP_5_2/ext/dbase/dbf_head.c

Modified: php/php-src/branches/PHP_5_2/NEWS
===
--- php/php-src/branches/PHP_5_2/NEWS   2009-12-23 00:41:20 UTC (rev 292513)
+++ php/php-src/branches/PHP_5_2/NEWS   2009-12-23 04:16:13 UTC (rev 292514)
@@ -11,6 +11,8 @@
  - Fixed bug #49851 (http wrapper breaks on 1024 char long headers). (Ilia)
  - Fixed bug #45599 (strip_tags() truncates rest of string with invalid
attribute). (Ilia, hradtke)
+- Fixed bug #47002 (Field truncation when reading from dbase dbs with more
+  then 1024 fields). (Ilia, sjoerd-php at linuxonly dot nl)

  17 Dec 2009, PHP 5.2.12
  - Updated timezone database to version 2009.19 (2009s). (Derick)

Modified: php/php-src/branches/PHP_5_2/ext/dbase/dbf_head.c
===
--- php/php-src/branches/PHP_5_2/ext/dbase/dbf_head.c   2009-12-23 00:41:20 UTC 
(rev 292513)
+++ php/php-src/branches/PHP_5_2/ext/dbase/dbf_head.c   2009-12-23 04:16:13 UTC 
(rev 292514)
@@ -22,7 +22,7 @@
dbhead_t *dbh;
struct dbf_dhead  dbhead;
dbfield_t *dbf, *cur_f, *tdbf;
-   int ret, nfields, offset, gf_retval;
+   int ret, nfields, offset, gf_retval, cur_f_offset, tdbf_size;

if ((dbh = (dbhead_t *)calloc(1, sizeof(dbhead_t))) == NULL)
return NULL;
@@ -46,14 +46,13 @@
dbhead.dbh_date[DBH_DATE_MONTH],
dbhead.dbh_date[DBH_DATE_DAY]);

-   /* malloc enough memory for the maximum number of fields:
-  32 * 1024 = 32K dBase5 (for Win) seems to allow that many */
-   tdbf = (dbfield_t *)calloc(1, sizeof(dbfield_t)*1024);
-
+   tdbf_size = 1024;
+   tdbf = (dbfield_t *)calloc(1, sizeof(dbfield_t) * tdbf_size);
+
offset = 1;
nfields = 0;
gf_retval = 0;
-   for (cur_f = tdbf; gf_retval  2  nfields  1024; cur_f++) {
+   for (cur_f = tdbf; gf_retval  2; cur_f++) {
gf_retval = get_dbf_field(dbh, cur_f);

if (gf_retval  0) {
@@ -61,6 +60,15 @@
free(tdbf);
return NULL;
}
+
+   if (nfields= tdbf_size) {
+   cur_f_offset = cur_f - tdbf;
+   tdbf = realloc(tdbf, sizeof(dbfield_t) * tdbf_size * 2);
+   memset(tdbf + tdbf_size, '\0', tdbf_size);
+   tdbf_size *= 2;
+   cur_f = tdbf + cur_f_offset;
+   }
+
if (gf_retval != 2 ) {
cur_f-db_foffset = offset;
offset += cur_f-db_flen;





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

Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/sapi/cgi/fastcgi.c trunk/sapi/cgi/fastcgi.c

[Jani Taskinen]

Everybody seems to commit only in whatever branch they are working now?
AFAICT, this patch is necessary also in PHP_5_2, why didn't you commit there?

--Jani


23.12.2009 11:40, Antony Dovgal wrote:

tony2001 Wed, 23 Dec 2009 09:40:28 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=292519

Log:
fix minor leak in CGI sapi (happened once per child)

Changed paths:
 U   php/php-src/branches/PHP_5_3/sapi/cgi/fastcgi.c
 U   php/php-src/trunk/sapi/cgi/fastcgi.c

Modified: php/php-src/branches/PHP_5_3/sapi/cgi/fastcgi.c
===
--- php/php-src/branches/PHP_5_3/sapi/cgi/fastcgi.c 2009-12-23 09:37:28 UTC 
(rev 292518)
+++ php/php-src/branches/PHP_5_3/sapi/cgi/fastcgi.c 2009-12-23 09:40:28 UTC 
(rev 292519)
@@ -255,6 +255,9 @@
zend_hash_destroy(fcgi_mgmt_vars);
}
is_fastcgi = 0;
+   if (allowed_clients) {
+   free(allowed_clients);
+   }
  }

  #ifdef _WIN32

Modified: php/php-src/trunk/sapi/cgi/fastcgi.c
===
--- php/php-src/trunk/sapi/cgi/fastcgi.c2009-12-23 09:37:28 UTC (rev 
292518)
+++ php/php-src/trunk/sapi/cgi/fastcgi.c2009-12-23 09:40:28 UTC (rev 
292519)
@@ -186,6 +186,9 @@
zend_hash_destroy(fcgi_mgmt_vars);
}
is_fastcgi = 0;
+   if (allowed_clients) {
+   free(allowed_clients);
+   }
  }

  int fcgi_init(void)





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

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/configure.in branches/PHP_5_3/configure.in trunk/configure.in

[Jani Taskinen]

jani Tue, 22 Dec 2009 09:57:19 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=292470

Log:
- Fixed bug #50517 (EXTRA_LDFLAGS polluted by wrong entries)

# Until someone shows me use case for LDFLAGS, this is gone.
# This was wrong place to import it anyway.

Bug: http://bugs.php.net/50517 (Open) EXTRA_LDFLAGS polluted by wrong entries
  
Changed paths:
U   php/php-src/branches/PHP_5_2/configure.in
U   php/php-src/branches/PHP_5_3/configure.in
U   php/php-src/trunk/configure.in

Modified: php/php-src/branches/PHP_5_2/configure.in
===
--- php/php-src/branches/PHP_5_2/configure.in   2009-12-22 09:07:31 UTC (rev 
292469)
+++ php/php-src/branches/PHP_5_2/configure.in   2009-12-22 09:57:19 UTC (rev 
292470)
@@ -959,7 +959,6 @@
 esac

 EXTRA_LIBS=$EXTRA_LIBS $DLIBS $LIBS
-EXTRA_LDFLAGS=$EXTRA_LDFLAGS $LDFLAGS

 dnl this has to be here to prevent the openssl crypt() from
 dnl overriding the system provided crypt().

Modified: php/php-src/branches/PHP_5_3/configure.in
===
--- php/php-src/branches/PHP_5_3/configure.in   2009-12-22 09:07:31 UTC (rev 
292469)
+++ php/php-src/branches/PHP_5_3/configure.in   2009-12-22 09:57:19 UTC (rev 
292470)
@@ -984,7 +984,6 @@
 esac

 EXTRA_LIBS=$EXTRA_LIBS $DLIBS $LIBS
-EXTRA_LDFLAGS=$EXTRA_LDFLAGS $LDFLAGS

 dnl this has to be here to prevent the openssl crypt() from
 dnl overriding the system provided crypt().

Modified: php/php-src/trunk/configure.in
===
--- php/php-src/trunk/configure.in  2009-12-22 09:07:31 UTC (rev 292469)
+++ php/php-src/trunk/configure.in  2009-12-22 09:57:19 UTC (rev 292470)
@@ -978,7 +978,6 @@
 esac

 EXTRA_LIBS=$EXTRA_LIBS $DLIBS $LIBS
-EXTRA_LDFLAGS=$EXTRA_LDFLAGS $LDFLAGS

 dnl this has to be here to prevent the openssl crypt() from
 dnl overriding the system provided crypt().

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

Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ NEWS ext/imap/php_imap.c

[Jani Taskinen]

On 12/17/2009 07:28 PM, Pierre Joye wrote:

pajoye   Thu, 17 Dec 2009 17:28:26 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=292262

Log:
- [DOC] add INTERNALDATE to imap_append (will merge to trunk later)


Later being this year or sometime in 2010?

--Jani




Changed paths:
 U   php/php-src/branches/PHP_5_3/NEWS
 U   php/php-src/branches/PHP_5_3/ext/imap/php_imap.c

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2009-12-17 17:25:07 UTC (rev 292261)
+++ php/php-src/branches/PHP_5_3/NEWS   2009-12-17 17:28:26 UTC (rev 292262)
@@ -9,6 +9,7 @@
  - Changed post_max_size php.ini directive to allow unlimited post size by
setting it to 0. (Rasmus)

+- Added INTERNALDATE support to imap_append. (nick at mailtrust dot com)
  - Added support for SHA-256 and SHA-512 to php's crypt. (Pierre)
  - Added realpath_cache_size() and realpath_cache_get() functions. (Stas)
  - Added FILTER_FLAG_STRIP_BACKTICK option to the filter extension. (Ilia)

Modified: php/php-src/branches/PHP_5_3/ext/imap/php_imap.c
===
--- php/php-src/branches/PHP_5_3/ext/imap/php_imap.c2009-12-17 17:25:07 UTC 
(rev 292261)
+++ php/php-src/branches/PHP_5_3/ext/imap/php_imap.c2009-12-17 17:28:26 UTC 
(rev 292262)
@@ -41,6 +41,7 @@
  #include ext/standard/info.h
  #include ext/standard/file.h
  #include ext/standard/php_smart_str.h
+#include ext/pcre/php_pcre.h

  #ifdef ERROR
  #undef ERROR
@@ -118,6 +119,7 @@
ZEND_ARG_INFO(0, folder)
ZEND_ARG_INFO(0, message)
ZEND_ARG_INFO(0, options)
+   ZEND_ARG_INFO(0, date)
  ZEND_END_ARG_INFO()

  ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_num_msg, 0, 0, 1)
@@ -1265,25 +1267,48 @@
  }
  /* }}} */

-/* {{{ proto bool imap_append(resource stream_id, string folder, string 
message [, string options])
+/* {{{ proto bool imap_append(resource stream_id, string folder, string 
message [, string options [, string internal_date]])
 Append a new message to a specified mailbox */
  PHP_FUNCTION(imap_append)
  {
zval *streamind;
-   char *folder, *message, *flags = NULL;
-   int folder_len, message_len, flags_len = 0;
+   char *folder, *message, *internal_date = NULL, *flags = NULL;
+   int folder_len, message_len, internal_date_len = 0, flags_len = 0;
pils *imap_le_struct;
STRING st;

-   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, 
rss|s,streamind,folder,folder_len,message,message_len,flags,flags_len) 
== FAILURE) {
+   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, 
rss|ss,streamind,folder,folder_len,message,message_len,flags,flags_len,internal_date,internal_date_len)
 == FAILURE) {
return;
}

+   char* regex = 
/[0-3][0-9]-((Jan)|(Feb)|(Mar)|(Apr)|(May)|(Jun)|(Jul)|(Aug)|(Sep)|(Oct)|(Nov)|(Dec))-[0-9]{4}
 [0-2][0-9]:[0-5][0-9]:[0-5][0-9] [+-][0-9]{4}/;
+   int regex_len = strlen(regex);
+   pcre_cache_entry *pce;  /* Compiled regex */
+   zval *subpats = NULL;   /* Parts (not used) */
+   long regex_flags = 0;   /* Flags (not used) */
+   long start_offset = 0;  /* Start offset (not 
used) */
+   int global = 0;
+
+   if (internal_date) {
+   /* Make sure the given internal_date string matches the RFC 
specifiedformat */
+   if ((pce = pcre_get_compiled_regex_cache(regex, regex_len 
TSRMLS_CC))== NULL) {
+   RETURN_FALSE;
+   }
+
+   php_pcre_match_impl(pce, internal_date, internal_date_len, 
return_value, subpats, global,
+   0, regex_flags, start_offset TSRMLS_CC);
+
+   if (!Z_LVAL_P(return_value)) {
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, internal date 
not correctly formatted);
+   internal_date = NULL;
+   }
+   }
+
ZEND_FETCH_RESOURCE(imap_le_struct, pils *,streamind, -1, imap, 
le_imap);

INIT (st, mail_string, (void *) message, message_len);

-   if (mail_append_full(imap_le_struct-imap_stream, folder, (flags ? flags : 
NIL), NIL,st)) {
+   if (mail_append_full(imap_le_struct-imap_stream, folder, (flags ? flags : 
NIL), (internal_date ? internal_date : NIL),st)) {
RETURN_TRUE;
} else {
RETURN_FALSE;





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

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/ext/standard/dns.c branches/PHP_5_3/ext/standard/dns.c trunk/ext/standard/dns.c

[Jani Taskinen]

jani Mon, 21 Dec 2009 15:22:40 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=292413

Log:
- Tune the fix for bug #50508 and make it work with MacOSX, bug #50541.

Bugs: http://bugs.php.net/50508 (Closed) Conflicting HEADER type declarations
  http://bugs.php.net/50541 (Bogus) Missing HEADER definition
  
Changed paths:
U   php/php-src/branches/PHP_5_2/ext/standard/dns.c
U   php/php-src/branches/PHP_5_3/ext/standard/dns.c
U   php/php-src/trunk/ext/standard/dns.c

Modified: php/php-src/branches/PHP_5_2/ext/standard/dns.c
===
--- php/php-src/branches/PHP_5_2/ext/standard/dns.c 2009-12-21 14:04:56 UTC 
(rev 292412)
+++ php/php-src/branches/PHP_5_2/ext/standard/dns.c 2009-12-21 15:22:40 UTC 
(rev 292413)
@@ -56,6 +56,9 @@
 #undef T_UNSPEC
 #endif
 #if HAVE_ARPA_NAMESER_H
+#ifdef DARWIN
+# define BIND_8_COMPAT 1
+#endif
 #include arpa/nameser.h
 #endif
 #if HAVE_RESOLV_H

Modified: php/php-src/branches/PHP_5_3/ext/standard/dns.c
===
--- php/php-src/branches/PHP_5_3/ext/standard/dns.c 2009-12-21 14:04:56 UTC 
(rev 292412)
+++ php/php-src/branches/PHP_5_3/ext/standard/dns.c 2009-12-21 15:22:40 UTC 
(rev 292413)
@@ -44,6 +44,9 @@
 #undef T_UNSPEC
 #endif
 #if HAVE_ARPA_NAMESER_H
+#ifdef DARWIN
+# define BIND_8_COMPAT 1
+#endif
 #include arpa/nameser.h
 #endif
 #if HAVE_RESOLV_H

Modified: php/php-src/trunk/ext/standard/dns.c
===
--- php/php-src/trunk/ext/standard/dns.c2009-12-21 14:04:56 UTC (rev 
292412)
+++ php/php-src/trunk/ext/standard/dns.c2009-12-21 15:22:40 UTC (rev 
292413)
@@ -44,6 +44,9 @@
 #undef T_UNSPEC
 #endif
 #if HAVE_ARPA_NAMESER_H
+#ifdef DARWIN
+# define BIND_8_COMPAT 1
+#endif
 #include arpa/nameser.h
 #endif
 #if HAVE_RESOLV_H

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

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/run-tests.php branches/PHP_5_3/run-tests.php trunk/run-tests.php

[Jani Taskinen]

jani Mon, 21 Dec 2009 15:44:58 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=292418

Log:
- Sync (and KEEP it synced!)

Changed paths:
U   php/php-src/branches/PHP_5_2/run-tests.php
U   php/php-src/branches/PHP_5_3/run-tests.php
U   php/php-src/trunk/run-tests.php

Modified: php/php-src/branches/PHP_5_2/run-tests.php
===
--- php/php-src/branches/PHP_5_2/run-tests.php	2009-12-21 15:43:20 UTC (rev 292417)
+++ php/php-src/branches/PHP_5_2/run-tests.php	2009-12-21 15:44:58 UTC (rev 292418)
@@ -80,6 +80,13 @@
 	}
 }

+// (unicode) is available from 6.0.0
+if (PHP_VERSION_ID  6) {
+	define('STRING_TYPE', 'string');
+} else {
+	define('STRING_TYPE', 'unicode');
+}
+
 // If timezone is not set, use UTC.
 if (ini_get('date.timezone') == '') {
 	date_default_timezone_set('UTC');
@@ -355,8 +362,8 @@
 			if ($sum_results['FAILED']) {
 foreach ($PHP_FAILED_TESTS['FAILED'] as $test_info) {
 	$failed_tests_data .= $sep . $test_info['name'] . $test_info['info'];
-	$failed_tests_data .= $sep . file_get_contents(realpath($test_info['output']));
-	$failed_tests_data .= $sep . file_get_contents(realpath($test_info['diff']));
+	$failed_tests_data .= $sep . file_get_contents(realpath($test_info['output']), FILE_BINARY);
+	$failed_tests_data .= $sep . file_get_contents(realpath($test_info['diff']), FILE_BINARY);
 	$failed_tests_data .= $sep . \n\n;
 }
 $status = failed;
@@ -1130,6 +1137,21 @@
 	}
 }

+function binary_section($section)
+{
+	return PHP_MAJOR_VERSION  6 ||
+		(
+			$section == 'FILE'			||
+	$section == 'FILEEOF'		||
+			$section == 'EXPECT'		||
+			$section == 'EXPECTF'		||
+			$section == 'EXPECTREGEX'	||
+			$section == 'EXPECTHEADERS'	||
+			$section == 'SKIPIF'		||
+			$section == 'CLEAN'
+		);
+}
+
 //
 //  Run an individual test case.
 //
@@ -1159,7 +1181,7 @@
 	// Load the sections of the test file.
 	$section_text = array('TEST' = '');

-	$fp = fopen($file, rt) or error(Cannot open test file: $file);
+	$fp = fopen($file, rb) or error(Cannot open test file: $file);

 	$borked = false;
 	$bork_info = '';
@@ -1187,28 +1209,42 @@
 	while (!feof($fp)) {
 		$line = fgets($fp);

+		if ($line === false) {
+			break;
+		}
+
 		// Match the beginning of a section.
-		if (preg_match('/^--([_A-Z]+)--/', $line, $r)) {
+		if (preg_match(b'/^--([_A-Z]+)--/', $line, $r)) {
 			$section = $r[1];
+			settype($section, STRING_TYPE);

 			if (isset($section_text[$section])) {
 $bork_info = duplicated $section section;
 $borked= true;
 			}

-			$section_text[$section] = '';
+			$section_text[$section] = binary_section($section) ? b'' : '';
 			$secfile = $section == 'FILE' || $section == 'FILEEOF' || $section == 'FILE_EXTERNAL';
 			$secdone = false;
 			continue;
 		}

+		if (!binary_section($section)) {
+			$line = unicode_decode($line, utf-8);
+			if ($line == false) {
+$bork_info = cannot read test;
+$borked = true;
+break;
+			}
+		}
+
 		// Add to the section text.
 		if (!$secdone) {
 			$section_text[$section] .= $line;
 		}

 		// End of actual test?
-		if ($secfile  preg_match('/^===DONE===\s*$/', $line)) {
+		if ($secfile  preg_match(b'/^===DONE===\s*$/', $line)) {
 			$secdone = true;
 		}
 	}
@@ -1233,7 +1269,7 @@
 			}

 			if (@count($section_text['FILEEOF']) == 1) {
-$section_text['FILE'] = preg_replace(/[\r\n]+$/, '', $section_text['FILEEOF']);
+$section_text['FILE'] = preg_replace(b/[\r\n]+$/, b'', $section_text['FILEEOF']);
 unset($section_text['FILEEOF']);
 			}

@@ -1242,7 +1278,7 @@
 $section_text['FILE_EXTERNAL'] = dirname($file) . '/' . trim(str_replace('..', '', $section_text['FILE_EXTERNAL']));

 if (file_exists($section_text['FILE_EXTERNAL'])) {
-	$section_text['FILE'] = file_get_contents($section_text['FILE_EXTERNAL']);
+	$section_text['FILE'] = file_get_contents($section_text['FILE_EXTERNAL'], FILE_BINARY);
 	unset($section_text['FILE_EXTERNAL']);
 } else {
 	$bork_info = could not load --FILE_EXTERNAL--  . dirname($file) . '/' . trim($section_text['FILE_EXTERNAL']);
@@ -1776,7 +1812,9 @@
 // quote a non re portion of the string
 $temp = $temp . preg_quote(substr($wanted_re, $startOffset, ($start - $startOffset)),  b'/');
 // add the re unquoted.
-$temp = $temp . b'(' . substr($wanted_re, $start+2, ($end - $start-2)). b')';
+if ($end  $start) {
+	$temp = $temp . b'(' . substr($wanted_re, $start+2, ($end - $start-2)). b')';
+}
 $startOffset = $end + 2;
 			}
 			$wanted_re = $temp;
@@ -1956,7 +1994,7 @@
 function comp_line($l1, $l2, $is_reg)
 {
 	if ($is_reg) {
-		return preg_match((binary) /^$l1$/s, (binary) $l2);
+		return preg_match(b'/^'. (binary) $l1 . b'$/s', (binary) $l2);
 	} else {
 		return !strcmp((binary) $l1, (binary) $l2);
 	}

Modified: php/php-src/branches/PHP_5_3/run-tests.php

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/NEWS branches/PHP_5_2/configure.in branches/PHP_5_2/ext/standard/dns.c branches/PHP_5_3/NEWS branches/PHP_5_3/configure.in branches/PHP_5_3/ext/standard/d

[Jani Taskinen]

jani Fri, 18 Dec 2009 11:02:07 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=292283

Log:
- Fixed bug #50508 (compile fails: Conflicting HEADER type declarations)
# NEVER ever include nameser_compat.h, it's included in various ways in 
different OSes by nameser.h if needed

Bug: http://bugs.php.net/50508 (Feedback) Conflicting HEADER type declarations
  
Changed paths:
U   php/php-src/branches/PHP_5_2/NEWS
U   php/php-src/branches/PHP_5_2/configure.in
U   php/php-src/branches/PHP_5_2/ext/standard/dns.c
U   php/php-src/branches/PHP_5_3/NEWS
U   php/php-src/branches/PHP_5_3/configure.in
U   php/php-src/branches/PHP_5_3/ext/standard/dns.c
U   php/php-src/trunk/configure.in
U   php/php-src/trunk/ext/standard/dns.c

Modified: php/php-src/branches/PHP_5_2/NEWS
===
--- php/php-src/branches/PHP_5_2/NEWS   2009-12-18 09:17:04 UTC (rev 292282)
+++ php/php-src/branches/PHP_5_2/NEWS   2009-12-18 11:02:07 UTC (rev 292283)
@@ -3,6 +3,10 @@
 ?? ??? 2010, PHP 5.2.13
 - Fixed build of mysqli with MySQL 5.5.0-m2. (Andrey)

+- Fixed bug #50508 (compile failure: Conflicting HEADER type declarations).
+  (Jani)
+
+
 17 Dec 2009, PHP 5.2.12
 - Updated timezone database to version 2009.19 (2009s). (Derick)


Modified: php/php-src/branches/PHP_5_2/configure.in
===
--- php/php-src/branches/PHP_5_2/configure.in   2009-12-18 09:17:04 UTC (rev 
292282)
+++ php/php-src/branches/PHP_5_2/configure.in   2009-12-18 11:02:07 UTC (rev 
292283)
@@ -378,7 +378,6 @@
 netinet/in.h \
 alloca.h \
 arpa/inet.h \
-arpa/nameser_compat.h \
 arpa/nameser.h \
 assert.h \
 crypt.h \

Modified: php/php-src/branches/PHP_5_2/ext/standard/dns.c
===
--- php/php-src/branches/PHP_5_2/ext/standard/dns.c 2009-12-18 09:17:04 UTC 
(rev 292282)
+++ php/php-src/branches/PHP_5_2/ext/standard/dns.c 2009-12-18 11:02:07 UTC 
(rev 292283)
@@ -34,14 +34,14 @@
 #endif
 /* located in www.php.net/extra/bindlib.zip */
 #if HAVE_ARPA_INET_H
-#include arpa/inet.h
+#include arpa/inet.h
 #endif
-#include netdb.h
+#include netdb.h
 #if HAVE_ARPA_NAMESERV_H
-#include arpa/nameser.h
+#include arpa/nameser.h
 #endif
 #if HAVE_RESOLV_H
-#include resolv.h
+#include resolv.h
 #endif
 #endif /* HAVE_LIBBIND */
 #include winsock2.h
@@ -55,9 +55,6 @@
 #undef STATUS
 #undef T_UNSPEC
 #endif
-#if HAVE_ARPA_NAMESER_COMPAT_H
-#include arpa/nameser_compat.h
-#endif
 #if HAVE_ARPA_NAMESER_H
 #include arpa/nameser.h
 #endif

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2009-12-18 09:17:04 UTC (rev 292282)
+++ php/php-src/branches/PHP_5_3/NEWS   2009-12-18 11:02:07 UTC (rev 292283)
@@ -35,6 +35,8 @@
 - Fixed memory leak in extension loading when an error occurs on Windows.
   (Pierre)

+- Fixed bug #50508 (compile failure: Conflicting HEADER type declarations).
+  (Jani)
 - Fixed bug #50496 (Use of stdbool.h is valid only in a c99 compilation
   environment. (Sriram)
 - Fixed bug #50464 (declare encoding doesn't work within an included file).

Modified: php/php-src/branches/PHP_5_3/configure.in
===
--- php/php-src/branches/PHP_5_3/configure.in   2009-12-18 09:17:04 UTC (rev 
292282)
+++ php/php-src/branches/PHP_5_3/configure.in   2009-12-18 11:02:07 UTC (rev 
292283)
@@ -411,7 +411,6 @@
 netinet/in.h \
 alloca.h \
 arpa/inet.h \
-arpa/nameser_compat.h \
 arpa/nameser.h \
 assert.h \
 crypt.h \

Modified: php/php-src/branches/PHP_5_3/ext/standard/dns.c
===
--- php/php-src/branches/PHP_5_3/ext/standard/dns.c 2009-12-18 09:17:04 UTC 
(rev 292282)
+++ php/php-src/branches/PHP_5_3/ext/standard/dns.c 2009-12-18 11:02:07 UTC 
(rev 292283)
@@ -46,9 +46,6 @@
 #if HAVE_ARPA_NAMESER_H
 #include arpa/nameser.h
 #endif
-#if HAVE_ARPA_NAMESER_COMPAT_H
-#include arpa/nameser_compat.h
-#endif
 #if HAVE_RESOLV_H
 #include resolv.h
 #endif

Modified: php/php-src/trunk/configure.in
===
--- php/php-src/trunk/configure.in  2009-12-18 09:17:04 UTC (rev 292282)
+++ php/php-src/trunk/configure.in  2009-12-18 11:02:07 UTC (rev 292283)
@@ -414,7 +414,6 @@
 netinet/in.h \
 alloca.h \
 arpa/inet.h \
-arpa/nameser_compat.h \
 arpa/nameser.h \
 assert.h \
 crypt.h \

Modified: php/php-src/trunk/ext/standard/dns.c
===
--- php/php-src/trunk/ext/standard/dns.c2009-12-18 09:17:04 UTC (rev 
292282)
+++ php/php-src/trunk/ext/standard/dns.c2009-12-18 11:02:07 UTC (rev 
292283)
@@ -46,9 +46,6 @@
 #if HAVE_ARPA_NAMESER_H
 #include arpa/nameser.h
 #endif
-#if 

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/Zend/ zend_ini_scanner.c zend_ini_scanner_defs.h

[Jani Taskinen]

jani Fri, 18 Dec 2009 12:48:59 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=292284

Log:
touch

Changed paths:
U   php/php-src/branches/PHP_5_3/Zend/zend_ini_scanner.c
U   php/php-src/branches/PHP_5_3/Zend/zend_ini_scanner_defs.h

Modified: php/php-src/branches/PHP_5_3/Zend/zend_ini_scanner.c
===
--- php/php-src/branches/PHP_5_3/Zend/zend_ini_scanner.c2009-12-18 
11:02:07 UTC (rev 292283)
+++ php/php-src/branches/PHP_5_3/Zend/zend_ini_scanner.c2009-12-18 
12:48:59 UTC (rev 292284)
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Tue Dec  1 00:06:21 2009 */
+/* Generated by re2c 0.13.5 on Tue Dec  8 12:24:52 2009 */
 #line 1 Zend/zend_ini_scanner.l
 /*
+--+

Modified: php/php-src/branches/PHP_5_3/Zend/zend_ini_scanner_defs.h
===
--- php/php-src/branches/PHP_5_3/Zend/zend_ini_scanner_defs.h   2009-12-18 
11:02:07 UTC (rev 292283)
+++ php/php-src/branches/PHP_5_3/Zend/zend_ini_scanner_defs.h   2009-12-18 
12:48:59 UTC (rev 292284)
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Tue Dec  1 00:06:21 2009 */
+/* Generated by re2c 0.13.5 on Tue Dec  8 12:24:52 2009 */
 #line 3 Zend/zend_ini_scanner_defs.h

 enum YYCONDTYPE {

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

[PHP-CVS] svn: /php/php-src/trunk/Zend/ zend_language_scanner.c zend_language_scanner_defs.h

[Jani Taskinen]

jani Fri, 18 Dec 2009 12:49:20 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=292285

Log:
touch

Changed paths:
U   php/php-src/trunk/Zend/zend_language_scanner.c
U   php/php-src/trunk/Zend/zend_language_scanner_defs.h

Modified: php/php-src/trunk/Zend/zend_language_scanner.c
===
--- php/php-src/trunk/Zend/zend_language_scanner.c  2009-12-18 12:48:59 UTC 
(rev 292284)
+++ php/php-src/trunk/Zend/zend_language_scanner.c  2009-12-18 12:49:20 UTC 
(rev 292285)
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Tue Dec 15 15:29:48 2009 */
+/* Generated by re2c 0.13.5 on Fri Dec 18 13:51:11 2009 */
 #line 1 Zend/zend_language_scanner.l
 /*
+--+

Modified: php/php-src/trunk/Zend/zend_language_scanner_defs.h
===
--- php/php-src/trunk/Zend/zend_language_scanner_defs.h 2009-12-18 12:48:59 UTC 
(rev 292284)
+++ php/php-src/trunk/Zend/zend_language_scanner_defs.h 2009-12-18 12:49:20 UTC 
(rev 292285)
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Tue Dec 15 15:29:48 2009 */
+/* Generated by re2c 0.13.5 on Fri Dec 18 13:51:11 2009 */
 #line 3 Zend/zend_language_scanner_defs.h

 enum YYCONDTYPE {

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

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ NEWS

[Jani Taskinen]

jani Thu, 17 Dec 2009 16:10:53 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=292259

Log:
- These are 2 separate sections..

Changed paths:
U   php/php-src/branches/PHP_5_3/NEWS

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2009-12-17 15:32:16 UTC (rev 292258)
+++ php/php-src/branches/PHP_5_3/NEWS   2009-12-17 16:10:53 UTC (rev 292259)
@@ -33,6 +33,7 @@
   (Arvind Srinivasan)
 - Fixed memory leak in extension loading when an error occurs on Windows.
   (Pierre)
+
 - Fixed bug #50496 (Use of stdbool.h is valid only in a c99 compilation
   environment. (Sriram)
 - Fixed bug #50464 (declare encoding doesn't work within an included file).

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

Re: [PHP-CVS] svn: /php/php-src/trunk/ run-tests.php

[Jani Taskinen]

Why didn't you merge this to all branches? The run-test.php has so far 
been same in all of them. Can't really do regression testing if you 
change how tests are run for one branch..:)


--Jani

On 12/16/2009 01:16 PM, Dmitry Stogov wrote:

dmitry   Wed, 16 Dec 2009 11:16:03 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=292196

Log:
Fixed test engine to support non utf-8 tests

Changed paths:
 U   php/php-src/trunk/run-tests.php

Modified: php/php-src/trunk/run-tests.php
===
--- php/php-src/trunk/run-tests.php 2009-12-16 11:15:22 UTC (rev 292195)
+++ php/php-src/trunk/run-tests.php 2009-12-16 11:16:03 UTC (rev 292196)
@@ -1130,6 +1130,17 @@
}
  }

+function binary_section($section) {
+   return ($section == 'FILE' ||
+   $section == 'FILEEOF' ||
+   $section == 'EXPECT' ||
+   $section == 'EXPECTF' ||
+   $section == 'EXPECTREGEX' ||
+   $section == 'EXPECTHEADERS' ||
+   $section == 'SKIPIF' ||
+   $section == 'CLEAN');
+}
+
  //
  //  Run an individual test case.
  //
@@ -1159,7 +1170,7 @@
// Load the sections of the test file.
$section_text = array('TEST' =  '');

-   $fp = fopen($file, rt) or error(Cannot open test file: $file);
+   $fp = fopen($file, rb) or error(Cannot open test file: $file);

$borked = false;
$bork_info = '';
@@ -1187,28 +1198,41 @@
while (!feof($fp)) {
$line = fgets($fp);

+   if ($line === false) {
+   break;
+   }
+
// Match the beginning of a section.
-   if (preg_match('/^--([_A-Z]+)--/', $line, $r)) {
-   $section = $r[1];
+   if (preg_match(b'/^--([_A-Z]+)--/', $line, $r)) {
+   $section = (unicode)$r[1];

if (isset($section_text[$section])) {
$bork_info = duplicated $section section;
$borked= true;
}

-   $section_text[$section] = '';
+   $section_text[$section] = binary_section($section) ? 
b'' : '';
$secfile = $section == 'FILE' || $section == 'FILEEOF' 
|| $section == 'FILE_EXTERNAL';
$secdone = false;
continue;
}

+   if (!binary_section($section)) {
+   $line = unicode_decode($line, utf-8);
+   if ($line == false) {
+   $bork_info = cannot read test;
+   $borked = true;
+   break;
+   }
+   }
+
// Add to the section text.
if (!$secdone) {
$section_text[$section] .= $line;
}

// End of actual test?
-   if ($secfile  preg_match('/^===DONE===\s*$/', $line)) {
+   if ($secfile  preg_match(b'/^===DONE===\s*$/', $line)) {
$secdone = true;
}
}
@@ -1233,7 +1257,7 @@
}

if (@count($section_text['FILEEOF']) == 1) {
-   $section_text['FILE'] = 
preg_replace(/[\r\n]+$/, '', $section_text['FILEEOF']);
+   $section_text['FILE'] = 
preg_replace(b/[\r\n]+$/, b'', $section_text['FILEEOF']);
unset($section_text['FILEEOF']);
}

@@ -1776,7 +1800,9 @@
// quote a non re portion of the string
$temp = $temp . preg_quote(substr($wanted_re, 
$startOffset, ($start - $startOffset)),  b'/');
// add the re unquoted.
-   $temp = $temp . b'(' . substr($wanted_re, 
$start+2, ($end - $start-2)). b')';
+   if ($end  $start) {
+   $temp = $temp . b'(' . 
substr($wanted_re, $start+2, ($end - $start-2)). b')';
+   }
$startOffset = $end + 2;
}
$wanted_re = $temp;
@@ -1956,7 +1982,7 @@
  function comp_line($l1, $l2, $is_reg)
  {
if ($is_reg) {
-   return preg_match((binary) /^$l1$/s, (binary) $l2);
+   return preg_match(b'/^'. (binary) $l1 . b'$/s', (binary) $l2);
} else {
return !strcmp((binary) $l1, (binary) $l2);
}





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

[PHP-CVS] svn: /php/php-src/branches/PHP_5_2/ NEWS

[Jani Taskinen]

jani Wed, 16 Dec 2009 13:05:43 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=292205

Log:
- Fix news again

Changed paths:
U   php/php-src/branches/PHP_5_2/NEWS

Modified: php/php-src/branches/PHP_5_2/NEWS
===
--- php/php-src/branches/PHP_5_2/NEWS   2009-12-16 12:59:38 UTC (rev 292204)
+++ php/php-src/branches/PHP_5_2/NEWS   2009-12-16 13:05:43 UTC (rev 292205)
@@ -3,6 +3,7 @@
 ?? ??? 2010, PHP 5.2.13

 17 Dec 2009, PHP 5.2.12
+- Updated timezone database to version 2009.19 (2009s). (Derick)

 - Added LIBXML_PARSEHUGE constant to overrides the maximum text size of a
   single text node when using libxml2.7.3+. (Kalle)
@@ -12,7 +13,11 @@
   number of file uploads per-request to 20 by default, to prevent possible
   DOS via temporary file exhaustion. (Ilia)

+- Changed post_max_size php.ini directive to allow unlimited post size by
+  setting it to 0. (Rasmus)
+
 - Improved fix for bug #50006 (Segfault caused by uksort()). (Stas)
+
 - Fixed error_log() to be binary safe when using message_type 3. (Jani)
 - Fixed unnecessary invocation of setitimer when timeouts have been disabled.
   (Arvind Srinivasan)
@@ -28,11 +33,6 @@
   (Felipe)
 - Fixed memory leak in openssl_pkcs12_export_to_file(). (Felipe)

-- Updated timezone database to version 2009.19 (2009s). (Derick)
-
-- Changed post_max_size php.ini directive to allow unlimited post size by
-  setting it to 0. (Rasmus)
-
 - Fixed bug #50445 (PDO-ODBC stored procedure call from Solaris 64-bit causes
   segfault). (davbrown4 at yahoo dot com, Felipe)
 - Fixed bug #50345 (nanosleep not detected properly on some solaris versions).

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

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/configure.in branches/PHP_5_3/configure.in trunk/configure.in

[Jani Taskinen]

jani Tue, 15 Dec 2009 10:55:27 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=292153

Log:
- Allow using $sbindir as well

Changed paths:
U   php/php-src/branches/PHP_5_2/configure.in
U   php/php-src/branches/PHP_5_3/configure.in
U   php/php-src/trunk/configure.in

Modified: php/php-src/branches/PHP_5_2/configure.in
===
--- php/php-src/branches/PHP_5_2/configure.in   2009-12-15 10:54:45 UTC (rev 
292152)
+++ php/php-src/branches/PHP_5_2/configure.in   2009-12-15 10:55:27 UTC (rev 
292153)
@@ -1224,6 +1224,7 @@
 PHP_SUBST_OLD(php_abs_top_srcdir)

 PHP_SUBST(bindir)
+PHP_SUBST(sbindir)
 PHP_SUBST(exec_prefix)
 PHP_SUBST_OLD(program_prefix)
 PHP_SUBST_OLD(program_suffix)

Modified: php/php-src/branches/PHP_5_3/configure.in
===
--- php/php-src/branches/PHP_5_3/configure.in   2009-12-15 10:54:45 UTC (rev 
292152)
+++ php/php-src/branches/PHP_5_3/configure.in   2009-12-15 10:55:27 UTC (rev 
292153)
@@ -1240,6 +1240,7 @@
 PHP_SUBST_OLD(php_abs_top_srcdir)

 PHP_SUBST(bindir)
+PHP_SUBST(sbindir)
 PHP_SUBST(exec_prefix)
 PHP_SUBST_OLD(program_prefix)
 PHP_SUBST_OLD(program_suffix)

Modified: php/php-src/trunk/configure.in
===
--- php/php-src/trunk/configure.in  2009-12-15 10:54:45 UTC (rev 292152)
+++ php/php-src/trunk/configure.in  2009-12-15 10:55:27 UTC (rev 292153)
@@ -1179,6 +1179,7 @@
 PHP_SUBST_OLD(php_abs_top_srcdir)

 PHP_SUBST(bindir)
+PHP_SUBST(sbindir)
 PHP_SUBST(exec_prefix)
 PHP_SUBST_OLD(program_prefix)
 PHP_SUBST_OLD(program_suffix)

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

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/configure.in branches/PHP_5_2/main/build-defs.h.in branches/PHP_5_3/configure.in branches/PHP_5_3/main/build-defs.h.in trunk/configure.in trunk/main/build

[Jani Taskinen]

jani Tue, 15 Dec 2009 11:17:47 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=292156

Log:
- Make $sbindir be usable in C code as well (like $bindir and co.)

Changed paths:
U   php/php-src/branches/PHP_5_2/configure.in
U   php/php-src/branches/PHP_5_2/main/build-defs.h.in
U   php/php-src/branches/PHP_5_3/configure.in
U   php/php-src/branches/PHP_5_3/main/build-defs.h.in
U   php/php-src/trunk/configure.in
U   php/php-src/trunk/main/build-defs.h.in

Modified: php/php-src/branches/PHP_5_2/configure.in
===
--- php/php-src/branches/PHP_5_2/configure.in   2009-12-15 11:10:35 UTC (rev 
292155)
+++ php/php-src/branches/PHP_5_2/configure.in   2009-12-15 11:17:47 UTC (rev 
292156)
@@ -1141,6 +1141,7 @@
 EXPANDED_EXTENSION_DIR=`eval echo $EXTENSION_DIR`
 EXPANDED_LOCALSTATEDIR=`eval echo $localstatedir`
 EXPANDED_BINDIR=`eval echo $bindir`
+EXPANDED_SBINDIR=`eval echo $sbindir`
 EXPANDED_LIBDIR=$libdir
 EXPANDED_SYSCONFDIR=`eval echo $sysconfdir`
 EXPANDED_DATADIR=$datadir
@@ -1156,6 +1157,7 @@
 AC_SUBST(EXPANDED_PEAR_INSTALLDIR)
 AC_SUBST(EXPANDED_EXTENSION_DIR)
 AC_SUBST(EXPANDED_BINDIR)
+AC_SUBST(EXPANDED_SBINDIR)
 AC_SUBST(EXPANDED_LIBDIR)
 AC_SUBST(EXPANDED_DATADIR)
 AC_SUBST(EXPANDED_SYSCONFDIR)

Modified: php/php-src/branches/PHP_5_2/main/build-defs.h.in
===
--- php/php-src/branches/PHP_5_2/main/build-defs.h.in   2009-12-15 11:10:35 UTC 
(rev 292155)
+++ php/php-src/branches/PHP_5_2/main/build-defs.h.in   2009-12-15 11:17:47 UTC 
(rev 292156)
@@ -80,6 +80,7 @@
 #define PHP_EXTENSION_DIR   @EXPANDED_EXTENSION_DIR@
 #define PHP_PREFIX  @prefix@
 #define PHP_BINDIR  @EXPANDED_BINDIR@
+#define PHP_SBINDIR @EXPANDED_SBINDIR@
 #define PHP_LIBDIR  @EXPANDED_LIBDIR@
 #define PHP_DATADIR @EXPANDED_DATADIR@
 #define PHP_SYSCONFDIR  @EXPANDED_SYSCONFDIR@

Modified: php/php-src/branches/PHP_5_3/configure.in
===
--- php/php-src/branches/PHP_5_3/configure.in   2009-12-15 11:10:35 UTC (rev 
292155)
+++ php/php-src/branches/PHP_5_3/configure.in   2009-12-15 11:17:47 UTC (rev 
292156)
@@ -1157,6 +1157,7 @@
 EXPANDED_EXTENSION_DIR=`eval echo $EXTENSION_DIR`
 EXPANDED_LOCALSTATEDIR=`eval echo $localstatedir`
 EXPANDED_BINDIR=`eval echo $bindir`
+EXPANDED_SBINDIR=`eval echo $sbindir`
 EXPANDED_LIBDIR=$libdir
 EXPANDED_SYSCONFDIR=`eval echo $sysconfdir`
 EXPANDED_DATADIR=$datadir
@@ -1172,6 +1173,7 @@
 AC_SUBST(EXPANDED_PEAR_INSTALLDIR)
 AC_SUBST(EXPANDED_EXTENSION_DIR)
 AC_SUBST(EXPANDED_BINDIR)
+AC_SUBST(EXPANDED_SBINDIR)
 AC_SUBST(EXPANDED_LIBDIR)
 AC_SUBST(EXPANDED_DATADIR)
 AC_SUBST(EXPANDED_SYSCONFDIR)

Modified: php/php-src/branches/PHP_5_3/main/build-defs.h.in
===
--- php/php-src/branches/PHP_5_3/main/build-defs.h.in   2009-12-15 11:10:35 UTC 
(rev 292155)
+++ php/php-src/branches/PHP_5_3/main/build-defs.h.in   2009-12-15 11:17:47 UTC 
(rev 292156)
@@ -80,6 +80,7 @@
 #define PHP_EXTENSION_DIR   @EXPANDED_EXTENSION_DIR@
 #define PHP_PREFIX  @prefix@
 #define PHP_BINDIR  @EXPANDED_BINDIR@
+#define PHP_SBINDIR @EXPANDED_SBINDIR@
 #define PHP_LIBDIR  @EXPANDED_LIBDIR@
 #define PHP_DATADIR @EXPANDED_DATADIR@
 #define PHP_SYSCONFDIR  @EXPANDED_SYSCONFDIR@

Modified: php/php-src/trunk/configure.in
===
--- php/php-src/trunk/configure.in  2009-12-15 11:10:35 UTC (rev 292155)
+++ php/php-src/trunk/configure.in  2009-12-15 11:17:47 UTC (rev 292156)
@@ -1096,6 +1096,7 @@
 EXPANDED_EXTENSION_DIR=`eval echo $EXTENSION_DIR`
 EXPANDED_LOCALSTATEDIR=`eval echo $localstatedir`
 EXPANDED_BINDIR=`eval echo $bindir`
+EXPANDED_SBINDIR=`eval echo $sbindir`
 EXPANDED_LIBDIR=$libdir
 EXPANDED_SYSCONFDIR=`eval echo $sysconfdir`
 EXPANDED_DATADIR=$datadir
@@ -1110,6 +,7 @@
 AC_SUBST(INCLUDE_PATH)
 AC_SUBST(EXPANDED_EXTENSION_DIR)
 AC_SUBST(EXPANDED_BINDIR)
+AC_SUBST(EXPANDED_SBINDIR)
 AC_SUBST(EXPANDED_LIBDIR)
 AC_SUBST(EXPANDED_DATADIR)
 AC_SUBST(EXPANDED_SYSCONFDIR)

Modified: php/php-src/trunk/main/build-defs.h.in
===
--- php/php-src/trunk/main/build-defs.h.in  2009-12-15 11:10:35 UTC (rev 
292155)
+++ php/php-src/trunk/main/build-defs.h.in  2009-12-15 11:17:47 UTC (rev 
292156)
@@ -79,6 +79,7 @@
 #define PHP_EXTENSION_DIR   @EXPANDED_EXTENSION_DIR@
 #define PHP_PREFIX  @prefix@
 #define PHP_BINDIR  @EXPANDED_BINDIR@
+#define PHP_SBINDIR @EXPANDED_SBINDIR@
 #define PHP_LIBDIR  @EXPANDED_LIBDIR@
 #define PHP_DATADIR @EXPANDED_DATADIR@
 #define PHP_SYSCONFDIR  

Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_3_FPM/sapi/fpm/ CREDITS

[Jani Taskinen]

On 12/15/2009 03:45 PM, Antony Dovgal wrote:

tony2001 Tue, 15 Dec 2009 13:45:09 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=292167

Log:
add CREDITS

Changed paths:
 A   php/php-src/branches/PHP_5_3_FPM/sapi/fpm/CREDITS

Added: php/php-src/branches/PHP_5_3_FPM/sapi/fpm/CREDITS
===
--- php/php-src/branches/PHP_5_3_FPM/sapi/fpm/CREDITS   
(rev 0)
+++ php/php-src/branches/PHP_5_3_FPM/sapi/fpm/CREDITS   2009-12-15 13:45:09 UTC 
(rev 292167)
@@ -0,0 +1,2 @@
+FastCGI Process Manager
+Andrei Nigmatulin, dreamcat4, Antony Dovgal


wtf is dreamcat4? Not man enough to use his real name or what?

--Jani

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

Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_3_FPM/sapi/fpm/ CREDITS

[Jani Taskinen]

15.12.2009 15:59, Antony Dovgal wrote:

On 15.12.2009 16:55, Jani Taskinen wrote:

On 12/15/2009 03:45 PM, Antony Dovgal wrote:
wtf is dreamcat4? Not man enough to use his real name or what?


I don't know his name and Google was unable to help.
Ask him yourself?



Just don't add him in the credits. Some stupid nick isn't much info anyway.

--Jani


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