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

2009-07-20 Thread Pierre-Alain Joye 
pajoye  Mon, 20 Jul 2009 09:34:15 +

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

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

Log:
- fix signed/unsigned mismatch comparisons

Modified: php/php-src/trunk/ext/unicode/unicode_iterators.c
===
--- php/php-src/trunk/ext/unicode/unicode_iterators.c   2009-07-20 08:05:04 UTC 
(rev 284417)
+++ php/php-src/trunk/ext/unicode/unicode_iterators.c   2009-07-20 09:34:15 UTC 
(rev 284418)
@@ -130,8 +130,8 @@
buf_len = zend_codepoint_to_uchar(cp, 
Z_USTRVAL_P(object-current));
}
} else {
-   if (object-u.cp.offset != UBRK_DONE  object-u.cp.offset  
object-text_len) {
-   U16_NEXT(object-text, tmp, object-text_len, cp);
+   if (object-u.cp.offset != UBRK_DONE  
((uint32_t)object-u.cp.offset)  object-text_len) {
+   U16_NEXT(object-text, tmp, (int32_t)object-text_len, 
cp);
buf_len = zend_codepoint_to_uchar(cp, 
Z_USTRVAL_P(object-current));
}
}
@@ -165,14 +165,14 @@

if (flags  ITER_REVERSE) {
U16_BACK_1(object-text, 0, object-u.cp.offset);
-   if (object-u.cp.offset = object-text_len) {
+   if ((uint32_t)object-u.cp.offset = object-text_len) {
object-u.cp.cp_offset--;
} else {
object-u.cp.offset = object-u.cp.cp_offset = 
UBRK_DONE;
}
} else {
-   U16_FWD_1(object-text, object-u.cp.offset, object-text_len);
-   if (object-u.cp.offset = object-text_len) {
+   U16_FWD_1(object-text, (uint32_t) object-u.cp.offset, 
object-text_len);
+   if ((uint32_t) object-u.cp.offset = object-text_len) {
object-u.cp.cp_offset++;
} else {
object-u.cp.offset = object-u.cp.cp_offset = 
UBRK_DONE;
@@ -216,7 +216,7 @@
 */
k = object-u.cp.offset;
if (offset  object-u.cp.cp_offset) {
-   U16_FWD_N(object-text, k, object-text_len, offset - 
object-u.cp.cp_offset);
+   U16_FWD_N(object-text, k, (int32_t) object-text_len, offset - 
object-u.cp.cp_offset);
} else {
U16_BACK_N(object-text, 0, k, object-u.cp.cp_offset - offset);
}
@@ -238,7 +238,7 @@
object-u.cp.offset = UBRK_DONE;
return;
} else {
-   U16_FWD_1(object-text, k, object-text_len);
+   U16_FWD_1(object-text, k, (int32_t) object-text_len);
}
}

@@ -292,7 +292,7 @@
 */
k = object-u.cp.offset;
if (offset  object-u.cp.cp_offset) {
-   U16_FWD_N(object-text, k, object-text_len, offset - 
object-u.cp.cp_offset);
+   U16_FWD_N(object-text, k, (int32_t) object-text_len, offset - 
object-u.cp.cp_offset);
} else {
U16_BACK_N(object-text, 0, k, object-u.cp.cp_offset - offset);
}
@@ -419,7 +419,7 @@
}

if (length != 0) {
-   if (length+1  object-current_alloc) {
+   if (length+1  (int32_t) object-current_alloc) {
object-current_alloc = length+1;
Z_USTRVAL_P(object-current) = 
eurealloc(Z_USTRVAL_P(object-current), object-current_alloc);
}
@@ -497,7 +497,7 @@
 */
k = object-u.cs.start;
if (offset  object-u.cs.start_cp_offset) {
-   U16_FWD_N(object-text, k, object-text_len, offset - 
object-u.cs.start_cp_offset);
+   U16_FWD_N(object-text, k, (int32_t) object-text_len, offset - 
object-u.cs.start_cp_offset);
} else {
U16_BACK_N(object-text, 0, k, object-u.cs.start_cp_offset - 
offset);
}
@@ -552,7 +552,7 @@
 */
k = object-u.cs.start;
if (offset  object-u.cs.start_cp_offset) {
-   U16_FWD_N(object-text, k, object-text_len, offset - 
object-u.cs.start_cp_offset);
+   U16_FWD_N(object-text, k, (int32_t) object-text_len, offset - 
object-u.cs.start_cp_offset);
} else {
U16_BACK_N(object-text, 0, k, object-u.cs.start_cp_offset - 
offset);
}
@@ -564,7 +564,7 @@
} else {
/* if the next codepoint is a base character, it's a boundary */
tmp = k;
-   U16_NEXT(object-text, tmp, object-text_len, cp);
+   U16_NEXT(object-text, tmp, (int32_t) object-text_len, cp);
result = (u_getCombiningClass(cp) == 0);
}

@@ -634,7 +634,7 @@
}

if (length != 0) {
-   if (length+1  object-current_alloc) {
+   if (length+1  (int32_t) object-current_alloc) {

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

2009-07-20 Thread Pierre-Alain Joye 
pajoye  Mon, 20 Jul 2009 09:42:52 +

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

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

Log:
- silent auto casting warnings

Modified: php/php-src/trunk/ext/unicode/unicode.c
===
--- php/php-src/trunk/ext/unicode/unicode.c 2009-07-20 09:34:15 UTC (rev 
284418)
+++ php/php-src/trunk/ext/unicode/unicode.c 2009-07-20 09:42:52 UTC (rev 
284419)
@@ -57,7 +57,7 @@
RETURN_FALSE;
}

-   zend_set_converter_error_mode(conv, ZEND_TO_UNICODE, flags);
+   zend_set_converter_error_mode(conv, ZEND_TO_UNICODE, (uint16_t) flags);

status = U_ZERO_ERROR;
num_conv = zend_string_to_unicode_ex(conv, dest, dest_len, str, 
str_len, status);
@@ -107,7 +107,7 @@
RETURN_FALSE;
}

-   zend_set_converter_error_mode(conv, ZEND_FROM_UNICODE, flags);
+   zend_set_converter_error_mode(conv, ZEND_FROM_UNICODE, (uint16_t) 
flags);
zend_set_converter_subst_char(conv, UG(from_subst_char));

status = U_ZERO_ERROR;
@@ -148,9 +148,9 @@
}

if (direction == ZEND_FROM_UNICODE) {
-   UG(from_error_mode) = mode;
+   UG(from_error_mode) = (uint16_t) mode;
} else {
-   UG(to_error_mode)   = mode;
+   UG(to_error_mode)   = (uint16_t) mode;
}

zend_update_converters_error_behavior(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/trunk/ext/unicode/ property.c

2009-07-20 Thread Pierre-Alain Joye 
pajoye  Mon, 20 Jul 2009 09:44:52 +

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

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

Log:
- silent warnings

Modified: php/php-src/trunk/ext/unicode/property.c
===
--- php/php-src/trunk/ext/unicode/property.c2009-07-20 09:42:52 UTC (rev 
284419)
+++ php/php-src/trunk/ext/unicode/property.c2009-07-20 09:44:52 UTC (rev 
284420)
@@ -321,7 +321,7 @@
php_error(E_WARNING, Radix has to be in 2-36 range);
return;
}
-   RETURN_LONG(u_digit(ch, radix));
+   RETURN_LONG(u_digit(ch, (int8_t) radix));
} else {
RETURN_LONG(u_charDigitValue(ch));
}
@@ -461,7 +461,7 @@
return;
}
}
-   ch = u_forDigit(digit, radix);
+   ch = u_forDigit(digit, (int8_t) radix);

if (ch == (UChar32)0) {
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/trunk/ext/unicode/ property.c

2009-07-20 Thread Pierre-Alain Joye 
pajoye  Mon, 20 Jul 2009 09:50:14 +

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

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

Log:
- WS
-- 
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/unicode/ property.c

2009-07-20 Thread Pierre-Alain Joye 
pajoye  Mon, 20 Jul 2009 09:52:54 +

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

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

Log:
- typo

Modified: php/php-src/trunk/ext/unicode/property.c
===
--- php/php-src/trunk/ext/unicode/property.c2009-07-20 09:50:14 UTC (rev 
284421)
+++ php/php-src/trunk/ext/unicode/property.c2009-07-20 09:52:54 UTC (rev 
284422)
@@ -680,7 +680,7 @@
 PHP_FUNCTION(char_get_property_from_name)
 {
void*name;
-   int sname_len;
+   int name_len;
char*buf;
zend_uchar  name_type;
UProperty   prop;

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

2009-07-20 Thread David Soria Parra 
dsp Mon, 20 Jul 2009 10:12:12 +

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

Changed paths:
U   php/php-src/trunk/Zend/zend.c

Log:
- Fix overflow and use our internal vssprintf implementation

Modified: php/php-src/trunk/Zend/zend.c
===
--- php/php-src/trunk/Zend/zend.c   2009-07-20 09:52:54 UTC (rev 284422)
+++ php/php-src/trunk/Zend/zend.c   2009-07-20 10:12:12 UTC (rev 284423)
@@ -1546,7 +1546,6 @@
zval *orig_user_error_handler;
zend_bool in_compilation;
zend_class_entry *saved_class_entry;
-   char dtrace_error_buffer[1024];
TSRMLS_FETCH();

/* Obtain relevant filename and lineno */
@@ -1592,9 +1591,11 @@
va_start(args, format);

if(DTRACE_ERROR_ENABLED()) {
-   vsprintf(dtrace_error_buffer, format, args);
+   char *dtrace_error_buffer;
+   zend_vspprintf(dtrace_error_buffer, 0, format, args);
+   DTRACE_ERROR(dtrace_error_buffer, error_filename, error_lineno);
+   efree(dtrace_error_buffer);
}
-   DTRACE_ERROR(dtrace_error_buffer, error_filename, error_lineno);


/* if we don't have a user defined error handler */

-- 
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.c Zend/zend_dtrace.c Zend/zend_dtrace.h Zend/zend_exceptions.c Zend/zend_vm_def.h Zend/zend_vm_execute.h configure.in main/main.c

2009-07-20 Thread David Soria Parra 
dsp Mon, 20 Jul 2009 10:12:34 +

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

Changed paths:
U   php/php-src/trunk/Zend/zend.c
U   php/php-src/trunk/Zend/zend_dtrace.c
U   php/php-src/trunk/Zend/zend_dtrace.h
U   php/php-src/trunk/Zend/zend_exceptions.c
U   php/php-src/trunk/Zend/zend_vm_def.h
U   php/php-src/trunk/Zend/zend_vm_execute.h
U   php/php-src/trunk/configure.in
U   php/php-src/trunk/main/main.c

Log:
- Define HAVE_DTRACE if dtrace is available and ifdef all calls to dtrace probes

Modified: php/php-src/trunk/Zend/zend.c
===
--- php/php-src/trunk/Zend/zend.c   2009-07-20 10:12:12 UTC (rev 284423)
+++ php/php-src/trunk/Zend/zend.c   2009-07-20 10:12:34 UTC (rev 284424)
@@ -1590,12 +1590,14 @@

va_start(args, format);

+#ifdef HAVE_DTRACE
if(DTRACE_ERROR_ENABLED()) {
char *dtrace_error_buffer;
zend_vspprintf(dtrace_error_buffer, 0, format, args);
DTRACE_ERROR(dtrace_error_buffer, error_filename, error_lineno);
efree(dtrace_error_buffer);
}
+#endif /* HAVE_DTRACE */


/* if we don't have a user defined error handler */

Modified: php/php-src/trunk/Zend/zend_dtrace.c
===
--- php/php-src/trunk/Zend/zend_dtrace.c2009-07-20 10:12:12 UTC (rev 
284423)
+++ php/php-src/trunk/Zend/zend_dtrace.c2009-07-20 10:12:34 UTC (rev 
284424)
@@ -22,7 +22,7 @@
 #include zend_API.h
 #include zend_dtrace.h

-#ifdef HAVE_SYS_SDT_H
+#ifdef HAVE_DTRACE
 /* PHP DTrace probes {{{ */
 static inline char *dtrace_get_executed_filename(TSRMLS_D)
 {
@@ -118,5 +118,5 @@
 }

 /* }}} */
-#endif
+#endif /* HAVE_DTRACE */


Modified: php/php-src/trunk/Zend/zend_dtrace.h
===
--- php/php-src/trunk/Zend/zend_dtrace.h2009-07-20 10:12:12 UTC (rev 
284423)
+++ php/php-src/trunk/Zend/zend_dtrace.h2009-07-20 10:12:34 UTC (rev 
284424)
@@ -29,7 +29,7 @@
 extern C {
 #endif

-#ifdef HAVE_SYS_SDT_H
+#ifdef HAVE_DTRACE
 ZEND_API zend_op_array *(*zend_dtrace_compile_file)(zend_file_handle 
*file_handle, int type TSRMLS_DC);
 ZEND_API void (*zend_dtrace_execute)(zend_op_array *op_array TSRMLS_DC);
 ZEND_API void (*zend_dtrace_execute_internal)(zend_execute_data 
*execute_data_ptr, int return_value_used TSRMLS_DC);
@@ -39,33 +39,8 @@
 ZEND_API void dtrace_execute_internal(zend_execute_data *execute_data_ptr, int 
return_value_used TSRMLS_DC);
 #include zend_dtrace_gen.h

-#else
+#endif /* HAVE_DTRACE */

-#define DTRACE_COMPILE_FILE_ENTRY(arg0, arg1)
-#define DTRACE_COMPILE_FILE_ENTRY_ENABLED() (0)
-#define DTRACE_COMPILE_FILE_RETURN(arg0, arg1)
-#define DTRACE_COMPILE_FILE_RETURN_ENABLED() (0)
-#define DTRACE_ERROR(arg0, arg1, arg2)
-#define DTRACE_ERROR_ENABLED() (0)
-#define DTRACE_EXCEPTION_CAUGHT(arg0)
-#define DTRACE_EXCEPTION_CAUGHT_ENABLED() (0)
-#define DTRACE_EXCEPTION_THROWN(arg0)
-#define DTRACE_EXCEPTION_THROWN_ENABLED() (0)
-#define DTRACE_EXECUTE_ENTRY(arg0, arg1)
-#define DTRACE_EXECUTE_ENTRY_ENABLED() (0)
-#define DTRACE_EXECUTE_RETURN(arg0, arg1)
-#define DTRACE_EXECUTE_RETURN_ENABLED() (0)
-#define DTRACE_FUNCTION_ENTRY(arg0, arg1, arg2, arg3, arg4)
-#define DTRACE_FUNCTION_ENTRY_ENABLED() (0)
-#define DTRACE_FUNCTION_RETURN(arg0, arg1, arg2, arg3, arg4)
-#define DTRACE_FUNCTION_RETURN_ENABLED() (0)
-#define DTRACE_REQUEST_SHUTDOWN(arg0, arg1, arg2)
-#define DTRACE_REQUEST_SHUTDOWN_ENABLED() (0)
-#define DTRACE_REQUEST_STARTUP(arg0, arg1, arg2)
-#define DTRACE_REQUEST_STARTUP_ENABLED() (0)
-
-#endif /* HAVE_SYS_SDT */
-
 #ifdef __cplusplus
 }
 #endif

Modified: php/php-src/trunk/Zend/zend_exceptions.c
===
--- php/php-src/trunk/Zend/zend_exceptions.c2009-07-20 10:12:12 UTC (rev 
284423)
+++ php/php-src/trunk/Zend/zend_exceptions.c2009-07-20 10:12:34 UTC (rev 
284424)
@@ -83,6 +83,7 @@

 void zend_throw_exception_internal(zval *exception TSRMLS_DC) /* {{{ */
 {
+#ifdef HAVE_DTRACE
if (DTRACE_EXCEPTION_THROWN_ENABLED()) {
zstr classname;
char *s_classname;
@@ -97,6 +98,7 @@
efree(classname.v);
efree(s_classname);
}
+#endif /* HAVE_DTRACE */

if (exception != NULL) {
zval *previous = EG(exception);

Modified: php/php-src/trunk/Zend/zend_vm_def.h
===
--- php/php-src/trunk/Zend/zend_vm_def.h2009-07-20 10:12:12 UTC (rev 
284423)
+++ php/php-src/trunk/Zend/zend_vm_def.h2009-07-20 10:12:34 UTC (rev 
284424)
@@ -2627,6 +2627,7 @@
}
ce = Z_OBJCE_P(EG(exception));

+#ifdef HAVE_DTRACE
if (DTRACE_EXCEPTION_CAUGHT_ENABLED()) {
char

[PHP-CVS] svn: SVNROOT/ commit-email.php

2009-07-20 Thread Gwynne Raskind 
gwynne  Mon, 20 Jul 2009 10:14:10 +

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

Changed paths:
U   SVNROOT/commit-email.php

Log:
again with the need for better debugging. no more empty diff attachments

Modified: SVNROOT/commit-email.php
===
--- SVNROOT/commit-email.php2009-07-20 10:12:34 UTC (rev 284424)
+++ SVNROOT/commit-email.php2009-07-20 10:14:10 UTC (rev 284425)
@@ -205,7 +205,7 @@
 Content-Disposition: attachment; filename=\{$boundary}.txt\\r\n .
 Content-Transfer-Encoding: base64\r\n .
 \r\n .
-wordwrap(base64_encode($diffs), 80, \r\n, TRUE) . \r\n;
+wordwrap(base64_encode($commit_info['diffs']), 80, \r\n, TRUE) . 
\r\n;
 }

 $msg_body .= \r\n--{$boundary}--;

-- 
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/ Zend/zend.c Zend/zend_dtrace.c Zend/zend_dtrace.h Zend/zend_exceptions.c Zend/zend_vm_def.h Zend/zend_vm_execute.h configure.in main/main.c

2009-07-20 Thread Pierre Joye 
On Mon, Jul 20, 2009 at 12:12 PM, David Soria Parrad...@php.net wrote:

 Log:
 - Define HAVE_DTRACE if dtrace is available and ifdef all calls to dtrace 
 probes

Thanks! :)

Cheers,
-- 
Pierre

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

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

[PHP-CVS] Re: [SVN-MIGRATION] svn: SVNROOT/ commit-email.php

2009-07-20 Thread Jani Taskinen 

On 07/19/2009 02:40 AM, Hannes Magnusson wrote:

On Sun, Jul 19, 2009 at 00:18, Rasmus Lerdorfras...@php.net  wrote:

rasmus  Sat, 18 Jul 2009 22:18:28 +

URL: http://svn.php.net/viewvc?view=revisionrevision=284338

Changed paths:
U   SVNROOT/commit-email.php

Log:
Try to be smarter about which bug url to use - Hopefully we will
be down
to a single unified bug system soon


Can we/I create a magical backdoor into the current bugs.php.net
bugtracker that will automatically add a link to viewvc of the commit
to the associated bug report as a comment? (the developer still needs
to mark the report as closed, automating that part can lead to
confusion and wrongly closing partially fix bug# commits).

It would be very helpful for all linux distros, the documentation
team, and probably others.


If/when you add something to either current PHP/PEAR trackers, PLEASE 
add the same stuff to the new unified codebase as well!


--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 branches/PHP_5_3/ext/standard/proc_open.c branches/PHP_5_3/ext/standard/proc_open.h branches/PHP_5_3/ext/standard/tests/general_functions/proc_ope

2009-07-20 Thread Jani Taskinen 
Excuse me but where/when was it agreed that this new feature can go into 
PHP_5_3? I thought it was supposed to go HEAD only..


--Jani



On 07/19/2009 05:52 PM, Nuno Lopes wrote:

nlopess Sun, 19 Jul 2009 14:52:27 +

URL: http://svn.php.net/viewvc?view=revisionrevision=284353

Changed paths:
U   php/php-src/branches/PHP_5_3/NEWS
U   php/php-src/branches/PHP_5_3/ext/standard/proc_open.c
U   php/php-src/branches/PHP_5_3/ext/standard/proc_open.h
A   
php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/proc_open03.phpt
A   
php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/proc_open04.phpt
A   
php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/proc_open05.phpt
A   
php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/proc_open06.phpt
A   
php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/proc_open07.phpt
A   
php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/proc_open08.phpt
U   php/php-src/trunk/ext/standard/proc_open.c
U   php/php-src/trunk/ext/standard/proc_open.h
A   
php/php-src/trunk/ext/standard/tests/general_functions/proc_open03.phpt
A   
php/php-src/trunk/ext/standard/tests/general_functions/proc_open04.phpt
A   
php/php-src/trunk/ext/standard/tests/general_functions/proc_open05.phpt
A   
php/php-src/trunk/ext/standard/tests/general_functions/proc_open06.phpt
A   
php/php-src/trunk/ext/standard/tests/general_functions/proc_open07.phpt
A   
php/php-src/trunk/ext/standard/tests/general_functions/proc_open08.phpt

Log:
Add support for proc_open()'s bypass_shell feature for Unix systems
(slightly modified patch from Gwynne)




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

[PHP-CVS] svn: SVNROOT/ global_avail

2009-07-20 Thread Pierre-Alain Joye 
pajoye  Mon, 20 Jul 2009 10:19:21 +

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

Changed paths:
U   SVNROOT/global_avail

Log:
- Patrick's karma for tests and NEWS

Modified: SVNROOT/global_avail
===
--- SVNROOT/global_avail2009-07-20 10:14:10 UTC (rev 284425)
+++ SVNROOT/global_avail2009-07-20 10:19:21 UTC (rev 284426)
@@ -303,7 +303,7 @@
 avail|jluedke|pecl/drizzle
 avail|vito,mkoppanen|pecl/gmagick
 avail|santiago|pecl/gupnp
-avail|patrickallaert|php/php-src/*/ext/ldap
+avail|patrickallaert|php/php-src/*/ext/ldap,php/php-src/*/tests,php/php-src/NEWS

 # Objective-C bridge
 avail|wez,jan|php/php-objc

-- 
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 branches/PHP_5_3/ext/standard/proc_open.c branches/PHP_5_3/ext/standard/proc_open.h branches/PHP_5_3/ext/standard/tests/general_functions/proc_o

2009-07-20 Thread Pierre Joye 
hi,

On Mon, Jul 20, 2009 at 12:19 PM, Jani Taskinenj...@php.net wrote:
 Excuse me but where/when was it agreed that this new feature can go into
 PHP_5_3? I thought it was supposed to go HEAD only..

It should not go in 5.3, Nuno please revert.

Cheers,
-- 
Pierre

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

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

Re: [PHP-CVS] svn: php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/standard/proc_open.c branches/PHP_5_3/ext/standard/proc_open.h branches/PHP_5_3/ext/standard/tests/general_functions/proc_o

2009-07-20 Thread Gwynne Raskind 

On Jul 20, 2009, at 6:21 AM, Pierre Joye wrote:
Excuse me but where/when was it agreed that this new feature can go  
into

PHP_5_3? I thought it was supposed to go HEAD only..

It should not go in 5.3, Nuno please revert.



And for the record, this was supposed to be my patch and I had full  
karma to commit it. I never asked Nuno to do so, all I wanted was peer  
review.


-- Gwynne


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

Re: [PHP-CVS] svn: / SVNROOT/commit-email.php web/php-bugs/trunk/bug.php web/php-bugs/trunk/rpc.php

2009-07-20 Thread Jani Taskinen 
This is all nice and that crap, but since you didn't merge it into 
pear/packages/Bugtracker, it will all be lost once that stuff is taken 
into action..so please merge this there too. :D


--Jani


On 07/20/2009 12:08 AM, Rasmus Lerdorf wrote:

rasmus  Sun, 19 Jul 2009 21:08:22 +

URL: http://svn.php.net/viewvc?view=revisionrevision=284386

Changed paths:
U   SVNROOT/commit-email.php
U   web/php-bugs/trunk/bug.php
A   web/php-bugs/trunk/rpc.php

Log:
Bugs mentioned in commit messages now update the bug db and also
pull the status of the bug back into the commit email.
(I'm pretty sure this won't work on the first try)


Modified: SVNROOT/commit-email.php
===
--- SVNROOT/commit-email.php2009-07-19 20:53:26 UTC (rev 284385)
+++ SVNROOT/commit-email.php2009-07-19 21:08:22 UTC (rev 284386)
@@ -9,6 +9,7 @@
  // Constants
  $version = substr('$Revision$', strlen('$Revision: '), -2);
  $smtp_server = '127.0.0.1';
+
  $commit_email_list = array(
  // FastCGI ISAPI
  '|^php/fastcgi-isapi|' =  array('sh...@php.net', 'w...@php.net', 
'ed...@php.net'),
@@ -218,8 +219,34 @@

  $bugs_body = '';
  if ($bugs) {
+include '/home/svn/SVNROOT/secret.inc';
+$bugs_body = (count($bugs_array[1])1) ? Bug:  : Bugs: ;
  foreach ($bugs_array[1] as $k=$bug_id) {
-$bugs_body .= ' '.$bug_urls[$k]./$bug_id\r\n;
+$bug_sdesc = '';
+$bug_status = '';
+if($bug_urls[$k]=='http://bugs.php.net') {
+$ch = curl_init('http://bugs.php.net/rpc.php');
+curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+curl_setopt($ch, CURLOPT_POST, 1);
+$ncomment = Automatic comment from SVN on behalf of {$from[0]}\n 
.
+Log: $commit_log\n .
+Revision: 
http://svn.php.net/viewvc?view=revisionrevision={$REV}\n;;
+curl_setopt($ch, CURLOPT_POSTFIELDS, user= . 
rawurlencode($from[0]) .
+ id={$bug_id} .
+ ncomment= . rawurlencode($ncomment) .
+ MAGIC_COOKIE=$SVN_MAGIC_COOKIE);
+$ret = curl_exec($ch);
+if($ret !== false ) {
+$json = json_decode($ret,true);
+if(isset($json['result']['status'])) {
+$bug_status = '('.$json['result']['status']['status'].')';
+$bug_sdesc = $json['result']['status']['sdesc'];
+}
+}
+curl_close($ch);
+}
+if($k) $bugs_body .= '   ';
+$bugs_body .= $bug_urls[$k]./$bug_id{$bug_status}{$bug_sdesc}\r\n;
  }
  }

@@ -229,7 +256,7 @@
  \r\n .
  {$commit_user}\t\t . date(DATE_RFC2822, $commit_date) . \r\n .
  \r\n .
-URL: http://svn.php.net/viewvc?view=revisionrevision={$REV}\r\n; 
.
+Revision: 
http://svn.php.net/viewvc?view=revisionrevision={$REV}\r\n; .
  $bugs_body .
  \r\n .
  Changed paths:\r\n .

Modified: web/php-bugs/trunk/bug.php
===
--- web/php-bugs/trunk/bug.php  2009-07-19 20:53:26 UTC (rev 284385)
+++ web/php-bugs/trunk/bug.php  2009-07-19 21:08:22 UTC (rev 284386)
@@ -124,7 +124,7 @@

if (!$errors) {
$query = INSERT INTO bugdb_comments (bug,email,ts,comment) 
VALUES
-  .  ('$id',' . $in['commentemail'] . 
',NOW(),'$ncomment');
+  .  ('$id',' . mysql_real_escape_string($in['commentemail']) . 
',NOW(),'.mysql_real_escape_string($ncomment).');
$success = @mysql_query($query);
}
$from = stripslashes($in['commentemail']);
@@ -160,12 +160,12 @@

if (!$errors  !($errors = incoming_details_are_valid($in))) {
/* update bug record */
-   $query = UPDATE bugdb SET sdesc=' . $in['sdesc'] . ',status=' . $in['status'] . ', 
bug_type=' . $in['bug_type'] . ', php_version=' . $in['php_version'] . ', php_os=' . $in['php_os'] . ', 
ts2=NOW(), email='$from' WHERE id=$id;
+   $query = UPDATE bugdb SET sdesc=' . mysql_real_escape_string($in['sdesc']) . ',status=' . 
mysql_real_escape_string($in['status']) . ', bug_type=' . mysql_real_escape_string($in['bug_type']) . ', php_version=' . 
mysql_real_escape_string($in['php_version']) . ', php_os=' . mysql_real_escape_string($in['php_os']) . ', ts2=NOW(), 
email='.mysql_real_escape_string($from).' WHERE id=$id;
$success = @mysql_query($query);

/* add comment */
if ($success  !empty($ncomment)) {
-   $query = INSERT INTO bugdb_comments (bug, email, ts, 
comment) VALUES ($id,'$from',NOW(),'$ncomment');
+   $query = INSERT INTO bugdb_comments (bug, email, ts, comment) VALUES

[PHP-CVS] svn: php/php-src/ branches/PHP_5_2/build/build.mk branches/PHP_5_2/buildconf branches/PHP_5_3/build/build.mk branches/PHP_5_3/buildconf trunk/build/build.mk trunk/buildconf

2009-07-20 Thread Jani Taskinen 
janiMon, 20 Jul 2009 10:51:40 +

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

Changed paths:
U   php/php-src/branches/PHP_5_2/build/build.mk
U   php/php-src/branches/PHP_5_2/buildconf
U   php/php-src/branches/PHP_5_3/build/build.mk
U   php/php-src/branches/PHP_5_3/buildconf
U   php/php-src/trunk/build/build.mk
U   php/php-src/trunk/buildconf

Log:
- Removed unused parts

Modified: php/php-src/branches/PHP_5_2/build/build.mk
===
--- php/php-src/branches/PHP_5_2/build/build.mk 2009-07-20 10:19:21 UTC (rev 
284426)
+++ php/php-src/branches/PHP_5_2/build/build.mk 2009-07-20 10:51:40 UTC (rev 
284427)
@@ -20,10 +20,8 @@
 # Makefile to generate build tools
 #

-ZENDDIR = Zend
+SUBDIRS = Zend TSRM

-SUBDIRS = $(ZENDDIR) TSRM
-
 STAMP = buildmk.stamp

 ALWAYS = generated_lists
@@ -33,11 +31,10 @@
@$(MAKE) -s -f build/build2.mk

 generated_lists:
-   @echo makefile_am_files = $(ZENDDIR)/Makefile.am \
-   TSRM/Makefile.am  $@
-   @echo config_h_files = $(ZENDDIR)/acconfig.h TSRM/acconfig.h  $@
-   @echo config_m4_files = $(ZENDDIR)/Zend.m4 TSRM/tsrm.m4 TSRM/threads.m4 
\
-   $(ZENDDIR)/acinclude.m4 ext/*/config*.m4 sapi/*/config.m4  $@
+   @echo makefile_am_files = Zend/Makefile.am TSRM/Makefile.am  $@
+   @echo config_h_files = Zend/acconfig.h TSRM/acconfig.h  $@
+   @echo config_m4_files = Zend/Zend.m4 TSRM/tsrm.m4 TSRM/threads.m4 \
+   Zend/acinclude.m4 ext/*/config*.m4 sapi/*/config.m4  $@

 $(STAMP): build/buildcheck.sh
@build/buildcheck.sh $(STAMP)

Modified: php/php-src/branches/PHP_5_2/buildconf
===
--- php/php-src/branches/PHP_5_2/buildconf  2009-07-20 10:19:21 UTC (rev 
284426)
+++ php/php-src/branches/PHP_5_2/buildconf  2009-07-20 10:51:40 UTC (rev 
284427)
@@ -36,7 +36,7 @@
 rm -f generated_lists

 if test $debug = yes; then
-  ${MAKE:-make} -s -f build/build.mk ZENDDIR=Zend/ SUPPRESS_WARNINGS=
+  ${MAKE:-make} -s -f build/build.mk SUPPRESS_WARNINGS=
 else
-  ${MAKE:-make} -s -f build/build.mk ZENDDIR=Zend/
+  ${MAKE:-make} -s -f build/build.mk
 fi

Modified: php/php-src/branches/PHP_5_3/build/build.mk
===
--- php/php-src/branches/PHP_5_3/build/build.mk 2009-07-20 10:19:21 UTC (rev 
284426)
+++ php/php-src/branches/PHP_5_3/build/build.mk 2009-07-20 10:51:40 UTC (rev 
284427)
@@ -20,10 +20,8 @@
 # Makefile to generate build tools
 #

-ZENDDIR = Zend
+SUBDIRS = Zend TSRM

-SUBDIRS = $(ZENDDIR) TSRM
-
 STAMP = buildmk.stamp

 ALWAYS = generated_lists
@@ -33,11 +31,10 @@
@$(MAKE) -s -f build/build2.mk

 generated_lists:
-   @echo makefile_am_files = $(ZENDDIR)/Makefile.am \
-   TSRM/Makefile.am  $@
-   @echo config_h_files = $(ZENDDIR)/acconfig.h TSRM/acconfig.h  $@
-   @echo config_m4_files = $(ZENDDIR)/Zend.m4 TSRM/tsrm.m4 TSRM/threads.m4 
\
-   $(ZENDDIR)/acinclude.m4 ext/*/config*.m4 sapi/*/config.m4  $@
+   @echo makefile_am_files = Zend/Makefile.am TSRM/Makefile.am  $@
+   @echo config_h_files = Zend/acconfig.h TSRM/acconfig.h  $@
+   @echo config_m4_files = Zend/Zend.m4 TSRM/tsrm.m4 TSRM/threads.m4 \
+   Zend/acinclude.m4 ext/*/config*.m4 sapi/*/config.m4  $@

 $(STAMP): build/buildcheck.sh
@build/buildcheck.sh $(STAMP)

Modified: php/php-src/branches/PHP_5_3/buildconf
===
--- php/php-src/branches/PHP_5_3/buildconf  2009-07-20 10:19:21 UTC (rev 
284426)
+++ php/php-src/branches/PHP_5_3/buildconf  2009-07-20 10:51:40 UTC (rev 
284427)
@@ -36,7 +36,7 @@
 rm -f generated_lists

 if test $debug = yes; then
-  ${MAKE:-make} -s -f build/build.mk ZENDDIR=Zend/ SUPPRESS_WARNINGS=
+  ${MAKE:-make} -s -f build/build.mk SUPPRESS_WARNINGS=
 else
-  ${MAKE:-make} -s -f build/build.mk ZENDDIR=Zend/
+  ${MAKE:-make} -s -f build/build.mk
 fi

Modified: php/php-src/trunk/build/build.mk
===
--- php/php-src/trunk/build/build.mk2009-07-20 10:19:21 UTC (rev 284426)
+++ php/php-src/trunk/build/build.mk2009-07-20 10:51:40 UTC (rev 284427)
@@ -20,10 +20,8 @@
 # Makefile to generate build tools
 #

-ZENDDIR = Zend
+SUBDIRS = Zend TSRM

-SUBDIRS = $(ZENDDIR) TSRM
-
 STAMP = buildmk.stamp

 ALWAYS = generated_lists
@@ -33,11 +31,10 @@
@$(MAKE) -s -f build/build2.mk

 generated_lists:
-   @echo makefile_am_files = $(ZENDDIR)/Makefile.am \
-   TSRM/Makefile.am  $@
-   @echo config_h_files = $(ZENDDIR)/acconfig.h TSRM/acconfig.h  $@
-   @echo config_m4_files = $(ZENDDIR)/Zend.m4 TSRM/tsrm.m4 TSRM/threads.m4 
\
-   $(ZENDDIR)/acinclude.m4 ext/*/config*.m4 sapi/*/config.m4  $@
+   @echo makefile_am_files =

[PHP-CVS] svn: php/php-src/ branches/PHP_5_2/NEWS branches/PHP_5_2/ext/standard/http_fopen_wrapper.c branches/PHP_5_2/ext/standard/tests/http/bug48929.phpt branches/PHP_5_3/NEWS branches/PHP_5_3/ext/s

2009-07-20 Thread Jani Taskinen 
janiMon, 20 Jul 2009 10:54:37 +

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

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
A   php/php-src/branches/PHP_5_2/ext/standard/tests/http/bug48929.phpt
U   php/php-src/branches/PHP_5_3/NEWS
U   php/php-src/branches/PHP_5_3/ext/standard/http_fopen_wrapper.c
A   php/php-src/branches/PHP_5_3/ext/standard/tests/http/bug48929.phpt
U   php/php-src/trunk/ext/standard/http_fopen_wrapper.c
A   php/php-src/trunk/ext/standard/tests/http/bug48929.phpt

Log:
Fixed bug #48929 (Double \r\n after HTTP headers when header context option 
is an array)
Bug: http://bugs.php.net/48929 (Open) 
  Modified: php/php-src/branches/PHP_5_2/NEWS
===
--- php/php-src/branches/PHP_5_2/NEWS	2009-07-20 10:51:40 UTC (rev 284427)
+++ php/php-src/branches/PHP_5_2/NEWS	2009-07-20 10:54:37 UTC (rev 284428)
@@ -5,6 +5,8 @@
   defined as a file handle. (Ilia)

 - Fixed bug #48980 (Crash when compiling with pdo_firebird). (Felipe)
+- Fixed bug #48929 (Double \r\n after HTTP headers when header context
+  option is an array). (David Zülke)
 - Fixed bug #48913 (Too long error code strings in pdo_odbc driver).
   (naf at altlinux dot ru, Felipe)
 - Fixed bug #48788 (RecursiveDirectoryIterator doesn't descend into symlinked

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	2009-07-20 10:51:40 UTC (rev 284427)
+++ php/php-src/branches/PHP_5_2/ext/standard/http_fopen_wrapper.c	2009-07-20 10:54:37 UTC (rev 284428)
@@ -347,7 +347,8 @@
 }
 			}
 			smart_str_0(tmpstr);
-			tmp = tmpstr.c;
+			/* Remove newlines and spaces from start and end. there's at least one extra \r\n at the end that needs to go. */
+			tmp = php_trim(tmpstr.c, strlen(tmpstr.c), NULL, 0, NULL, 3 TSRMLS_CC);
 		}
 		if (Z_TYPE_PP(tmpzval) == IS_STRING  Z_STRLEN_PP(tmpzval)) {
 			/* Remove newlines and spaces from start and end php_trim will estrndup() */

Added: php/php-src/branches/PHP_5_2/ext/standard/tests/http/bug48929.phpt
===
--- php/php-src/branches/PHP_5_2/ext/standard/tests/http/bug48929.phpt	(rev 0)
+++ php/php-src/branches/PHP_5_2/ext/standard/tests/http/bug48929.phpt	2009-07-20 10:54:37 UTC (rev 284428)
@@ -0,0 +1,56 @@
+--TEST--
+Bug #: duplicate \r\n sent after last header line
+--SKIPIF--
+?php require 'server.inc'; http_server_skipif('tcp://127.0.0.1:12342'); ?
+--FILE--
+?php
+require 'server.inc';
+
+function do_test($context_options) {
+
+	$context = stream_context_create(array('http' = $context_options));
+
+	$responses = array(
+		data://text/plain,HTTP/1.0 200 OK\r\n\r\n,
+	);
+
+	$pid = http_server(tcp://127.0.0.1:12342, $responses, $output);
+
+	foreach($responses as $r) {
+
+		$fd = fopen('http://127.0.0.1:12342/', 'rb', false, $context);
+
+		fseek($output, 0, SEEK_SET);
+		var_dump(stream_get_contents($output));
+		fseek($output, 0, SEEK_SET);
+	}
+
+	http_server_kill($pid);
+}
+
+echo -- Test: requests with 'header' as array --\n;
+
+do_test(array('header' = array('X-Foo: bar', 'Content-Type: text/plain'), 'method' = 'POST', 'content' = 'ohai'));
+
+echo -- Test: requests with 'header' as string --\n;
+
+do_test(array('header' = X-Foo: bar\r\nContent-Type: text/plain, 'method' = 'POST', 'content' = 'ohai'));
+
+?
+--EXPECT--
+-- Test: requests with 'header' as array --
+string(103) POST / HTTP/1.0
+Host: 127.0.0.1:12342
+Content-Length: 4
+X-Foo: bar
+Content-Type: text/plain
+
+ohai
+-- Test: requests with 'header' as string --
+string(103) POST / HTTP/1.0
+Host: 127.0.0.1:12342
+Content-Length: 4
+X-Foo: bar
+Content-Type: text/plain
+
+ohai


Property changes on: php/php-src/branches/PHP_5_2/ext/standard/tests/http/bug48929.phpt
___
Added: svn:keywords
   + Id Rev Revision
Added: svn:eol-style
   + native

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS	2009-07-20 10:51:40 UTC (rev 284427)
+++ php/php-src/branches/PHP_5_3/NEWS	2009-07-20 10:54:37 UTC (rev 284428)
@@ -8,6 +8,8 @@
 - Added support for proc_open()'s bypass_shell feature for Unix systems
   (Gwynne, Nuno)

+- Fixed bug #48929 (Double \r\n after HTTP headers when header context
+  option is an array). (David Zülke)
 - Fixed bug #48899 (is_callable returns true even if method does not exist in
   parent class). (Felipe)
 - Fixed bug #48893 (Problems compiling with Curl). (Felipe)

Modified: php/php-src/branches/PHP_5_3/ext/standard/http_fopen_wrapper.c

[PHP-CVS] svn: php/phpruntests/trunk/src/t askScheduler/rtTaskScheduler.php estcase/output/rtTestOutputWriterCSV.php estcase/output/rtTestOutputWriterList.php

2009-07-20 Thread Georg Gradwohl 
g2  Mon, 20 Jul 2009 11:04:48 +

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

Changed paths:
U   php/phpruntests/trunk/src/taskScheduler/rtTaskScheduler.php
U   php/phpruntests/trunk/src/testcase/output/rtTestOutputWriterCSV.php
U   php/phpruntests/trunk/src/testcase/output/rtTestOutputWriterList.php

Log:
bugfix outputwriter

Modified: php/phpruntests/trunk/src/taskScheduler/rtTaskScheduler.php
===
--- php/phpruntests/trunk/src/taskScheduler/rtTaskScheduler.php 2009-07-20 
10:54:37 UTC (rev 284428)
+++ php/phpruntests/trunk/src/taskScheduler/rtTaskScheduler.php 2009-07-20 
11:04:48 UTC (rev 284429)
@@ -131,7 +131,7 @@
$task-run();
$results = $task-getResult();
rtTestOutputWriter::flushResult($results, 
$this-reportStatus);
-   $this-resultList = array_merge($this-resultList, 
$results);
+   $this-resultList[] = $results;
}

return;

Modified: php/phpruntests/trunk/src/testcase/output/rtTestOutputWriterCSV.php
===
--- php/phpruntests/trunk/src/testcase/output/rtTestOutputWriterCSV.php 
2009-07-20 10:54:37 UTC (rev 284428)
+++ php/phpruntests/trunk/src/testcase/output/rtTestOutputWriterCSV.php 
2009-07-20 11:04:48 UTC (rev 284429)
@@ -25,16 +25,22 @@

 public function createOutput()
 {
-   foreach ($this-resultList as $testResult) {
+   foreach ($this-resultList as $testGroupResults) {
+
+   foreach ($testGroupResults as $testResult) {
+
$outputString = $testResult-getName();
$testStatus = $testResult-getStatus();
-   foreach($testStatus-getTestStateNames() as $name) {
+
+   foreach($testStatus-getTestStateNames() as $name) {
+
if($testStatus-getValue($name)) {
$outputString .=  , . strtoupper($name);
}
}
$this-output .= $outputString.\n;
}
+}
 }

 }

Modified: php/phpruntests/trunk/src/testcase/output/rtTestOutputWriterList.php
===
--- php/phpruntests/trunk/src/testcase/output/rtTestOutputWriterList.php
2009-07-20 10:54:37 UTC (rev 284428)
+++ php/phpruntests/trunk/src/testcase/output/rtTestOutputWriterList.php
2009-07-20 11:04:48 UTC (rev 284429)
@@ -3,7 +3,7 @@
  * rtTestOutputWriterList
  *
  * Write test output line by line
- *
+ *
  * @category   Testing
  * @packageRUNTESTS
  * @author Zoe Slattery z...@php.net
@@ -12,32 +12,37 @@
  * @copyright  2009 The PHP Group
  * @licensehttp://www.php.net/license/3_01.txt  PHP License 3.01
  * @link   http://qa.php.net/
- *
+ *
  */
 class rtTestOutputWriterList extends rtTestOutputWriter
 {
 public function __construct()
 {
-$this-type = 'txt';
+ $this-type = 'txt';
 }

-
+
 public function createOutput()
 {
-foreach ($this-resultList as $testResult) {
-$outputString = ;
-$testStatus = $testResult-getStatus();
-
-foreach($testStatus-getTestStateNames() as $name) {
+foreach ($this-resultList as $testGroupResults) {
+
+   foreach ($testGroupResults as $testResult) {

-if ($testStatus-getValue($name)) {
-$outputString .=  . strtoupper($name);
-$outputString .=   . $testStatus-getMessage($name);
-}
-}
-$outputString .=   . $testResult-getTitle();
-$outputString .=  [ . $testResult-getName() . .phpt];
-$this-output .= $outputString.\n;
+   $outputString = ;
+   $testStatus = $testResult-getStatus();
+
+   foreach($testStatus-getTestStateNames() as $name) {
+
+   if ($testStatus-getValue($name)) {
+   $outputString .=  . strtoupper($name);
+   $outputString .=   . 
$testStatus-getMessage($name);
+   }
+   }
+
+   $outputString .=   . $testResult-getTitle();
+   $outputString .=  [ . $testResult-getName() . .phpt];
+   $this-output .= $outputString.\n;
+   }
 }
 }


-- 
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 ext/standard/proc_open.c ext/standard/proc_open.h ext/standard/tests/general_functions/proc_open03.phpt ext/standard/tests/general_functions/proc_open

2009-07-20 Thread Gwynne Raskind 
gwynne  Mon, 20 Jul 2009 11:48:04 +

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

Changed paths:
U   php/php-src/branches/PHP_5_3/NEWS
U   php/php-src/branches/PHP_5_3/ext/standard/proc_open.c
U   php/php-src/branches/PHP_5_3/ext/standard/proc_open.h
D   
php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/proc_open03.phpt
D   
php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/proc_open04.phpt
D   
php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/proc_open05.phpt
D   
php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/proc_open06.phpt
D   
php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/proc_open07.phpt
D   
php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/proc_open08.phpt

Log:
revert Nuno's commit of my patch
Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS	2009-07-20 11:47:33 UTC (rev 284430)
+++ php/php-src/branches/PHP_5_3/NEWS	2009-07-20 11:48:04 UTC (rev 284431)
@@ -5,8 +5,6 @@
   Functors. (Christian Seiler)
 - Fixed open_basedir circumvention for mail.log. (Maksymilian Arciemowicz,
   Stas)
-- Added support for proc_open()'s bypass_shell feature for Unix systems
-  (Gwynne, Nuno)

 - Fixed bug #48929 (Double \r\n after HTTP headers when header context
   option is an array). (David Zülke)

Modified: php/php-src/branches/PHP_5_3/ext/standard/proc_open.c
===
--- php/php-src/branches/PHP_5_3/ext/standard/proc_open.c	2009-07-20 11:47:33 UTC (rev 284430)
+++ php/php-src/branches/PHP_5_3/ext/standard/proc_open.c	2009-07-20 11:48:04 UTC (rev 284431)
@@ -71,56 +71,6 @@

 static int le_proc_open;

-#if !defined(PHP_WIN32)  !defined(NETWARE)
-/* {{{ _php_array_to_argv */
-static char **_php_array_to_argv(zval *arg_array, int is_persistent)
-{
-	zval **element, temp;
-	char **c_argv, **ap;
-	HashTable *target_hash;
-	HashPosition pos;
-
-	target_hash = Z_ARRVAL_P(arg_array);
-	ap = c_argv = (char **)pecalloc(zend_hash_num_elements(target_hash) + 1, sizeof(char *), is_persistent);
-
-	/* skip first element */
-	zend_hash_internal_pointer_reset_ex(target_hash, pos);
-	zend_hash_move_forward_ex(target_hash, pos);
-	for (	;
-			zend_hash_get_current_data_ex(target_hash, (void **) element, pos) == SUCCESS;
-			zend_hash_move_forward_ex(target_hash, pos)) {
-
-		temp = **element;
-		if (Z_TYPE_PP(element) != IS_STRING) {
-			zval_copy_ctor(temp);
-			convert_to_string(temp);
-		}
-		*ap++ = pestrndup(Z_STRVAL(temp), Z_STRLEN(temp), is_persistent);
-		if (Z_TYPE_PP(element) != IS_STRING) {
-			zval_dtor(temp);
-		}
-	}
-
-	return c_argv;
-}
-/* }}} */
-
-/* {{{ _php_free_argv */
-static void _php_free_argv(char **argv, int is_persistent)
-{
-	if (argv) {
-		char **ap = NULL;
-
-		for (ap = argv; *ap; ap++) {
-			pefree(*ap, is_persistent);
-		}
-		pefree(argv, is_persistent);
-	}
-}
-/* }}} */
-
-#endif
-
 /* {{{ _php_array_to_envp */
 static php_process_env_t _php_array_to_envp(zval *environment, int is_persistent TSRMLS_DC)
 {
@@ -227,6 +177,8 @@
 	}

 	assert(p - env.envp = sizeenv);
+
+	zend_hash_internal_pointer_reset_ex(target_hash, pos);

 	return env;
 }
@@ -291,9 +243,6 @@
 	FG(pclose_ret) = -1;
 #endif
 	_php_free_envp(proc-env, proc-is_persistent);
-#if !defined(PHP_WIN32)  !defined(NETWARE)
-	_php_free_argv(proc-argv, proc-is_persistent);
-#endif
 	pefree(proc-command, proc-is_persistent);
 	pefree(proc, proc-is_persistent);

@@ -516,7 +465,6 @@
Run a process with more control over it's file descriptors */
 PHP_FUNCTION(proc_open)
 {
-	zval *command_with_args = NULL;
 	char *command, *cwd=NULL;
 	int command_len, cwd_len = 0;
 	zval *descriptorspec;
@@ -529,7 +477,6 @@
 	zval **descitem = NULL;
 	HashPosition pos;
 	struct php_proc_open_descriptor_item descriptors[PHP_PROC_OPEN_MAX_DESCRIPTORS];
-	char** child_argv = NULL;
 #ifdef PHP_WIN32
 	PROCESS_INFORMATION pi;
 	HANDLE childHandle;
@@ -541,6 +488,7 @@
 	UINT old_error_mode;
 #endif
 #ifdef NETWARE
+	char** child_argv = NULL;
 	char* command_dup = NULL;
 	char* orig_cwd = NULL;
 	int command_num_args = 0;
@@ -551,85 +499,43 @@
 	int is_persistent = 0; /* TODO: ensure that persistent procs will work */
 #ifdef PHP_WIN32
 	int suppress_errors = 0;
-#endif
 	int bypass_shell = 0;
+#endif
 #if PHP_CAN_DO_PTS
 	php_file_descriptor_t dev_ptmx = -1;	/* master */
 	php_file_descriptor_t slave_pty = -1;
 #endif

-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, zaz|s!a!a!, command_with_args,
-descriptorspec, pipes, cwd, cwd_len, environment,
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, saz|s!a!a!, command,
+command_len, descriptorspec, pipes, cwd, cwd_len, environment,
 other_options) == FAILURE) {
 		RETURN_FALSE;
 	}

+	if (FAILURE ==

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

2009-07-20 Thread Felipe Pena 
felipe  Mon, 20 Jul 2009 12:46:10 +

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

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

Log:
- Fix build

Modified: php/php-src/trunk/ext/unicode/unicode_iterators.c
===
--- php/php-src/trunk/ext/unicode/unicode_iterators.c   2009-07-20 12:06:10 UTC 
(rev 284433)
+++ php/php-src/trunk/ext/unicode/unicode_iterators.c   2009-07-20 12:46:10 UTC 
(rev 284434)
@@ -171,7 +171,7 @@
object-u.cp.offset = object-u.cp.cp_offset = 
UBRK_DONE;
}
} else {
-   U16_FWD_1(object-text, (uint32_t) object-u.cp.offset, 
object-text_len);
+   U16_FWD_1(object-text, object-u.cp.offset, object-text_len);
if ((uint32_t) object-u.cp.offset = object-text_len) {
object-u.cp.cp_offset++;
} else {

-- 
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/unicode/ unicode_iterators.c

2009-07-20 Thread Pierre-Alain Joye 
pajoye  Mon, 20 Jul 2009 12:58:17 +

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

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

Log:
- silent warning again and do it so that lazy compilers won't complain

Modified: php/php-src/trunk/ext/unicode/unicode_iterators.c
===
--- php/php-src/trunk/ext/unicode/unicode_iterators.c   2009-07-20 12:46:10 UTC 
(rev 284434)
+++ php/php-src/trunk/ext/unicode/unicode_iterators.c   2009-07-20 12:58:17 UTC 
(rev 284435)
@@ -171,7 +171,7 @@
object-u.cp.offset = object-u.cp.cp_offset = 
UBRK_DONE;
}
} else {
-   U16_FWD_1(object-text, object-u.cp.offset, object-text_len);
+   U16_FWD_1(object-text, object-u.cp.offset, (int32_t) 
object-text_len);
if ((uint32_t) object-u.cp.offset = object-text_len) {
object-u.cp.cp_offset++;
} else {

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

[PHP-CVS] svn: SVNROOT/ global_avail

2009-07-20 Thread Pierre-Alain Joye 
pajoye  Mon, 20 Jul 2009 13:15:00 +

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

Changed paths:
U   SVNROOT/global_avail

Log:
- web karma for dsp so it can fix svn stuff too (along other)

Modified: SVNROOT/global_avail
===
--- SVNROOT/global_avail2009-07-20 12:58:17 UTC (rev 284435)
+++ SVNROOT/global_avail2009-07-20 13:15:00 UTC (rev 284436)
@@ -49,7 +49,7 @@
 # The PHP Web Group maintains www.php.net, news.php.net, bugs.php.net,
 # people.php.net and master.php.net.

-avail|scottmac,jmertic,lsmith,johannes,ilia,cmv,tcobb,gareth,jah,eschmid,ronabop,derick,sterling,stas,phildriscoll,jmoore,andre,jani,david,lyric,zimt,mk,goba,zak,jmcastagnetto,dams,tom,jacques,sebastian,georg,mj,imajes,cortesi,sander,markonen,edink,jan,victor,mfischer,wez,sesser,pollita,alindeman,magnus,iliaa,philip,didou,sfox,sean,dufuz,nlopess,pajoye,helly,tony2001,bjori,felipe|web/php,web/php-bugs,web/php-master,web/php-news,web/php-hosts,web/php-wiki,web/php-people
+avail|scottmac,jmertic,lsmith,johannes,ilia,cmv,tcobb,gareth,jah,eschmid,ronabop,derick,sterling,stas,phildriscoll,jmoore,andre,jani,david,lyric,zimt,mk,goba,zak,jmcastagnetto,dams,tom,jacques,sebastian,georg,mj,imajes,cortesi,sander,markonen,edink,jan,victor,mfischer,wez,sesser,pollita,alindeman,magnus,iliaa,philip,didou,sfox,sean,dufuz,nlopess,pajoye,helly,tony2001,bjori,felipe,dsp|web/php,web/php-bugs,web/php-master,web/php-news,web/php-hosts,web/php-wiki,web/php-people

 # The PHP Presentation Group has access to the presentations on the
 # conf.php.net site.

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

2009-07-20 Thread Johannes Schlüter 
johannesMon, 20 Jul 2009 14:34:09 +

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

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

Log:
CVS-SVN

Modified: php/php-src/branches/PHP_5_2/configure.in
===
--- php/php-src/branches/PHP_5_2/configure.in   2009-07-20 13:19:35 UTC (rev 
284437)
+++ php/php-src/branches/PHP_5_2/configure.in   2009-07-20 14:34:09 UTC (rev 
284438)
@@ -171,7 +171,7 @@
 case $php_cv_bison_version in
   |invalid[)]
 if ! test -f $abs_srcdir/Zend/zend_language_parser.h || ! test -f 
$abs_srcdir/Zend/zend_language_parser.c ; then
-  AC_MSG_ERROR([bison is required to build PHP/Zend when building a CVS 
checkout!])
+  AC_MSG_ERROR([bison is required to build PHP/Zend when building a SVN 
checkout!])
 fi
 ;;
 esac

Modified: php/php-src/branches/PHP_5_3/configure.in
===
--- php/php-src/branches/PHP_5_3/configure.in   2009-07-20 13:19:35 UTC (rev 
284437)
+++ php/php-src/branches/PHP_5_3/configure.in   2009-07-20 14:34:09 UTC (rev 
284438)
@@ -170,7 +170,7 @@
 case $php_cv_bison_version in
   |invalid[)]
 if ! test -f $abs_srcdir/Zend/zend_language_parser.h || ! test -f 
$abs_srcdir/Zend/zend_language_parser.c ; then
-  AC_MSG_ERROR([bison is required to build PHP/Zend when building a CVS 
checkout!])
+  AC_MSG_ERROR([bison is required to build PHP/Zend when building a SVN 
checkout!])
 fi
 ;;
 esac

Modified: php/php-src/trunk/configure.in
===
--- php/php-src/trunk/configure.in  2009-07-20 13:19:35 UTC (rev 284437)
+++ php/php-src/trunk/configure.in  2009-07-20 14:34:09 UTC (rev 284438)
@@ -170,7 +170,7 @@
 case $php_cv_bison_version in
   |invalid[)]
 if ! test -f $abs_srcdir/Zend/zend_language_parser.h || ! test -f 
$abs_srcdir/Zend/zend_language_parser.c ; then
-  AC_MSG_ERROR([bison is required to build PHP/Zend when building a CVS 
checkout!])
+  AC_MSG_ERROR([bison is required to build PHP/Zend when building a SVN 
checkout!])
 fi
 ;;
 esac

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

[PHP-CVS] svn: php/phpruntests/trunk/ Doxyfile build.xml

2009-07-20 Thread Stefan Priebsch 
spriebsch   Mon, 20 Jul 2009 14:48:02 +

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

Changed paths:
U   php/phpruntests/trunk/Doxyfile
U   php/phpruntests/trunk/build.xml

Log:
Improved build automation.
Modified: php/phpruntests/trunk/Doxyfile
===
--- php/phpruntests/trunk/Doxyfile	2009-07-20 14:38:48 UTC (rev 284439)
+++ php/phpruntests/trunk/Doxyfile	2009-07-20 14:48:02 UTC (rev 284440)
@@ -38,7 +38,7 @@
 # If a relative path is entered, it will be relative to the location
 # where doxygen was started. If left blank the current directory will be used.

-OUTPUT_DIRECTORY   = docs
+OUTPUT_DIRECTORY   = _docs

 # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
 # 4096 sub-directories (in 2 levels) under the output directory of each output
@@ -647,7 +647,7 @@
 # Note: To get rid of all source code in the generated output, make sure also
 # VERBATIM_HEADERS is set to NO.

-SOURCE_BROWSER = NO
+SOURCE_BROWSER = YES

 # Setting the INLINE_SOURCES tag to YES will include the body
 # of functions and classes directly in the documentation.
@@ -658,19 +658,19 @@
 # doxygen to hide any special comment blocks from generated source code
 # fragments. Normal C and C++ comments will always remain visible.

-STRIP_CODE_COMMENTS= YES
+STRIP_CODE_COMMENTS= NO

 # If the REFERENCED_BY_RELATION tag is set to YES
 # then for each documented function all documented
 # functions referencing it will be listed.

-REFERENCED_BY_RELATION = NO
+REFERENCED_BY_RELATION = YES

 # If the REFERENCES_RELATION tag is set to YES
 # then for each documented function all documented entities
 # called/used by that function will be listed.

-REFERENCES_RELATION= NO
+REFERENCES_RELATION= YES

 # If the REFERENCES_LINK_SOURCE tag is set to YES (the default)
 # and SOURCE_BROWSER tag is set to YES, then the hyperlinks from
@@ -691,7 +691,7 @@
 # will generate a verbatim copy of the header file for each class for
 # which an include is specified. Set to NO to disable this.

-VERBATIM_HEADERS   = YES
+VERBATIM_HEADERS   = NO

 #---
 # configuration options related to the alphabetical class index
@@ -701,7 +701,7 @@
 # of all compounds will be generated. Enable this if the project
 # contains a lot of classes, structs, unions or interfaces.

-ALPHABETICAL_INDEX = NO
+ALPHABETICAL_INDEX = YES

 # If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then
 # the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns
@@ -867,7 +867,7 @@
 # releases of Doxygen, the values YES and NO are equivalent to FRAME and NONE
 # respectively.

-GENERATE_TREEVIEW  = NONE
+GENERATE_TREEVIEW  = FRAME

 # If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
 # used to set the initial width (in pixels) of the frame in which the tree
@@ -1117,7 +1117,7 @@
 # evaluate all C-preprocessor directives found in the sources and include
 # files.

-ENABLE_PREPROCESSING   = YES
+ENABLE_PREPROCESSING   = NO

 # If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro
 # names in the source code. If set to NO (the default) only conditional
@@ -1135,7 +1135,7 @@
 # If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
 # in the INCLUDE_PATH (see below) will be search if a #include is found.

-SEARCH_INCLUDES= YES
+SEARCH_INCLUDES= NO

 # The INCLUDE_PATH tag can be used to specify one or more directories that
 # contain include files that are not input files but should be processed by
@@ -1321,7 +1321,7 @@
 # the time of a run. So in most cases it will be better to enable call graphs
 # for selected functions only using the \callgraph command.

-CALL_GRAPH = NO
+CALL_GRAPH = YES

 # If the CALLER_GRAPH and HAVE_DOT tags are set to YES then
 # doxygen will generate a caller dependency graph for every global function
@@ -1329,7 +1329,7 @@
 # the time of a run. So in most cases it will be better to enable caller
 # graphs for selected functions only using the \callergraph command.

-CALLER_GRAPH   = NO
+CALLER_GRAPH   = YES

 # If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen
 # will graphical hierarchy of all classes instead of a textual one.

Modified: php/phpruntests/trunk/build.xml
===
--- php/phpruntests/trunk/build.xml	2009-07-20 14:38:48 UTC (rev 284439)
+++ php/phpruntests/trunk/build.xml	2009-07-20 14:48:02 UTC (rev 284440)
@@ -1,23 +1,35 @@
 ?xml version=1.0?

-project name=runtests default=test basedir=.
+project name=runtests default=qa basedir=.

-  property name=build.dir value=_build /
+  target name=clean
+delete dir=_compare /
+delete dir=_coverage /
+delete dir=_docs /
+

[PHP-CVS] svn: SVNROOT/ global_avail

2009-07-20 Thread Gwynne Raskind 
gwynne  Mon, 20 Jul 2009 14:51:04 +

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

Changed paths:
U   SVNROOT/global_avail

Log:
allow the PEAR group to play with pear_avail

Modified: SVNROOT/global_avail
===
--- SVNROOT/global_avail2009-07-20 14:48:02 UTC (rev 284440)
+++ SVNROOT/global_avail2009-07-20 14:51:04 UTC (rev 284441)
@@ -17,6 +17,10 @@

 
avail|sterling,goba,imajes,wez,iliaa,derick,jon,cox,alan_k,jmcastagnetto,mj,pajoye,helly,philip,stas,johannes,gwynne,lsmith|SVNROOT

+# Some PEAR people get access to the pear-specific avail file in SVNROOT.
+
+avail|davidc,jeichorn,cweiske,dufuz,ashnazg,jstump,tswicegood,saltybeagle,cellog|SVNROOT/pear_avail
+
 # The PHP Developers have full access to the full source trees for
 # PHP, as well as the documentation.


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

Re: [PHP-CVS] svn: php/phpruntests/trunk/ Doxyfile build.xml

2009-07-20 Thread Pierre Joye 
hi,

When do you plan to move the doc to either our doc system or using
phpdocumentor?

Cheers,
--
Pierre

On Mon, Jul 20, 2009 at 4:48 PM, Stefan Priebschsprieb...@php.net wrote:
 spriebsch               Mon, 20 Jul 2009 14:48:02 +

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

 Changed paths:
        U   php/phpruntests/trunk/Doxyfile
        U   php/phpruntests/trunk/build.xml

 Log:
 Improved build automation.

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




-- 
Pierre

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

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

[PHP-CVS] svn: php/phpruntests/trunk/src/testcase/ rtTestResults.php

2009-07-20 Thread Georg Gradwohl 
g2  Mon, 20 Jul 2009 15:00:54 +

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

Changed paths:
U   php/phpruntests/trunk/src/testcase/rtTestResults.php

Log:
minor bugfix - ensure to request skip-section only if it exists

Modified: php/phpruntests/trunk/src/testcase/rtTestResults.php
===
--- php/phpruntests/trunk/src/testcase/rtTestResults.php2009-07-20 
14:51:04 UTC (rev 284441)
+++ php/phpruntests/trunk/src/testcase/rtTestResults.php2009-07-20 
15:00:54 UTC (rev 284442)
@@ -134,7 +134,7 @@
 {
 if ($runConfiguration-hasCommandLineOption('keep-all') || 
$runConfiguration-hasCommandLineOption('keep-skip')) {
 $this-savedFileNames['skipif'] = $this-testName. 'skipif.php';
-} else {
+} else if($testCase-hasSection('SKIPIF')) {
 $skipSection = $testCase-getSection('SKIPIF');
 $skipSection-deleteFile();
 }

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

[PHP-CVS] svn: SVNROOT/ pre-commit

2009-07-20 Thread Gwynne Raskind 
gwynne  Mon, 20 Jul 2009 15:05:54 +

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

Changed paths:
U   SVNROOT/pre-commit

Log:
enable per-file avail checks

Modified: SVNROOT/pre-commit
===
--- SVNROOT/pre-commit  2009-07-20 15:00:54 UTC (rev 284442)
+++ SVNROOT/pre-commit  2009-07-20 15:05:54 UTC (rev 284443)
@@ -48,8 +48,8 @@

 function pattern_matches_commit($pattern)
 {
-foreach ($GLOBALS['dirs_changed'] as $dir_changed) {
-if (!preg_match($pattern, $dir_changed)) {
+foreach ($GLOBALS['paths_changed'] as $path_changed) {
+if (!preg_match($pattern, $path_changed)) {
 return FALSE;
 }
 }
@@ -71,17 +71,15 @@
 // 
-
 // Build list of changes
 if ($is_DEBUG) {
-$data = explode(\n::\n, trim(stream_get_contents(STDIN)));
-$paths_changed = explode(\n, $data[0]);
-$dirs_changed = explode(\n, $data[1]);
+$paths_changed = explode(\n, trim(stream_get_contents(STDIN)));
 $log_message = array('test1', 'test2');
 $author = $argv[3];
 } else {
 $paths_changed = run_svnlook('changed');
-$dirs_changed = run_svnlook('dirs-changed');
 $log_message = run_svnlook('log');
 $author = trim(implode(\n, run_svnlook('author')));
 }
+array_walk($paths_changed, create_function('$v, $k', '$v = trim($v); $v = 
ltrim(substr($v, strcspn($v,  \t)));'));

 // 
-
 // Log message empty?
@@ -112,7 +110,7 @@
 // 
-
 // Check commit against it
 $exit_val = 0;
-foreach ($dirs_changed as $dir_changed) {
+foreach ($paths_changed as $path_changed) {
 foreach ($avail_lines as $avail_line) {
 if (strncmp($avail_line, 'unavail', 7) == 0) {
 $bit = 0;
@@ -138,7 +136,7 @@
 $in_repo = count($modulelist) == 0;
 if (!$in_repo) {
 foreach ($modulelist as $module) {
-if (fnmatch({$module}*, $dir_changed)) {
+if (fnmatch({$module}*, $path_changed)) {
 $in_repo = TRUE;
 }
 }
@@ -153,7 +151,7 @@
 print DEBUG: User {$author}  . ($user_in_list ? matched : 
did not match) .  user list:  . implode(,, $userlist) . \n;
 }
 if ($in_repo) {
-print DEBUG: Directory {$dir_changed}  . ($in_repo ? 
matched : did not match) .  repo list:  . implode(,, $modulelist) . 
\n;
+print DEBUG: Path {$path_changed}  . ($in_repo ? matched : 
did not match) .  repo list:  . implode(,, $modulelist) . \n;
 }
 if ($user_in_list || $in_repo) {
 print DEBUG: exit_val == {$exit_val} for  . 
var_export($user_in_list, 1) . / . var_export($in_repo, 1) . .\n;
@@ -161,22 +159,22 @@
 }
 }
 if ($exit_val) {   // if one dir fails, all fail
-$last_dir = $dir_changed;
+$last_path = $path_changed;
 break;
 }
 }

 if ($exit_val) {
-if (preg_match('/^pear/', $last_dir)) {
+if (preg_match('/^pear/', $last_path)) {
 $access_contact_email = 'pear-gr...@php.net';
-} else if (preg_match('/^pecl/', $last_dir)) {
+} else if (preg_match('/^pecl/', $last_path)) {
 $access_contact_email = 'pecl-gr...@php.net';
-} else if (preg_match('/^phpdoc/', $last_dir)) {
+} else if (preg_match('/^phpdoc/', $last_path)) {
 $access_contact_email = 'php...@lists.php.net';
 } else {
 $access_contact_email = 'gr...@php.net';
 }
-fail(***\nAccess denied: Insufficient karma for {$author} to 
{$last_dir}.\nContact {$access_contact_email} for access.\n);
+fail(***\nAccess denied: Insufficient karma for {$author} to 
{$last_path}.\nContact {$access_contact_email} for access.\n);

 }


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

[PHP-CVS] svn: SVNROOT/ pear_avail

2009-07-20 Thread Brett Bieber 
saltybeagle Mon, 20 Jul 2009 15:06:47 +

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

Changed paths:
U   SVNROOT/pear_avail

Log:
Grant tacker permissions for pear/packages/File_Bittorrent

Modified: SVNROOT/pear_avail
===
--- SVNROOT/pear_avail  2009-07-20 15:05:54 UTC (rev 284443)
+++ SVNROOT/pear_avail  2009-07-20 15:06:47 UTC (rev 28)
@@ -179,5 +179,6 @@
 avail|felipernb|pear/packages/Bugtracker
 
avail|rodrigosprimo|pear/packages/Text_Wiki,pear/packages/Text_Wiki_Tiki,pear/packages/Text_Wiki_Mediawiki
 avail|hschletz/pear/packages/MDB2
+avail|tacker/pear/packages/File_Bittorrent,/pear/packages/File_Bittorrent2

 # vim:set ft=conf sw=2 ts=2 et:

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

[PHP-CVS] svn: SVNROOT/ pear_avail

2009-07-20 Thread Gwynne Raskind 
gwynne  Mon, 20 Jul 2009 15:08:19 +

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

Changed paths:
U   SVNROOT/pear_avail

Log:
watch your avail syntax, people

Modified: SVNROOT/pear_avail
===
--- SVNROOT/pear_avail  2009-07-20 15:06:47 UTC (rev 28)
+++ SVNROOT/pear_avail  2009-07-20 15:08:19 UTC (rev 284445)
@@ -178,7 +178,7 @@
 avail|shupp|pear/packages/Crypt_DiffieHellman,pear/packages/Services_Yadis
 avail|felipernb|pear/packages/Bugtracker
 
avail|rodrigosprimo|pear/packages/Text_Wiki,pear/packages/Text_Wiki_Tiki,pear/packages/Text_Wiki_Mediawiki
-avail|hschletz/pear/packages/MDB2
-avail|tacker/pear/packages/File_Bittorrent,/pear/packages/File_Bittorrent2
+avail|hschletz|pear/packages/MDB2
+avail|tacker|pear/packages/File_Bittorrent,/pear/packages/File_Bittorrent2

 # vim:set ft=conf sw=2 ts=2 et:

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

[PHP-CVS] Re: [SVN-MIGRATION] svn: SVNROOT/ pear_avail

2009-07-20 Thread Derick Rethans 
On Mon, 20 Jul 2009, Brett Bieber wrote:

 saltybeagle   Mon, 20 Jul 2009 15:06:47 +
 
 Revision: http://svn.php.net/viewvc?view=revisionrevision=28
 
 Changed paths:
   U   SVNROOT/pear_avail
 
 Log:
 Grant tacker permissions for pear/packages/File_Bittorrent
 
 Modified: SVNROOT/pear_avail
 ===
 --- SVNROOT/pear_avail2009-07-20 15:05:54 UTC (rev 284443)
 +++ SVNROOT/pear_avail2009-07-20 15:06:47 UTC (rev 28)
 @@ -179,5 +179,6 @@
  avail|felipernb|pear/packages/Bugtracker
  
 avail|rodrigosprimo|pear/packages/Text_Wiki,pear/packages/Text_Wiki_Tiki,pear/packages/Text_Wiki_Mediawiki
  avail|hschletz/pear/packages/MDB2
 +avail|tacker/pear/packages/File_Bittorrent,/pear/packages/File_Bittorrent2

Those last two lines seem wrong... there is only one | (and not behind 
the username)

regards,
Derick

-- 
http://derickrethans.nl | http://ezcomponents.org | http://xdebug.org
twitter: @derickr

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

[PHP-CVS] svn: SVNROOT/ pear_avail

2009-07-20 Thread Brett Bieber 
saltybeagle Mon, 20 Jul 2009 15:12:46 +

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

Changed paths:
U   SVNROOT/pear_avail

Log:
another error, thanks gwynne, derick

Modified: SVNROOT/pear_avail
===
--- SVNROOT/pear_avail  2009-07-20 15:08:19 UTC (rev 284445)
+++ SVNROOT/pear_avail  2009-07-20 15:12:46 UTC (rev 284446)
@@ -179,6 +179,6 @@
 avail|felipernb|pear/packages/Bugtracker
 
avail|rodrigosprimo|pear/packages/Text_Wiki,pear/packages/Text_Wiki_Tiki,pear/packages/Text_Wiki_Mediawiki
 avail|hschletz|pear/packages/MDB2
-avail|tacker|pear/packages/File_Bittorrent,/pear/packages/File_Bittorrent2
+avail|tacker|pear/packages/File_Bittorrent,pear/packages/File_Bittorrent2

 # vim:set ft=conf sw=2 ts=2 et:

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

[PHP-CVS] Re: [SVN-MIGRATION] svn: SVNROOT/ pear_avail

2009-07-20 Thread Gwynne Raskind 

On Jul 20, 2009, at 11:10 AM, Derick Rethans wrote:

saltybeagle Mon, 20 Jul 2009 15:06:47 +

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

Changed paths:
U   SVNROOT/pear_avail

Log:
Grant tacker permissions for pear/packages/File_Bittorrent

Modified: SVNROOT/pear_avail
===
--- SVNROOT/pear_avail  2009-07-20 15:05:54 UTC (rev 284443)
+++ SVNROOT/pear_avail  2009-07-20 15:06:47 UTC (rev 28)
@@ -179,5 +179,6 @@
avail|felipernb|pear/packages/Bugtracker
avail|rodrigosprimo|pear/packages/Text_Wiki,pear/packages/ 
Text_Wiki_Tiki,pear/packages/Text_Wiki_Mediawiki

avail|hschletz/pear/packages/MDB2
+avail|tacker/pear/packages/File_Bittorrent,/pear/packages/ 
File_Bittorrent2

Those last two lines seem wrong... there is only one | (and not behind
the username)



Already caught and fixed.

-- Gwynne


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

[PHP-CVS] svn: SVNROOT/ commit-email.php

2009-07-20 Thread Gwynne Raskind 
gwynne  Mon, 20 Jul 2009 15:15:03 +

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

Changed paths:
U   SVNROOT/commit-email.php

Log:
move log above changed paths, per Derick's request

Modified: SVNROOT/commit-email.php
===
--- SVNROOT/commit-email.php2009-07-20 15:12:46 UTC (rev 284446)
+++ SVNROOT/commit-email.php2009-07-20 15:15:03 UTC (rev 284447)
@@ -190,11 +190,11 @@
 \r\n .
 Revision: 
http://svn.php.net/viewvc?view=revisionrevision={$REV}\r\n; .
 \r\n .
+Log:\r\n .
+{$commit_info['log_message']}\r\n .
+\r\n .
 Changed paths:\r\n .
 \t . implode(\r\n\t, $commit_info['changed_paths']) . \r\n .
-\r\n .
-Log:\r\n .
-{$commit_info['log_message']}\r\n .
 {$bugs_body}\r\n .
 str_replace(\n, \r\n, $diffs_string);


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

[PHP-CVS] svn: SVNROOT/ commit-bugs.php

2009-07-20 Thread Gwynne Raskind 
gwynne  Mon, 20 Jul 2009 16:00:09 +

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

Log:
Most of that debug stuff is unneeded. Just switch to only getbug instead of 
ncomment for debug.

Changed paths:
U   SVNROOT/commit-bugs.php

Modified: SVNROOT/commit-bugs.php
===
--- SVNROOT/commit-bugs.php 2009-07-20 15:57:11 UTC (rev 284450)
+++ SVNROOT/commit-bugs.php 2009-07-20 16:00:09 UTC (rev 284451)
@@ -39,9 +39,7 @@

 // 
-
 // Make an RPC call for each bug
-if (!$is_DEBUG) {
-include __DIR__ . '/secret.inc';
-}
+include __DIR__ . '/secret.inc';
 foreach ($bug_list as $bug) {
 // Only do this for core PHP bugs
 if ($bug['project'] !== '') {
@@ -56,21 +54,15 @@
 'user' = $commit_info['author'],
 'id' = $bug['number'],
 'ncomment' = $comment,
-'MAGIC_COOKIE' = $is_DEBUG ? 'nonsense' : 
$SVN_MAGIC_COOKIE,
+'MAGIC_COOKIE' = $SVN_MAGIC_COOKIE,
 );
+if ($is_DEBUG) {
+unset($postdata['ncomment']);
+$postdata['getbug'] = 1;
+}
 array_walk($postdata, create_function('$v, $k', '$v = rawurlencode($k) . 
= . rawurlencode($v);'));
 $postdata = implode('', $postdata);

-if ($is_DEBUG) {
-print DEBUG: Bug #{$bug['number']}: Would have posted this 
rawurlencoded string to {$bug_rpc_url}:\n{$postdata}\n;
-if (mt_rand(0, 1) === 1) {
-$bug['error'] = 'DEBUG-some kind of error';
-} else {
-$bug['status'] = 'DEBUG-unknown';
-$bug['short_desc'] = DEBUG-Bug #{$bug['number']};
-}
-continue;
-}
 // Hook an env var so emails can be resent without messing with bugs
 if (getenv('NOBUG')) {
 continue;

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

Re: [PHP-CVS] svn: / SVNROOT/commit-email.php web/php-bugs/trunk/bug.php web/php-bugs/trunk/rpc.php

2009-07-20 Thread Rasmus Lerdorf 
Jani Taskinen wrote:
 This is all nice and that crap, but since you didn't merge it into
 pear/packages/Bugtracker, it will all be lost once that stuff is taken
 into action..so please merge this there too. :D

It will be merged long before Bugtracker is ready.

-Rasmus

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

Re: [PHP-CVS] svn: SVNROOT/ global_avail

2009-07-20 Thread Nuno Lopes 

Thank you!
Nuno

- Original Message -

gwynne Sun, 19 Jul 2009 23:59:45 +

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

Changed paths:
U   SVNROOT/global_avail

Log:
fix Nuno's username

Modified: SVNROOT/global_avail
===
--- SVNROOT/global_avail 2009-07-19 23:58:43 UTC (rev 284401)
+++ SVNROOT/global_avail 2009-07-19 23:59:45 UTC (rev 284402)
@@ -348,7 +348,7 @@
avail|pajoye,guilhermeblanco,auroraeosrose,rrichards,kalle|web/php-windows

# php-benchmarks karma
-avail|nlopes,pbiggar,olafurw,hjalle|php/php-benchmarks
+avail|nlopess,pbiggar,olafurw,hjalle|php/php-benchmarks

# phpruntests karma
avail|zoe,spriebsch,g2|php/phpruntests 



--
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 branches/PHP_5_3/ext/standard/proc_open.c branches/PHP_5_3/ext/standard/proc_open.h branches/PHP_5_3/ext/standard/tests/general_functions/proc_ope

2009-07-20 Thread Nuno Lopes 
This is not a new feature. As the commit log says, this is about 
implementing an existing feature that was only implemented on windows.
Anyway, since when we require long discussions and voting to implement 
little details like this?..


Nuno


Excuse me but where/when was it agreed that this new feature can go into 
PHP_5_3? I thought it was supposed to go HEAD only..


--Jani



On 07/19/2009 05:52 PM, Nuno Lopes wrote:

nlopess Sun, 19 Jul 2009 14:52:27 +

URL: http://svn.php.net/viewvc?view=revisionrevision=284353

Changed paths:
U   php/php-src/branches/PHP_5_3/NEWS
U   php/php-src/branches/PHP_5_3/ext/standard/proc_open.c
U   php/php-src/branches/PHP_5_3/ext/standard/proc_open.h
A 
php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/proc_open03.phpt
A 
php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/proc_open04.phpt
A 
php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/proc_open05.phpt
A 
php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/proc_open06.phpt
A 
php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/proc_open07.phpt
A 
php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/proc_open08.phpt

U   php/php-src/trunk/ext/standard/proc_open.c
U   php/php-src/trunk/ext/standard/proc_open.h
A 
php/php-src/trunk/ext/standard/tests/general_functions/proc_open03.phpt
A 
php/php-src/trunk/ext/standard/tests/general_functions/proc_open04.phpt
A 
php/php-src/trunk/ext/standard/tests/general_functions/proc_open05.phpt
A 
php/php-src/trunk/ext/standard/tests/general_functions/proc_open06.phpt
A 
php/php-src/trunk/ext/standard/tests/general_functions/proc_open07.phpt
A 
php/php-src/trunk/ext/standard/tests/general_functions/proc_open08.phpt


Log:
Add support for proc_open()'s bypass_shell feature for Unix systems
(slightly modified patch from Gwynne) 



--
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 branches/PHP_5_3/ext/standard/proc_open.c branches/PHP_5_3/ext/standard/proc_open.h branches/PHP_5_3/ext/standard/tests/general_functions/proc_ope

2009-07-20 Thread Nuno Lopes 

On Mon, Jul 20, 2009 at 12:19 PM, Jani Taskinenj...@php.net wrote:

Excuse me but where/when was it agreed that this new feature can go into
PHP_5_3? I thought it was supposed to go HEAD only..


It should not go in 5.3, Nuno please revert.


Why not? Should we wait 2 years to implement these kind of little things? Or 
even to implement new things?
Especially in a web-oriented language like PHP, you cannot afford to release 
new stuff only once in 2 years.


Nuno 



--
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 branches/PHP_5_3/ext/standard/proc_open.c branches/PHP_5_3/ext/standard/proc_open.h branches/PHP_5_3/ext/standard/tests/general_functions/proc_o

2009-07-20 Thread Pierre Joye 
On Mon, Jul 20, 2009 at 9:36 PM, Nuno Lopesnlop...@php.net wrote:
 On Mon, Jul 20, 2009 at 12:19 PM, Jani Taskinenj...@php.net wrote:

 Excuse me but where/when was it agreed that this new feature can go into
 PHP_5_3? I thought it was supposed to go HEAD only..

 It should not go in 5.3, Nuno please revert.

 Why not?

It was asked to commit only bug fixes in 5.3.0.

Cheers,
--
Pierre

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

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

Re: [PHP-CVS] svn: php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/standard/proc_open.c branches/PHP_5_3/ext/standard/proc_open.h branches/PHP_5_3/ext/standard/tests/general_functions/proc_o

2009-07-20 Thread Pierre Joye 
On Mon, Jul 20, 2009 at 9:41 PM, Pierre Joyepierre@gmail.com wrote:
 On Mon, Jul 20, 2009 at 9:36 PM, Nuno Lopesnlop...@php.net wrote:
 On Mon, Jul 20, 2009 at 12:19 PM, Jani Taskinenj...@php.net wrote:

 Excuse me but where/when was it agreed that this new feature can go into
 PHP_5_3? I thought it was supposed to go HEAD only..

 It should not go in 5.3, Nuno please revert.

 Why not?

 It was asked to commit only bug fixes in 5.3.0.

to PHP_5_3 :)



-- 
Pierre

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

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

Re: [PHP-CVS] svn: php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/standard/proc_open.c branches/PHP_5_3/ext/standard/proc_open.h branches/PHP_5_3/ext/standard/tests/general_functions/proc_o

2009-07-20 Thread Nuno Lopes 
Excuse me but where/when was it agreed that this new feature can go 
into

PHP_5_3? I thought it was supposed to go HEAD only..

It should not go in 5.3, Nuno please revert.



And for the record, this was supposed to be my patch and I had full  karma 
to commit it. I never asked Nuno to do so, all I wanted was peer  review.


Next time please make it clear that you don't need someone else to commit 
the patch for you. I explicitly asked you that in the e-mail that I sent 
with my review, and you didn't say a word about that. So I assumed that you 
needed me to commit the patch, as usually people only send patches when they 
don't have enough karma.
Anyway, I also don't understand why you sent the patch for PHP 5.3, when the 
title of the e-mail said patch for HEAD and you promptly reverted the 
patch from that branch.


Nuno

P.S.: do you want me to revert the patch I commited to trunk so that you can 
commit it yourself (after possibly collecting more feedback from others)? 



--
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 branches/PHP_5_3/ext/standard/proc_open.c branches/PHP_5_3/ext/standard/proc_open.h branches/PHP_5_3/ext/standard/tests/general_functions/proc_ope

2009-07-20 Thread Lukas Kahwe Smith 


On 20.07.2009, at 21:36, Nuno Lopes wrote:


On Mon, Jul 20, 2009 at 12:19 PM, Jani Taskinenj...@php.net wrote:
Excuse me but where/when was it agreed that this new feature can  
go into

PHP_5_3? I thought it was supposed to go HEAD only..


It should not go in 5.3, Nuno please revert.


Why not? Should we wait 2 years to implement these kind of little  
things? Or even to implement new things?
Especially in a web-oriented language like PHP, you cannot afford to  
release new stuff only once in 2 years.



Nuno,

It was decided that 5.3.1 would be reserved for bug fixes only for  
now. Then again when this was put into place we feared we might need a  
quick 5.3.1 to fix big issues in 5.3.0. It doesnt seem like this is  
the case and so 5.3.1 has not been scheduled yet nor is there a  
pressing need to do so. Anyways, since I am no longer RM .. its not my  
call to make.


regards,
Lukas Kahwe Smith
m...@pooteeweet.org




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

2009-07-20 Thread Felipe Pena 
felipe  Mon, 20 Jul 2009 22:20:36 +

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

Log:
- Sync proto with 5.3

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

Modified: php/php-src/trunk/ext/spl/spl_directory.c
===
--- php/php-src/trunk/ext/spl/spl_directory.c   2009-07-20 19:58:43 UTC (rev 
284457)
+++ php/php-src/trunk/ext/spl/spl_directory.c   2009-07-20 22:20:36 UTC (rev 
284458)
@@ -2375,7 +2375,7 @@
 }
 /* }}} */

-/* {{{ proto array SplFileObject::fgetcsv([string delimiter [, string 
enclosure]]) U
+/* {{{ proto array SplFileObject::fgetcsv([string delimiter [, string 
enclosure [, escape = '\\']]]) U
Return current line as csv */
 SPL_METHOD(SplFileObject, fgetcsv)
 {

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