[PHP-CVS] svn: /SVNROOT/ commit-email.php
gwynne Sat, 12 Jan 2013 17:05:31 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=329106
Log:
Gwynne doesn't need to get every commit email anymore.
Changed paths:
U SVNROOT/commit-email.php
Modified: SVNROOT/commit-email.php
===
--- SVNROOT/commit-email.php2013-01-12 14:29:26 UTC (rev 329105)
+++ SVNROOT/commit-email.php2013-01-12 17:05:31 UTC (rev 329106)
@@ -109,7 +109,7 @@
'|^SVNROOT|' = array('php-cvs@lists.php.net'),
);
$fallback_addresses = array('php-cvs@lists.php.net');
-$always_addresses = array('gwy...@php.net', 'ping+twvhw...@cia.vc');
+$always_addresses = array('ping+twvhw...@cia.vc');
//
-
// Build list of e-mail addresses and parent changed path
--
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/json/json.c branches/PHP_5_4/ext/json/php_json.h branches/PHP_5_4/ext/json/utf8_to_utf16.c branches/PHP_5_4/ext/json/utf8_to_utf16.h trunk/ext/json/js
gwynne Mon, 29 Aug 2011 14:56:19 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=315707
Log:
Add unescaped Unicode encoding to json_encode(). Closes bug #53946. Patch by
Irker and Gwynne.
Bug: https://bugs.php.net/53946 (Assigned) add json_encode option for not
escaping unnecessary character
Changed paths:
U php/php-src/branches/PHP_5_4/ext/json/json.c
U php/php-src/branches/PHP_5_4/ext/json/php_json.h
U php/php-src/branches/PHP_5_4/ext/json/utf8_to_utf16.c
U php/php-src/branches/PHP_5_4/ext/json/utf8_to_utf16.h
U php/php-src/trunk/ext/json/json.c
U php/php-src/trunk/ext/json/php_json.h
A php/php-src/trunk/ext/json/tests/bug53946.phpt
U php/php-src/trunk/ext/json/utf8_to_utf16.c
U php/php-src/trunk/ext/json/utf8_to_utf16.h
Modified: php/php-src/branches/PHP_5_4/ext/json/json.c
===
--- php/php-src/branches/PHP_5_4/ext/json/json.c 2011-08-29 14:32:46 UTC (rev 315706)
+++ php/php-src/branches/PHP_5_4/ext/json/json.c 2011-08-29 14:56:19 UTC (rev 315707)
@@ -95,6 +95,7 @@
REGISTER_LONG_CONSTANT(JSON_NUMERIC_CHECK, PHP_JSON_NUMERIC_CHECK, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(JSON_UNESCAPED_SLASHES, PHP_JSON_UNESCAPED_SLASHES, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(JSON_PRETTY_PRINT, PHP_JSON_PRETTY_PRINT, CONST_CS | CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT(JSON_UNESCAPED_UNICODE, PHP_JSON_UNESCAPED_UNICODE, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(JSON_ERROR_NONE, PHP_JSON_ERROR_NONE, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(JSON_ERROR_DEPTH, PHP_JSON_ERROR_DEPTH, CONST_CS | CONST_PERSISTENT);
@@ -346,7 +347,7 @@
static void json_escape_string(smart_str *buf, char *s, int len, int options TSRMLS_DC) /* {{{ */
{
- int pos = 0;
+ int pos = 0, ulen = 0;
unsigned short us;
unsigned short *utf16;
@@ -378,15 +379,14 @@
}
}
-
- utf16 = (unsigned short *) safe_emalloc(len, sizeof(unsigned short), 0);
-
- len = utf8_to_utf16(utf16, s, len);
- if (len = 0) {
+
+ utf16 = (options PHP_JSON_UNESCAPED_UNICODE) ? NULL : (unsigned short *) safe_emalloc(len, sizeof(unsigned short), 0);
+ ulen = utf8_to_utf16(utf16, s, len);
+ if (ulen = 0) {
if (utf16) {
efree(utf16);
}
- if (len 0) {
+ if (ulen 0) {
JSON_G(error_code) = PHP_JSON_ERROR_UTF8;
if (!PG(display_errors)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Invalid UTF-8 sequence in argument);
@@ -397,12 +397,15 @@
}
return;
}
+ if (!(options PHP_JSON_UNESCAPED_UNICODE)) {
+ len = ulen;
+ }
smart_str_appendc(buf, '');
while (pos len)
{
- us = utf16[pos++];
+ us = (options PHP_JSON_UNESCAPED_UNICODE) ? s[pos++] : utf16[pos++];
switch (us)
{
@@ -479,7 +482,7 @@
break;
default:
-if (us = ' ' (us 127) == us) {
+if (us = ' ' ((options PHP_JSON_UNESCAPED_UNICODE) || (us 127) == us)) {
smart_str_appendc(buf, (unsigned char) us);
} else {
smart_str_appendl(buf, \\u, 2);
@@ -498,7 +501,9 @@
}
smart_str_appendc(buf, '');
- efree(utf16);
+ if (utf16) {
+ efree(utf16);
+ }
}
/* }}} */
Modified: php/php-src/branches/PHP_5_4/ext/json/php_json.h
===
--- php/php-src/branches/PHP_5_4/ext/json/php_json.h 2011-08-29 14:32:46 UTC (rev 315706)
+++ php/php-src/branches/PHP_5_4/ext/json/php_json.h 2011-08-29 14:56:19 UTC (rev 315707)
@@ -62,6 +62,7 @@
#define PHP_JSON_NUMERIC_CHECK (15)
#define PHP_JSON_UNESCAPED_SLASHES (16)
#define PHP_JSON_PRETTY_PRINT (17)
+#define PHP_JSON_UNESCAPED_UNICODE (18)
/* Internal flags */
#define PHP_JSON_OUTPUT_ARRAY 0
Modified: php/php-src/branches/PHP_5_4/ext/json/utf8_to_utf16.c
===
--- php/php-src/branches/PHP_5_4/ext/json/utf8_to_utf16.c 2011-08-29 14:32:46 UTC (rev 315706)
+++ php/php-src/branches/PHP_5_4/ext/json/utf8_to_utf16.c 2011-08-29 14:56:19 UTC (rev 315707)
@@ -30,7 +30,7 @@
#include utf8_decode.h
int
-utf8_to_utf16(unsigned short w[], char p[], int length)
+utf8_to_utf16(unsigned short *w, char p[], int length)
{
int c;
int the_index = 0;
@@ -43,14 +43,17 @@
return (c == UTF8_END) ? the_index : UTF8_ERROR;
}
if (c 0x1) {
-w[the_index] = (unsigned short)c;
+if (w) {
+w[the_index] = (unsigned short)c;
+}
the_index += 1;
} else {
c -= 0x1;
-w[the_index] = (unsigned short)(0xD800 | (c 10));
-the_index += 1;
-w[the_index] = (unsigned short)(0xDC00 | (c 0x3FF));
-the_index += 1;
+if (w) {
+w[the_index] = (unsigned short)(0xD800 | (c 10));
+w[the_index + 1] = (unsigned short)(0xDC00 | (c 0x3FF));
+}
+
[PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ext/json/tests/ bug53946.phpt
gwynne Mon, 29 Aug 2011 14:57:53 + Revision: http://svn.php.net/viewvc?view=revisionrevision=315708 Log: Add test for #53946 to 5.4 (missed it when committing revision 315707) Bug: https://bugs.php.net/53946 (Assigned) add json_encode option for not escaping unnecessary character Changed paths: A php/php-src/branches/PHP_5_4/ext/json/tests/bug53946.phpt Added: php/php-src/branches/PHP_5_4/ext/json/tests/bug53946.phpt === --- php/php-src/branches/PHP_5_4/ext/json/tests/bug53946.phpt (rev 0) +++ php/php-src/branches/PHP_5_4/ext/json/tests/bug53946.phpt 2011-08-29 14:57:53 UTC (rev 315708) @@ -0,0 +1,16 @@ +--TEST-- +bug #53946 (json_encode() with JSON_UNESCAPED_UNICODE) +--SKIPIF-- +?php if (!extension_loaded(json)) print skip; ? +--FILE-- +?php +var_dump(json_encode(latin 1234 -/russian мама мыла раму specialchars \x02 \x08 \n U+1D11E 턞)); +var_dump(json_encode(latin 1234 -/russian мама мыла раму specialchars \x02 \x08 \n U+1D11E 턞, JSON_UNESCAPED_UNICODE)); +var_dump(json_encode(ab\xE0)); +var_dump(json_encode(ab\xE0, JSON_UNESCAPED_UNICODE)); +? +--EXPECT-- +string(156) latin 1234 -\/russian \u043c\u0430\u043c\u0430 \u043c\u044b\u043b\u0430 \u0440\u0430\u043c\u0443 specialchars \u0002 \b \n U+1D11E \ud834\udd1e +string(100) latin 1234 -\/russian мама мыла раму specialchars \u0002 \b \n U+1D11E 턞 +string(4) null +string(4) 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_4/ NEWS
gwynne Mon, 29 Aug 2011 15:09:08 + Revision: http://svn.php.net/viewvc?view=revisionrevision=315710 Log: Added NEWS note for #53946 Bug: https://bugs.php.net/53946 (Assigned) add json_encode option for not escaping unnecessary character Changed paths: U php/php-src/branches/PHP_5_4/NEWS Modified: php/php-src/branches/PHP_5_4/NEWS === --- php/php-src/branches/PHP_5_4/NEWS 2011-08-29 15:07:57 UTC (rev 315709) +++ php/php-src/branches/PHP_5_4/NEWS 2011-08-29 15:09:08 UTC (rev 315710) @@ -27,6 +27,9 @@ . Added ReflectionClass::newInstanceWithoutConstructor() to create a new instance of a class without invoking its constructor. FR #55490. (Sebastian) +- Improved JSON extension: + . Added new json_encode() option JSON_UNESCAPED_UNICODE. FR #53946. (christian dot pernot at pingroom dot net, Gwynne) + 04 Aug 2011, PHP 5.4.0 Alpha 3 - Added features: . Short array syntax, see UPGRADING guide for full details (rsky0711 at gmail -- 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/ NEWS
gwynne Mon, 29 Aug 2011 16:17:46 + Revision: http://svn.php.net/viewvc?view=revisionrevision=315717 Log: Correct NEWS entry attribution. Apologies to all for the confusion. Changed paths: U php/php-src/branches/PHP_5_4/NEWS Modified: php/php-src/branches/PHP_5_4/NEWS === --- php/php-src/branches/PHP_5_4/NEWS 2011-08-29 16:17:40 UTC (rev 315716) +++ php/php-src/branches/PHP_5_4/NEWS 2011-08-29 16:17:46 UTC (rev 315717) @@ -28,7 +28,7 @@ instance of a class without invoking its constructor. FR #55490. (Sebastian) - Improved JSON extension: - . Added new json_encode() option JSON_UNESCAPED_UNICODE. FR #53946. (christian dot pernot at pingroom dot net, Gwynne) + . Added new json_encode() option JSON_UNESCAPED_UNICODE. FR #53946. (Irker, Gwynne) 04 Aug 2011, PHP 5.4.0 Alpha 3 - Added features: -- 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/intl/resourcebundle/ resourcebundle_class.h
gwynne Sun, 07 Aug 2011 15:07:53 + Revision: http://svn.php.net/viewvc?view=revisionrevision=314431 Log: Add missing php.h include Changed paths: U php/php-src/branches/PHP_5_4/ext/intl/resourcebundle/resourcebundle_class.h Modified: php/php-src/branches/PHP_5_4/ext/intl/resourcebundle/resourcebundle_class.h === --- php/php-src/branches/PHP_5_4/ext/intl/resourcebundle/resourcebundle_class.h 2011-08-07 14:45:45 UTC (rev 314430) +++ php/php-src/branches/PHP_5_4/ext/intl/resourcebundle/resourcebundle_class.h 2011-08-07 15:07:53 UTC (rev 314431) @@ -20,6 +20,7 @@ #include unicode/ures.h #include zend.h +#include php.h #include intl_error.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_4/ext/intl/grapheme/ grapheme_string.c
gwynne Sun, 07 Aug 2011 15:09:42 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=314432
Log:
fix for bug #55019
Bug: https://bugs.php.net/55019 (Assigned) undefined symbol:
grapheme_extract_count_iter in Unknown on line 0
Changed paths:
U php/php-src/branches/PHP_5_4/ext/intl/grapheme/grapheme_string.c
Modified: php/php-src/branches/PHP_5_4/ext/intl/grapheme/grapheme_string.c
===
--- php/php-src/branches/PHP_5_4/ext/intl/grapheme/grapheme_string.c
2011-08-07 15:07:53 UTC (rev 314431)
+++ php/php-src/branches/PHP_5_4/ext/intl/grapheme/grapheme_string.c
2011-08-07 15:09:42 UTC (rev 314432)
@@ -677,7 +677,7 @@
/* }}} */
/* {{{ grapheme_extract_charcount_iter - grapheme iterator for
grapheme_extract MAXCHARS */
-inline int32_t
+static inline int32_t
grapheme_extract_charcount_iter(UBreakIterator *bi, int32_t csize, unsigned
char *pstr, int32_t str_len)
{
int pos = 0, prev_pos = 0;
@@ -714,7 +714,7 @@
/* }}} */
/* {{{ grapheme_extract_bytecount_iter - grapheme iterator for
grapheme_extract MAXBYTES */
-inline int32_t
+static inline int32_t
grapheme_extract_bytecount_iter(UBreakIterator *bi, int32_t bsize, unsigned
char *pstr, int32_t str_len)
{
int pos = 0, prev_pos = 0;
@@ -748,7 +748,7 @@
/* }}} */
/* {{{ grapheme_extract_count_iter - grapheme iterator for grapheme_extract
COUNT */
-inline int32_t
+static inline int32_t
grapheme_extract_count_iter(UBreakIterator *bi, int32_t size, unsigned char
*pstr, int32_t str_len)
{
int pos = 0, next_pos = 0;
--
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/intl/grapheme/ grapheme_util.c grapheme_util.h
gwynne Sun, 07 Aug 2011 15:12:34 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=314433
Log:
Fixes build issues with ext/intl. This appears to be related to bug #55019, but
since the functions in question are used elsewhere, the solution is to
de-inline rather than to make them static inline.
Bug: https://bugs.php.net/55019 (Assigned) undefined symbol:
grapheme_extract_count_iter in Unknown on line 0
Changed paths:
U php/php-src/branches/PHP_5_4/ext/intl/grapheme/grapheme_util.c
U php/php-src/branches/PHP_5_4/ext/intl/grapheme/grapheme_util.h
Modified: php/php-src/branches/PHP_5_4/ext/intl/grapheme/grapheme_util.c
===
--- php/php-src/branches/PHP_5_4/ext/intl/grapheme/grapheme_util.c
2011-08-07 15:09:42 UTC (rev 314432)
+++ php/php-src/branches/PHP_5_4/ext/intl/grapheme/grapheme_util.c
2011-08-07 15:12:34 UTC (rev 314433)
@@ -432,7 +432,7 @@
/* }}} */
/* {{{ grapheme_count_graphemes */
-inline int32_t
+int32_t
grapheme_count_graphemes(UBreakIterator *bi, UChar *string, int32_t string_len)
{
int ret_len = 0;
@@ -456,7 +456,7 @@
/* }}} */
/* {{{ grapheme_memnstr_grapheme: find needle in haystack using grapheme
boundaries */
-inline int32_t
+int32_t
grapheme_memnstr_grapheme(UBreakIterator *bi, UChar *haystack, UChar *needle,
int32_t needle_len, UChar *end)
{
UChar *p = haystack;
Modified: php/php-src/branches/PHP_5_4/ext/intl/grapheme/grapheme_util.h
===
--- php/php-src/branches/PHP_5_4/ext/intl/grapheme/grapheme_util.h
2011-08-07 15:09:42 UTC (rev 314432)
+++ php/php-src/branches/PHP_5_4/ext/intl/grapheme/grapheme_util.h
2011-08-07 15:12:34 UTC (rev 314433)
@@ -36,10 +36,10 @@
int grapheme_split_string(const UChar *text, int32_t text_length, int
boundary_array[], int boundary_array_len TSRMLS_DC );
-inline int32_t
+int32_t
grapheme_count_graphemes(UBreakIterator *bi, UChar *string, int32_t
string_len);
-inline int32_t
+int32_t
grapheme_memnstr_grapheme(UBreakIterator *bi, UChar *haystack, UChar *needle,
int32_t needle_len, UChar *end);
inline void *grapheme_memrchr_grapheme(const void *s, int c, int32_t 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_4/Zend/zend_operators.h trunk/Zend/zend_operators.h
gwynne Sun, 07 Aug 2011 16:31:21 + Revision: http://svn.php.net/viewvc?view=revisionrevision=314439 Log: For 5.4, fix C++-style comments. For trunk, forward-port build fix. Changed paths: U php/php-src/branches/PHP_5_4/Zend/zend_operators.h U php/php-src/trunk/Zend/zend_operators.h Modified: php/php-src/branches/PHP_5_4/Zend/zend_operators.h === --- php/php-src/branches/PHP_5_4/Zend/zend_operators.h 2011-08-07 16:10:34 UTC (rev 314438) +++ php/php-src/branches/PHP_5_4/Zend/zend_operators.h 2011-08-07 16:31:21 UTC (rev 314439) @@ -616,7 +616,7 @@ fildl (%2)\n\t fildl (%1)\n\t #if defined(__clang__) (__clang_major__ 2 || (__clang_major__ == 2 __clang_minor__ 10)) - fsubp %%st(1), %%st\n\t // LLVM bug #9164 + fsubp %%st(1), %%st\n\t /* LLVM bug #9164 */ #else fsubp %%st, %%st(1)\n\t #endif @@ -640,7 +640,7 @@ fildq (%2)\n\t fildq (%1)\n\t #if defined(__clang__) (__clang_major__ 2 || (__clang_major__ == 2 __clang_minor__ 10)) - fsubp %%st(1), %%st\n\t // LLVM bug #9164 + fsubp %%st(1), %%st\n\t /* LLVM bug #9164 */ #else fsubp %%st, %%st(1)\n\t #endif Modified: php/php-src/trunk/Zend/zend_operators.h === --- php/php-src/trunk/Zend/zend_operators.h 2011-08-07 16:10:34 UTC (rev 314438) +++ php/php-src/trunk/Zend/zend_operators.h 2011-08-07 16:31:21 UTC (rev 314439) @@ -615,7 +615,11 @@ 0:\n\t fildl (%2)\n\t fildl (%1)\n\t +#if defined(__clang__) (__clang_major__ 2 || (__clang_major__ == 2 __clang_minor__ 10)) + fsubp %%st(1), %%st\n\t /* LLVM bug #9164 */ +#else fsubp %%st, %%st(1)\n\t +#endif movb $0x2,0xc(%0)\n\t fstpl (%0)\n 1: @@ -635,7 +639,11 @@ 0:\n\t fildq (%2)\n\t fildq (%1)\n\t +#if defined(__clang__) (__clang_major__ 2 || (__clang_major__ == 2 __clang_minor__ 10)) + fsubp %%st(1), %%st\n\t /* LLVM bug #9164 */ +#else fsubp %%st, %%st(1)\n\t +#endif movb $0x2,0x14(%0)\n\t fstpl (%0)\n 1: -- 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/intl/grapheme/grapheme_string.c branches/PHP_5_3/ext/intl/grapheme/grapheme_util.c branches/PHP_5_3/ext/intl/grapheme/grapheme_util.h trunk/ext/intl/g
gwynne Sun, 07 Aug 2011 17:14:14 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=314440
Log:
Back- and front-port fixes for #55019
Bug: https://bugs.php.net/55019 (Closed) undefined symbol:
grapheme_extract_count_iter in Unknown on line 0
Changed paths:
U php/php-src/branches/PHP_5_3/ext/intl/grapheme/grapheme_string.c
U php/php-src/branches/PHP_5_3/ext/intl/grapheme/grapheme_util.c
U php/php-src/branches/PHP_5_3/ext/intl/grapheme/grapheme_util.h
U php/php-src/trunk/ext/intl/grapheme/grapheme_string.c
U php/php-src/trunk/ext/intl/grapheme/grapheme_util.c
U php/php-src/trunk/ext/intl/grapheme/grapheme_util.h
Modified: php/php-src/branches/PHP_5_3/ext/intl/grapheme/grapheme_string.c
===
--- php/php-src/branches/PHP_5_3/ext/intl/grapheme/grapheme_string.c
2011-08-07 16:31:21 UTC (rev 314439)
+++ php/php-src/branches/PHP_5_3/ext/intl/grapheme/grapheme_string.c
2011-08-07 17:14:14 UTC (rev 314440)
@@ -677,7 +677,7 @@
/* }}} */
/* {{{ grapheme_extract_charcount_iter - grapheme iterator for
grapheme_extract MAXCHARS */
-inline int32_t
+static inline int32_t
grapheme_extract_charcount_iter(UBreakIterator *bi, int32_t csize, unsigned
char *pstr, int32_t str_len)
{
int pos = 0, prev_pos = 0;
@@ -714,7 +714,7 @@
/* }}} */
/* {{{ grapheme_extract_bytecount_iter - grapheme iterator for
grapheme_extract MAXBYTES */
-inline int32_t
+static inline int32_t
grapheme_extract_bytecount_iter(UBreakIterator *bi, int32_t bsize, unsigned
char *pstr, int32_t str_len)
{
int pos = 0, prev_pos = 0;
@@ -748,7 +748,7 @@
/* }}} */
/* {{{ grapheme_extract_count_iter - grapheme iterator for grapheme_extract
COUNT */
-inline int32_t
+static inline int32_t
grapheme_extract_count_iter(UBreakIterator *bi, int32_t size, unsigned char
*pstr, int32_t str_len)
{
int pos = 0, next_pos = 0;
Modified: php/php-src/branches/PHP_5_3/ext/intl/grapheme/grapheme_util.c
===
--- php/php-src/branches/PHP_5_3/ext/intl/grapheme/grapheme_util.c
2011-08-07 16:31:21 UTC (rev 314439)
+++ php/php-src/branches/PHP_5_3/ext/intl/grapheme/grapheme_util.c
2011-08-07 17:14:14 UTC (rev 314440)
@@ -432,7 +432,7 @@
/* }}} */
/* {{{ grapheme_count_graphemes */
-inline int32_t
+int32_t
grapheme_count_graphemes(UBreakIterator *bi, UChar *string, int32_t string_len)
{
int ret_len = 0;
@@ -456,7 +456,7 @@
/* }}} */
/* {{{ grapheme_memnstr_grapheme: find needle in haystack using grapheme
boundaries */
-inline int32_t
+int32_t
grapheme_memnstr_grapheme(UBreakIterator *bi, UChar *haystack, UChar *needle,
int32_t needle_len, UChar *end)
{
UChar *p = haystack;
Modified: php/php-src/branches/PHP_5_3/ext/intl/grapheme/grapheme_util.h
===
--- php/php-src/branches/PHP_5_3/ext/intl/grapheme/grapheme_util.h
2011-08-07 16:31:21 UTC (rev 314439)
+++ php/php-src/branches/PHP_5_3/ext/intl/grapheme/grapheme_util.h
2011-08-07 17:14:14 UTC (rev 314440)
@@ -36,10 +36,10 @@
int grapheme_split_string(const UChar *text, int32_t text_length, int
boundary_array[], int boundary_array_len TSRMLS_DC );
-inline int32_t
+int32_t
grapheme_count_graphemes(UBreakIterator *bi, UChar *string, int32_t
string_len);
-inline int32_t
+int32_t
grapheme_memnstr_grapheme(UBreakIterator *bi, UChar *haystack, UChar *needle,
int32_t needle_len, UChar *end);
inline void *grapheme_memrchr_grapheme(const void *s, int c, int32_t n);
Modified: php/php-src/trunk/ext/intl/grapheme/grapheme_string.c
===
--- php/php-src/trunk/ext/intl/grapheme/grapheme_string.c 2011-08-07
16:31:21 UTC (rev 314439)
+++ php/php-src/trunk/ext/intl/grapheme/grapheme_string.c 2011-08-07
17:14:14 UTC (rev 314440)
@@ -677,7 +677,7 @@
/* }}} */
/* {{{ grapheme_extract_charcount_iter - grapheme iterator for
grapheme_extract MAXCHARS */
-inline int32_t
+static inline int32_t
grapheme_extract_charcount_iter(UBreakIterator *bi, int32_t csize, unsigned
char *pstr, int32_t str_len)
{
int pos = 0, prev_pos = 0;
@@ -714,7 +714,7 @@
/* }}} */
/* {{{ grapheme_extract_bytecount_iter - grapheme iterator for
grapheme_extract MAXBYTES */
-inline int32_t
+static inline int32_t
grapheme_extract_bytecount_iter(UBreakIterator *bi, int32_t bsize, unsigned
char *pstr, int32_t str_len)
{
int pos = 0, prev_pos = 0;
@@ -748,7 +748,7 @@
/* }}} */
/* {{{ grapheme_extract_count_iter - grapheme iterator for grapheme_extract
COUNT */
-inline int32_t
+static inline int32_t
grapheme_extract_count_iter(UBreakIterator *bi, int32_t size, unsigned char
*pstr, int32_t str_len)
{
int pos = 0, next_pos = 0;
Modified: php/php-src/trunk/ext/intl/grapheme/grapheme_util.c
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/intl/resourcebundle/resourcebundle_class.h trunk/ext/intl/resourcebundle/resourcebundle_class.h
gwynne Sun, 07 Aug 2011 17:15:40 + Revision: http://svn.php.net/viewvc?view=revisionrevision=314441 Log: Front- and back-port rev 314431 (missing php.h include) Changed paths: U php/php-src/branches/PHP_5_3/ext/intl/resourcebundle/resourcebundle_class.h U php/php-src/trunk/ext/intl/resourcebundle/resourcebundle_class.h Modified: php/php-src/branches/PHP_5_3/ext/intl/resourcebundle/resourcebundle_class.h === --- php/php-src/branches/PHP_5_3/ext/intl/resourcebundle/resourcebundle_class.h 2011-08-07 17:14:14 UTC (rev 314440) +++ php/php-src/branches/PHP_5_3/ext/intl/resourcebundle/resourcebundle_class.h 2011-08-07 17:15:40 UTC (rev 314441) @@ -20,6 +20,7 @@ #include unicode/ures.h #include zend.h +#include php.h #include intl_error.h Modified: php/php-src/trunk/ext/intl/resourcebundle/resourcebundle_class.h === --- php/php-src/trunk/ext/intl/resourcebundle/resourcebundle_class.h 2011-08-07 17:14:14 UTC (rev 314440) +++ php/php-src/trunk/ext/intl/resourcebundle/resourcebundle_class.h 2011-08-07 17:15:40 UTC (rev 314441) @@ -20,6 +20,7 @@ #include unicode/ures.h #include zend.h +#include php.h #include intl_error.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_3/ext/date/php_date.c branches/PHP_5_4/ext/date/php_date.c trunk/ext/date/php_date.c
gwynne Sun, 07 Aug 2011 18:12:52 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=314445
Log:
possible use without init fixed
Changed paths:
U php/php-src/branches/PHP_5_3/ext/date/php_date.c
U php/php-src/branches/PHP_5_4/ext/date/php_date.c
U php/php-src/trunk/ext/date/php_date.c
Modified: php/php-src/branches/PHP_5_3/ext/date/php_date.c
===
--- php/php-src/branches/PHP_5_3/ext/date/php_date.c2011-08-07 17:51:59 UTC
(rev 31)
+++ php/php-src/branches/PHP_5_3/ext/date/php_date.c2011-08-07 18:12:52 UTC
(rev 314445)
@@ -2378,7 +2378,7 @@
PHPAPI int php_date_initialize(php_date_obj *dateobj, /*const*/ char
*time_str, int time_str_len, char *format, zval *timezone_object, int ctor
TSRMLS_DC)
{
timelib_time *now;
- timelib_tzinfo *tzi;
+ timelib_tzinfo *tzi = NULL;
timelib_error_container *err = NULL;
int type = TIMELIB_ZONETYPE_ID, new_dst;
char *new_abbr;
Modified: php/php-src/branches/PHP_5_4/ext/date/php_date.c
===
--- php/php-src/branches/PHP_5_4/ext/date/php_date.c2011-08-07 17:51:59 UTC
(rev 31)
+++ php/php-src/branches/PHP_5_4/ext/date/php_date.c2011-08-07 18:12:52 UTC
(rev 314445)
@@ -2373,7 +2373,7 @@
PHPAPI int php_date_initialize(php_date_obj *dateobj, /*const*/ char
*time_str, int time_str_len, char *format, zval *timezone_object, int ctor
TSRMLS_DC)
{
timelib_time *now;
- timelib_tzinfo *tzi;
+ timelib_tzinfo *tzi = NULL;
timelib_error_container *err = NULL;
int type = TIMELIB_ZONETYPE_ID, new_dst;
char *new_abbr;
Modified: php/php-src/trunk/ext/date/php_date.c
===
--- php/php-src/trunk/ext/date/php_date.c 2011-08-07 17:51:59 UTC (rev
31)
+++ php/php-src/trunk/ext/date/php_date.c 2011-08-07 18:12:52 UTC (rev
314445)
@@ -2373,7 +2373,7 @@
PHPAPI int php_date_initialize(php_date_obj *dateobj, /*const*/ char
*time_str, int time_str_len, char *format, zval *timezone_object, int ctor
TSRMLS_DC)
{
timelib_time *now;
- timelib_tzinfo *tzi;
+ timelib_tzinfo *tzi = NULL;
timelib_error_container *err = NULL;
int type = TIMELIB_ZONETYPE_ID, new_dst;
char *new_abbr;
--
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/Zend/ zend_operators.h
gwynne Sun, 07 Aug 2011 05:20:49 + Revision: http://svn.php.net/viewvc?view=revisionrevision=314400 Log: Fix build under Clang 2.9 - see LLVM bug #9164 (http://llvm.org/bugs/show_bug.cgi?id=9164). Tested with GCC and Clang on Darwin and Ubuntu. Bug: https://bugs.php.net/9164 (Bogus) wrong variable is initialized Changed paths: U php/php-src/branches/PHP_5_4/Zend/zend_operators.h Modified: php/php-src/branches/PHP_5_4/Zend/zend_operators.h === --- php/php-src/branches/PHP_5_4/Zend/zend_operators.h 2011-08-07 05:19:55 UTC (rev 314399) +++ php/php-src/branches/PHP_5_4/Zend/zend_operators.h 2011-08-07 05:20:49 UTC (rev 314400) @@ -615,7 +615,11 @@ 0:\n\t fildl (%2)\n\t fildl (%1)\n\t +#if defined(__clang__) (__clang_major__ 2 || (__clang_major__ == 2 __clang_minor__ 10)) + fsubp %%st(1), %%st\n\t // LLVM bug #9164 +#else fsubp %%st, %%st(1)\n\t +#endif movb $0x2,0xc(%0)\n\t fstpl (%0)\n 1: @@ -635,7 +639,11 @@ 0:\n\t fildq (%2)\n\t fildq (%1)\n\t +#if defined(__clang__) (__clang_major__ 2 || (__clang_major__ == 2 __clang_minor__ 10)) + fsubp %%st(1), %%st\n\t // LLVM bug #9164 +#else fsubp %%st, %%st(1)\n\t +#endif movb $0x2,0x14(%0)\n\t fstpl (%0)\n 1: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /SVNROOT/ global_avail httpd.conf
gwynne Tue, 02 Mar 2010 06:37:59 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=295721
Log:
SSL access to SVN, and CVS-SVN in global_avail
Changed paths:
U SVNROOT/global_avail
U SVNROOT/httpd.conf
Modified: SVNROOT/global_avail
===
--- SVNROOT/global_avail2010-03-02 06:16:11 UTC (rev 295720)
+++ SVNROOT/global_avail2010-03-02 06:37:59 UTC (rev 295721)
@@ -128,7 +128,7 @@
avail|imajes,edink,derick,sfox,wez,goba,mj,pajoye,bjori,philip|systems
# Finally, there are various people with access to various bits and
-# pieces of other CVS modules.
+# pieces of other SVN modules.
avail|sterling,derick,imajes,phanto,sebastian,helly,jan|pecl/adt
avail|beckerr,val,shire|pecl/apc
Modified: SVNROOT/httpd.conf
===
--- SVNROOT/httpd.conf 2010-03-02 06:16:11 UTC (rev 295720)
+++ SVNROOT/httpd.conf 2010-03-02 06:37:59 UTC (rev 295721)
@@ -42,24 +42,51 @@
/VirtualHost
-#NameVirtualHost *:443
-#VirtualHost *:443
-# SSLEngine On
-# SSLCipherSuite
ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP:+eNULL
-# SSLCertificateFile /local/this-box/php.net.crt
-# SSLCertificateKeyFile /local/this-box/php.net.key
-# ServerName svn.php.net
-# CustomLog |/local/bin/rotatelogs /home/svn/logs/svn-ssl-svn_log.%Y%m%d
86400 %t %u %{SVN-ACTION}e env=SVN-ACTION
-# CustomLog |/local/bin/rotatelogs /home/svn/logs/svn-ssl-access_log.%Y%m%d
86400 combined
-# ErrorLog |/local/bin/rotatelogs /home/svn/logs/svn-ssl-error_log.%Y%m%d
86400
-# Location /
-# DAV svn
-# SVNPath /home/svn/repository
-# Satisfy All
-# Require valid-user
-# AuthType Digest
-# AuthName PHP Subversion Repository
-# AuthUserFile /home/svn/SVNROOT/passwd.db
-# AuthDigestDomain /
-# /Location
-#/VirtualHost
+NameVirtualHost *:443
+VirtualHost *:443
+SSLEngine On
+SSLCipherSuite
ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP:+eNULL
+SSLCertificateFile /local/this-box/php.net.crt
+SSLCertificateKeyFile /local/this-box/php.net.key
+
+ServerName svn.php.net
+CustomLog |/local/bin/rotatelogs /home/svn/logs/svn-ssl-svn_log.%Y%m%d
86400 %t %u %{SVN-ACTION}e env=SVN-ACTION
+CustomLog |/local/bin/rotatelogs /home/svn/logs/svn-ssl-access_log.%Y%m%d
86400 %h %u %t \%r\ %s %b (%{cratio}n%%) \%{Referer}i\
\%{User-Agent}i\
+ErrorLog |/local/bin/rotatelogs /home/svn/logs/svn-ssl-error_log.%Y%m%d
86400
+DeflateCompressionLevel 6
+DeflateFilterNote Ratio cratio
+LogLevel info
+
+ScriptAlias /viewvc /home/svn/viewvc-svn/bin/cgi/viewvc.cgi
+ScriptAlias /query /home/svn/viewvc-svn/bin/cgi/query.cgi
+Alias /docroot /home/svn/viewvc-svn/templates/docroot
+Directory /home/svn/viewvc-svn/bin/cgi
+Options +ExecCGI
+Order allow,deny
+Allow from all
+/Directory
+Location /
+DirectoryIndex viewvc
+Order allow,deny
+Allow from all
+/Location
+
+Location /repository
+DAV svn
+SVNPath /home/svn/repository
+ Order allow,deny
+ Allow from all
+LimitExcept GET PROPFIND OPTIONS REPORT
+Satisfy All
+Require valid-user
+/LimitExcept
+AuthType Digest
+AuthName PHP Subversion Repository
+AuthUserFile /home/svn/SVNROOT/passwd.db
+AuthDigestDomain /repository
+SetOutputFilter DEFLATE
+/Location
+
+Alias /robots.txt /home/svn/robots.txt
+RedirectMatch ^/(?!robots|repository|viewvc|query|docroot)(.*)$ /viewvc/$1
+/VirtualHost
--
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/pdo_mysql/ php_pdo_mysql_int.h
gwynne Sun, 31 Jan 2010 20:00:36 + Revision: http://svn.php.net/viewvc?view=revisionrevision=294278 Log: ZEND_EXTERN_MODULE_GLOBALS() is necessary with ZTS, at least on OS X. How confusing. Changed paths: U php/php-src/branches/PHP_5_3/ext/pdo_mysql/php_pdo_mysql_int.h Modified: php/php-src/branches/PHP_5_3/ext/pdo_mysql/php_pdo_mysql_int.h === --- php/php-src/branches/PHP_5_3/ext/pdo_mysql/php_pdo_mysql_int.h 2010-01-31 19:52:02 UTC (rev 294277) +++ php/php-src/branches/PHP_5_3/ext/pdo_mysql/php_pdo_mysql_int.h 2010-01-31 20:00:36 UTC (rev 294278) @@ -77,6 +77,8 @@ #endif ZEND_END_MODULE_GLOBALS(pdo_mysql) +ZEND_EXTERN_MODULE_GLOBALS(pdo_mysql) + #ifdef ZTS #define PDO_MYSQL_G(v) TSRMG(pdo_mysql_globals_id, zend_pdo_mysql_globals *, v) #else -- 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 branches/PHP_5_2/ext/pcre/pcrelib/AUTHORS branches/PHP_5_2/ext/pcre/pcrelib/ChangeLog branches/PHP_5_2/ext/pcre/pcrelib/HACKING branches/PHP_5_
On Jan 22, 2010, at 9:06 AM, Pierre Joye wrote: ps. I think it might be beneficial for PHP at large to depend more on C99 as the types are needed in multiple places and other C99 features might be interesting ... The main problem is gcc thinking that adding random c99 features to default is a good thing to do. Which we can completely blast by passing -std=c89 or -ansi, the lowest common denominator of ANSI C. That should disable something like 95% of gcc's extensions. If we wanted to go for never using ANYTHING gcc-specific (except explicitly, as in __attribute__), we could add -pedantic. It'd probably take days just to make things build again, though; I just tried make EXTRA_CFLAGS=-ansi and couldn't build a single file (zend_alloc.h uses static inline, a GNU extension in C89 mode). However, we could as well define these types on demand using the configure script. That will solve 99% of the resons why poeple use stdint.h. IMHO, that's a pretty good solution. -- 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
gwynne Wed, 02 Dec 2009 13:56:50 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=291593
Log:
Limit subject to 500 instead of 900. Quick hack that should guarantee correct
encoding in all non-pathological cases.
Changed paths:
U SVNROOT/commit-email.php
Modified: SVNROOT/commit-email.php
===
--- SVNROOT/commit-email.php2009-12-02 13:44:32 UTC (rev 291592)
+++ SVNROOT/commit-email.php2009-12-02 13:56:50 UTC (rev 291593)
@@ -166,13 +166,13 @@
function utf8_safe_header($header_value)
{
// As per experience and
http://www.php.net/manual/en/function.imap-8bit.php#75081
-// 1 - Limit string to 900 chars, giving some slop for the replacements
and extensions
+// 1 - Limit string to 500 chars, giving a really huge slop for the
replacements and extensions
// 2 - imap_8bit() the string
// 3 - Replace =\r\n with nothing, _ with =5F, and ? with =3F
// 6 - Replace space with _
// 7 - Surround with =?utf-8?q??=
return '=?utf-8?q?' . str_replace(' ', '_', str_replace(array('_',
=\r\n, '?'), array('=5F', '', '=3F'),
-imap_8bit(substr($header_value, 0, 900 . '?=';
+imap_8bit(substr($header_value, 0, 500 . '?=';
}
//
-
--
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/scripts/ phpize.m4
gwynne Wed, 02 Dec 2009 17:42:58 + Revision: http://svn.php.net/viewvc?view=revisionrevision=291598 Log: One change in trying to update Autoconf was missed. This makes phpize work again. Changed paths: U php/php-src/branches/PHP_5_3/scripts/phpize.m4 Modified: php/php-src/branches/PHP_5_3/scripts/phpize.m4 === --- php/php-src/branches/PHP_5_3/scripts/phpize.m4 2009-12-02 17:20:25 UTC (rev 291597) +++ php/php-src/branches/PHP_5_3/scripts/phpize.m4 2009-12-02 17:42:58 UTC (rev 291598) @@ -1,6 +1,6 @@ dnl This file becomes configure.in for self-contained extensions. -divert(1001) +divert(1) AC_PREREQ(2.13) AC_INIT(config.m4) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /SVNROOT/ hook-common.inc.php
gwynne Tue, 01 Dec 2009 11:57:17 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=291550
Log:
fix UTF-8 encoding issues
Changed paths:
U SVNROOT/hook-common.inc.php
Modified: SVNROOT/hook-common.inc.php
===
--- SVNROOT/hook-common.inc.php 2009-12-01 11:57:15 UTC (rev 291549)
+++ SVNROOT/hook-common.inc.php 2009-12-01 11:57:17 UTC (rev 291550)
@@ -5,6 +5,7 @@
error_reporting(E_ALL | E_STRICT);
date_default_timezone_set('UTC');
putenv(PATH=/usr/local/bin:/usr/bin:/bin);
+putenv(LC_ALL=en_US.UTF-8);
function fail($error)
{
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /SVNROOT/ httpd.conf
gwynne Tue, 01 Dec 2009 11:58:37 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=291552
Log:
Add compression, compression logging, and a robots.txt
Changed paths:
U SVNROOT/httpd.conf
Modified: SVNROOT/httpd.conf
===
--- SVNROOT/httpd.conf 2009-12-01 11:57:51 UTC (rev 291551)
+++ SVNROOT/httpd.conf 2009-12-01 11:58:37 UTC (rev 291552)
@@ -1,8 +1,11 @@
VirtualHost *:80
ServerName svn.php.net
CustomLog |/local/bin/rotatelogs /home/svn/logs/svn-svn_log.%Y%m%d 86400
%h %t %u %{SVN-ACTION}e env=SVN-ACTION
-CustomLog |/local/bin/rotatelogs /home/svn/logs/svn-access_log.%Y%m%d
86400 combined
+CustomLog |/local/bin/rotatelogs /home/svn/logs/svn-access_log.%Y%m%d
86400 %h %u %t \%r\ %s %b (%{cratio}n%%) \%{Referer}i\
\%{User-Agent}i\
ErrorLog |/local/bin/rotatelogs /home/svn/logs/svn-error_log.%Y%m%d 86400
+DeflateCompressionLevel 6
+DeflateFilterNote Ratio cratio
+LogLevel info
ScriptAlias /viewvc /home/svn/viewvc-svn/bin/cgi/viewvc.cgi
ScriptAlias /query /home/svn/viewvc-svn/bin/cgi/query.cgi
@@ -31,9 +34,11 @@
AuthName PHP Subversion Repository
AuthUserFile /home/svn/SVNROOT/passwd.db
AuthDigestDomain /repository
+SetOutputFilter DEFLATE
/Location
-RedirectMatch ^/(?!repository|viewvc|query|docroot)(.*)$ /viewvc/$1
+Alias /robots.txt /home/svn/robots.txt
+RedirectMatch ^/(?!robots|repository|viewvc|query|docroot)(.*)$ /viewvc/$1
/VirtualHost
--
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/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
On Dec 1, 2009, at 3:08 AM, Jani Taskinen wrote: Having taken another look at the UTF-8 issue, I'd say this was a problem with your SVN, not anything here. The log message got entered into SVN with the escapes that way; by the time it reached the server it was already wrong. Check your ~/.subversion/config for the log-encoding setting; if it's set correctly let me know and I'll dig further. I'll commit a robust fix for the lengths issue shortly. It should default to UTF-8? It's not set in my .subversion/config (commented out) so it should use the native locale? And for me it's always utf-8 on all of my machines. And you were right again :). It turned out to be an issue with SVN requiring locale settings, which is completely ridiculous. Show me another program that needs the system locale to be exactly correct in order to handle UTF-8 correctly... anyway, it's fixed now. -- Gwynne -- 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/ configure.in
gwynne Mon, 30 Nov 2009 08:17:13 + Revision: http://svn.php.net/viewvc?view=revisionrevision=291477 Log: once and for all remove the old broken Darwin hack, replace it with the new and much cleaner and simpler one Changed paths: U php/php-src/branches/PHP_5_3/configure.in Modified: php/php-src/branches/PHP_5_3/configure.in === --- php/php-src/branches/PHP_5_3/configure.in 2009-11-30 07:53:46 UTC (rev 291476) +++ php/php-src/branches/PHP_5_3/configure.in 2009-11-30 08:17:13 UTC (rev 291477) @@ -122,21 +122,6 @@ $php_shtool mkdir -p libs rm -f libs/* -dnl Darwin 9 hack -dnl Because the default debugging format used by Apple's GCC on Mac OS 10.5 -dnl causes errors in all current and past versions of Autoconf, we do a little -dnl messing with the CFLAGS here to trick it. -php_did_darwin9_cheat=0 -case $host_alias in -*darwin9*) - hasg=`echo $CFLAGS | grep -E '(^-g)|([[:space:]]-g)'` - if test x$hasg = x; then -php_did_darwin9_cheat=1 -CFLAGS=$CFLAGS -gstabs - fi - ;; -esac - dnl Checks for programs. dnl - @@ -1339,6 +1324,14 @@ LDFLAGS=$LDFLAGS $PHP_AIX_LDFLAGS +dnl Autoconf 2.13's libtool checks go slightly nuts on Mac OS X 10.5 and 10.6. +dnl This hack works around it. Ugly. +case $host_alias in +*darwin9*|*darwin10*) + ac_cv_exeext= + ;; +esac + dnl Only allow AC_PROG_CXX and AC_PROG_CXXCPP if they are explicitly called (by PHP_REQUIRE_CXX). dnl Otherwise AC_PROG_LIBTOOL fails if there is no working C++ compiler. AC_PROVIDE_IFELSE([PHP_REQUIRE_CXX], [], [ @@ -1362,15 +1355,6 @@ CC=$old_CC -dnl Finish the Darwin hack -if test $php_did_darwin9_cheat -eq 1; then - if test $PHP_DEBUG = 1; then -CFLAGS=`echo $CFLAGS | $SED -e 's/-gstabs/-g/g'` - else -CFLAGS=`echo -O2 $CFLAGS | $SED -e 's/-gstabs//g'` - fi -fi - PHP_CONFIGURE_PART(Generating files) CXXFLAGS_CLEAN=$CXXFLAGS -- 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/ configure.in
gwynne Mon, 30 Nov 2009 08:18:44 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=291478
Log:
re-committing: unsetting LIBS and LDFLAGS just makes it impossible to specify
LDFLAGS from the environment. keeping them doesn't seem to cause any trouble
Changed paths:
U php/php-src/branches/PHP_5_3/configure.in
Modified: php/php-src/branches/PHP_5_3/configure.in
===
--- php/php-src/branches/PHP_5_3/configure.in 2009-11-30 08:17:13 UTC (rev
291477)
+++ php/php-src/branches/PHP_5_3/configure.in 2009-11-30 08:18:44 UTC (rev
291478)
@@ -988,7 +988,7 @@
EXTRA_LIBS=-lcrypt $EXTRA_LIBS -lcrypt
fi
-unset LIBS LDFLAGS
+#unset LIBS LDFLAGS
dnl PEAR
dnl -
@@ -1071,7 +1071,7 @@
fi
ZEND_EXTRA_LIBS=$LIBS
-unset LIBS LDFLAGS
+#unset LIBS LDFLAGS
PHP_HELP_SEPARATOR([TSRM:])
PHP_CONFIGURE_PART(Configuring TSRM)
@@ -1083,7 +1083,7 @@
EXTRA_LDFLAGS=$EXTRA_LDFLAGS $LDFLAGS
EXTRA_LDFLAGS_PROGRAM=$EXTRA_LDFLAGS_PROGRAM $LDFLAGS
EXTRA_LIBS=$EXTRA_LIBS $LIBS
-unset LIBS LDFLAGS
+#unset LIBS LDFLAGS
test $prefix = NONE prefix=/usr/local
test $exec_prefix = NONE exec_prefix='${prefix}'
--
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
gwynne Mon, 30 Nov 2009 21:38:44 + Revision: http://svn.php.net/viewvc?view=revisionrevision=291523 Log: The old Darwin hack is BROKEN and INCORRECT. It works only for Darwin 9, not 10, and uses an ugly CFLAGS hack that messes with the entire build. This version sets one cached value to the correct result for Darwin 9 and 10. It's cleaner, has no side effects, has nothing to do with Autoconf versions, and works for everyone. 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-11-30 21:02:46 UTC (rev 291522) +++ php/php-src/branches/PHP_5_2/configure.in 2009-11-30 21:38:44 UTC (rev 291523) @@ -122,21 +122,6 @@ $php_shtool mkdir -p libs rm -f libs/* -dnl Darwin 9 hack -dnl Because the default debugging format used by Apple's GCC on Mac OS 10.5 -dnl causes errors in all current and past versions of Autoconf, we do a little -dnl messing with the CFLAGS here to trick it. -php_did_darwin9_cheat=0 -case $host_alias in -*darwin9*) - hasg=`echo $CFLAGS | grep -E '(^-g)|([[:space:]]-g)'` - if test x$hasg = x; then -php_did_darwin9_cheat=1 -CFLAGS=$CFLAGS -gstabs - fi - ;; -esac - dnl Checks for programs. dnl - @@ -1331,6 +1316,14 @@ LDFLAGS=$LDFLAGS $PHP_AIX_LDFLAGS +dnl Autoconf 2.13's libtool checks go slightly nuts on Mac OS X 10.5 and 10.6. +dnl This hack works around it. Ugly. +case $host_alias in +*darwin9*|*darwin10*) + ac_cv_exeext= + ;; +esac + dnl Only allow AC_PROG_CXX and AC_PROG_CXXCPP if they are explicitly called (by PHP_REQUIRE_CXX). dnl Otherwise AC_PROG_LIBTOOL fails if there is no working C++ compiler. AC_PROVIDE_IFELSE([PHP_REQUIRE_CXX], [], [ @@ -1354,15 +1347,6 @@ CC=$old_CC -dnl Finish the Darwin hack -if test $php_did_darwin9_cheat -eq 1; then - if test $PHP_DEBUG = 1; then -CFLAGS=`echo $CFLAGS | $SED -e 's/-gstabs/-g/g'` - else -CFLAGS=`echo -O2 $CFLAGS | $SED -e 's/-gstabs//g'` - fi -fi - PHP_CONFIGURE_PART(Generating files) CXXFLAGS_CLEAN=$CXXFLAGS Modified: php/php-src/branches/PHP_5_3/configure.in === --- php/php-src/branches/PHP_5_3/configure.in 2009-11-30 21:02:46 UTC (rev 291522) +++ php/php-src/branches/PHP_5_3/configure.in 2009-11-30 21:38:44 UTC (rev 291523) @@ -122,21 +122,6 @@ $php_shtool mkdir -p libs rm -f libs/* -dnl Darwin 9 hack -dnl Because the default debugging format used by Apple's GCC on Mac OS 10.5 -dnl causes errors in all current and past versions of Autoconf, we do a little -dnl messing with the CFLAGS here to trick it. -php_did_darwin9_cheat=0 -case $host_alias in -*darwin9*) - hasg=`echo $CFLAGS | grep -E '(^-g)|([[:space:]]-g)'` - if test x$hasg = x; then -php_did_darwin9_cheat=1 -CFLAGS=$CFLAGS -gstabs - fi - ;; -esac - dnl Checks for programs. dnl - @@ -1339,6 +1324,14 @@ LDFLAGS=$LDFLAGS $PHP_AIX_LDFLAGS +dnl Autoconf 2.13's libtool checks go slightly nuts on Mac OS X 10.5 and 10.6. +dnl This hack works around it. Ugly. +case $host_alias in +*darwin9*|*darwin10*) + ac_cv_exeext= + ;; +esac + dnl Only allow AC_PROG_CXX and AC_PROG_CXXCPP if they are explicitly called (by PHP_REQUIRE_CXX). dnl Otherwise AC_PROG_LIBTOOL fails if there is no working C++ compiler. AC_PROVIDE_IFELSE([PHP_REQUIRE_CXX], [], [ @@ -1362,15 +1355,6 @@ CC=$old_CC -dnl Finish the Darwin hack -if test $php_did_darwin9_cheat -eq 1; then - if test $PHP_DEBUG = 1; then -CFLAGS=`echo $CFLAGS | $SED -e 's/-gstabs/-g/g'` - else -CFLAGS=`echo -O2 $CFLAGS | $SED -e 's/-gstabs//g'` - fi -fi - PHP_CONFIGURE_PART(Generating files) CXXFLAGS_CLEAN=$CXXFLAGS Modified: php/php-src/trunk/configure.in === --- php/php-src/trunk/configure.in 2009-11-30 21:02:46 UTC (rev 291522) +++ php/php-src/trunk/configure.in 2009-11-30 21:38:44 UTC (rev 291523) @@ -124,21 +124,6 @@ $php_shtool mkdir -p libs rm -f libs/* -dnl Darwin 9 hack -dnl Because the default debugging format used by Apple's GCC on Mac OS 10.5 -dnl causes errors in all current and past versions of Autoconf, we do a little -dnl messing with the CFLAGS here to trick it. -php_did_darwin9_cheat=0 -case $host_alias in -*darwin9*) - hasg=`echo $CFLAGS | grep -E '(^-g)|([[:space:]]-g)'` - if test x$hasg = x; then -php_did_darwin9_cheat=1 -CFLAGS=$CFLAGS -gstabs - fi - ;; -esac - dnl Checks for programs. dnl - @@ -1277,6 +1262,14 @@ LDFLAGS=$LDFLAGS
Re: [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
On Nov 30, 2009, at 5:45 PM, Jani Taskinen wrote: 1. Does not deal with utf8 stuff very well..? 2. Paths..? 3. Diff..? I'd say revert whatever you did.. --Jani The missing paths are Philip's fault (the diffs size shouldn't have been used in determining whether to hide the paths), the UTF-8 problems were there before (and shouldn't have been, thus my fault). I'll fix. Jani Taskinen wrote: jani Mon, 30 Nov 2009 22:39:59 + Revision: http://svn.php.net/viewvc?view=revisionrevision=291526 Log: - Touch?\195?\169 fil?\195?\169s Changed paths: changed paths exceeded maximum size diffs exceeded maximum size -- 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/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
On Nov 30, 2009, at 5:45 PM, Jani Taskinen wrote: 1. Does not deal with utf8 stuff very well..? 2. Paths..? 3. Diff..? I'd say revert whatever you did.. Having taken another look at the UTF-8 issue, I'd say this was a problem with your SVN, not anything here. The log message got entered into SVN with the escapes that way; by the time it reached the server it was already wrong. Check your ~/.subversion/config for the log-encoding setting; if it's set correctly let me know and I'll dig further. I'll commit a robust fix for the lengths issue shortly. -- 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
gwynne Tue, 01 Dec 2009 04:29:13 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=291534
Log:
1) sanitize Subject and From headers more thorughly, 2) calculate large email
sizes more correctly
Changed paths:
U SVNROOT/commit-email.php
Modified: SVNROOT/commit-email.php
===
--- SVNROOT/commit-email.php2009-12-01 02:05:28 UTC (rev 291533)
+++ SVNROOT/commit-email.php2009-12-01 04:29:13 UTC (rev 291534)
@@ -162,18 +162,37 @@
}
//
-
+// Safely utf-8-ize an email header with the short version of quoted-printable
+function utf8_safe_header($header_value)
+{
+// As per experience and
http://www.php.net/manual/en/function.imap-8bit.php#75081
+// 1 - Limit string to 900 chars, giving some slop for the replacements
and extensions
+// 2 - imap_8bit() the string
+// 3 - Replace =\r\n with nothing, _ with =5F, and ? with =3F
+// 6 - Replace space with _
+// 7 - Surround with =?utf-8?q??=
+return '=?utf-8?q?' . str_replace(' ', '_', str_replace(array('_',
=\r\n, '?'), array('=5F', '', '=3F'),
+imap_8bit(substr($header_value, 0, 900 . '?=';
+}
+
+//
-
// Build e-mail
$boundary = sha1({$commit_info['author']}{$commit_info['date']});
$messageid = {$commit_info['author']}-{$commit_info['date']}-{$REV}- .
mt_rand();
-$subject = substr(svn: {$paths_list}, 0, 970); // Max SMTP line length =
998. Some slop in this value.
+$subject = utf8_safe_header(svn: {$paths_list});
$email_date = date(DATE_RFC2822, $commit_info['date']);
-$fullname = =?utf-8?q? . imap_8bit(str_replace(array('?', ' '), array('=3F',
'_'), $commit_info['author_name'])) . ?=;
+$fullname = utf8_safe_header($commit_info['author_name']);
$email_list = implode(', ', $emails_to);
$readable_path_list = . implode(PHP_EOL . ,
$commit_info['raw_changed_paths']);
$nspaces = str_repeat( , max(1, 72 - strlen($commit_info['author']) -
strlen($email_date)));
-// Help ensure all commits make it to the mailing lists, which have size
restrictions
-if ((strlen($readable_path_list) + $diffs_length) 262144) {
+// Help ensure all commits make it to the mailing lists, which have size
restrictions.
+// Add the path list length to: 1) the diff string length (which will be zero
if diffs ARE attached), and
+// 2) the diff data length (which will be zero if diffs are NOT attached).
+// If the total is larger than 256K, don't include the path list. If it still
goes over the limit even after that,
+// the email is gonna be too big to send no matter what we do.
+$diff_data = $diffs_string === NULL ?
wordwrap(base64_encode($commit_info['diffs']), 80, PHP_EOL, TRUE) : '';
+if ((strlen($readable_path_list) + strlen($diffs_string) + strlen($diff_data))
262144) {
$readable_path_list = 'changed paths exceeded maximum size';
}
@@ -205,7 +224,6 @@
MIMEBODY;
if ($diffs_string === NULL) {
-$diff_data = wordwrap(base64_encode($commit_info['diffs']), 80, PHP_EOL,
TRUE);
$msg_body .= MIMEBODY
Content-Type: text/x-diff; charset=utf-8
--
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/ configure.in
gwynne Sat, 28 Nov 2009 19:19:11 + Revision: http://svn.php.net/viewvc?view=revisionrevision=291396 Log: Remove the now-unnecessary (and wrong anyway) Darwin hack Changed paths: U php/php-src/branches/PHP_5_3/configure.in Modified: php/php-src/branches/PHP_5_3/configure.in === --- php/php-src/branches/PHP_5_3/configure.in 2009-11-28 18:56:20 UTC (rev 291395) +++ php/php-src/branches/PHP_5_3/configure.in 2009-11-28 19:19:11 UTC (rev 291396) @@ -101,21 +101,6 @@ $php_shtool mkdir -p libs rm -f libs/* -dnl Darwin 9 hack -dnl Because the default debugging format used by Apple's GCC on Mac OS 10.5 -dnl causes errors in all current and past versions of Autoconf, we do a little -dnl messing with the CFLAGS here to trick it. -php_did_darwin9_cheat=0 -case $host_alias in -*darwin9*) - hasg=`echo $CFLAGS | grep -E '(^-g)|([[:space:]]-g)'` - if test x$hasg = x; then -php_did_darwin9_cheat=1 -CFLAGS=$CFLAGS -gstabs - fi - ;; -esac - dnl Checks for programs. dnl - @@ -1320,15 +1305,6 @@ CC=$old_CC -dnl Finish the Darwin hack -if test $php_did_darwin9_cheat -eq 1; then - if test $PHP_DEBUG = 1; then -CFLAGS=`echo $CFLAGS | $SED -e 's/-gstabs/-g/g'` - else -CFLAGS=`echo -O2 $CFLAGS | $SED -e 's/-gstabs//g'` - fi -fi - PHP_CONFIGURE_PART(Generating files) CXXFLAGS_CLEAN=$CXXFLAGS -- 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/mysql/ config.m4
gwynne Sat, 28 Nov 2009 21:11:39 + Revision: http://svn.php.net/viewvc?view=revisionrevision=291399 Log: socket location needs to be checked before mysqlnd in order for --with-mysql-sock to work with mysqlnd Changed paths: U php/php-src/branches/PHP_5_3/ext/mysql/config.m4 Modified: php/php-src/branches/PHP_5_3/ext/mysql/config.m4 === --- php/php-src/branches/PHP_5_3/ext/mysql/config.m42009-11-28 19:48:38 UTC (rev 291398) +++ php/php-src/branches/PHP_5_3/ext/mysql/config.m42009-11-28 21:11:39 UTC (rev 291399) @@ -53,23 +53,24 @@ [ --with-zlib-dir[=DIR] MySQL: Set the path to libz install prefix], no, no) fi +AC_MSG_CHECKING([for MySQL UNIX socket location]) +if test $PHP_MYSQL_SOCK != no test $PHP_MYSQL_SOCK != yes; then + MYSQL_SOCK=$PHP_MYSQL_SOCK + AC_DEFINE_UNQUOTED(PHP_MYSQL_UNIX_SOCK_ADDR, $MYSQL_SOCK, [ ]) + AC_MSG_RESULT([$MYSQL_SOCK]) +elif test $PHP_MYSQL = yes || test $PHP_MYSQL_SOCK = yes; then + PHP_MYSQL_SOCKET_SEARCH +else + AC_MSG_RESULT([no]) +fi + + if test $PHP_MYSQL = mysqlnd; then dnl enables build of mysqnd library PHP_MYSQLND_ENABLED=yes elif test $PHP_MYSQL != no; then - AC_MSG_CHECKING([for MySQL UNIX socket location]) - if test $PHP_MYSQL_SOCK != no test $PHP_MYSQL_SOCK != yes; then -MYSQL_SOCK=$PHP_MYSQL_SOCK -AC_DEFINE_UNQUOTED(PHP_MYSQL_UNIX_SOCK_ADDR, $MYSQL_SOCK, [ ]) -AC_MSG_RESULT([$MYSQL_SOCK]) - elif test $PHP_MYSQL = yes || test $PHP_MYSQL_SOCK = yes; then -PHP_MYSQL_SOCKET_SEARCH - else -AC_MSG_RESULT([no]) - fi - MYSQL_DIR= MYSQL_INC_DIR= -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /SVNROOT/ commit-email.php
gwynne Tue, 25 Aug 2009 11:00:07 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=287681
Log:
go back to noreply@, if nothing else it's more correct and seems to mostly work
Changed paths:
U SVNROOT/commit-email.php
Modified: SVNROOT/commit-email.php
===
--- SVNROOT/commit-email.php2009-08-25 10:39:45 UTC (rev 287680)
+++ SVNROOT/commit-email.php2009-08-25 11:00:07 UTC (rev 287681)
@@ -7,7 +7,7 @@
// Constants
$smtp_server = '127.0.0.1';
-$envelope_sender = 'this-will-bou...@php.net'; // 'nore...@php.net';
+$envelope_sender = 'nore...@php.net';
$commit_email_list = array(
// FastCGI ISAPI
'|^php/fastcgi-isapi|' = array('sh...@php.net', 'w...@php.net',
'ed...@php.net'),
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] Test message
This is a test message. Please ignore it. -- 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
gwynne Tue, 18 Aug 2009 07:38:47 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=287438
Log:
Jani is now CC'd on bugtracker commits, per Jani's request
Changed paths:
U SVNROOT/commit-email.php
Modified: SVNROOT/commit-email.php
===
--- SVNROOT/commit-email.php2009-08-18 05:37:08 UTC (rev 287437)
+++ SVNROOT/commit-email.php2009-08-18 07:38:47 UTC (rev 287438)
@@ -76,6 +76,7 @@
'|^pear/pearweb|' = array('pear-...@lists.php.net',
'pear-c...@lists.php.net'),
'|^pear/peardoc|' = array('pear-...@lists.php.net'),
'|^pear/pear-core|' = array('pear-...@lists.php.net',
'pear-c...@lists.php.net'),
+'|^pear/packages/Bugtracker|' = array('pear-...@lists.php.net',
'pear-c...@lists.php.net', 'j...@php.net'),
'|^pear/packages/installphars|' = array('pear-c...@lists.php.net'),
'|^pear/packages|' = array('pear-...@lists.php.net'),
'|^pear/ci|' = array('pear-...@lists.php.net'),
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /SVNROOT/ commit-email.php
gwynne Tue, 18 Aug 2009 07:51:41 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=287439
Log:
change commit email envelope sender, per bjori's request
Changed paths:
U SVNROOT/commit-email.php
Modified: SVNROOT/commit-email.php
===
--- SVNROOT/commit-email.php2009-08-18 07:38:47 UTC (rev 287438)
+++ SVNROOT/commit-email.php2009-08-18 07:51:41 UTC (rev 287439)
@@ -7,6 +7,7 @@
// Constants
$smtp_server = '127.0.0.1';
+$envelope_sender = 'nore...@php.net'; // this-will-bou...@php.net
$commit_email_list = array(
// FastCGI ISAPI
'|^php/fastcgi-isapi|' = array('sh...@php.net', 'w...@php.net',
'ed...@php.net'),
@@ -234,7 +235,7 @@
$rcpt_commands = RCPT TO: . implode(\r\nRCPT TO:, $smtp_recipients) .
;
fwrite($socket, SMTP
EHLO localhost\r
-MAIL FROM:this-will-bou...@php.net BODY=8BITMIME\r
+MAIL FROM:{$envelope_sender} BODY=8BITMIME\r
{$rcpt_commands}\r
DATA\r
{$msg_body}\r
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /SVNROOT/ commit-email.php
gwynne Tue, 18 Aug 2009 10:17:41 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=287444
Log:
the envelope sender seems to trigger some particular configuration in the lists
MX; reverting it to its former value for now
Changed paths:
U SVNROOT/commit-email.php
Modified: SVNROOT/commit-email.php
===
--- SVNROOT/commit-email.php2009-08-18 10:12:32 UTC (rev 287443)
+++ SVNROOT/commit-email.php2009-08-18 10:17:41 UTC (rev 287444)
@@ -7,7 +7,7 @@
// Constants
$smtp_server = '127.0.0.1';
-$envelope_sender = 'nore...@php.net'; // this-will-bou...@php.net
+$envelope_sender = 'this-will-bou...@php.net'; // 'nore...@php.net';
$commit_email_list = array(
// FastCGI ISAPI
'|^php/fastcgi-isapi|' = array('sh...@php.net', 'w...@php.net',
'ed...@php.net'),
--
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/simplexml/tests/ bug41861.phpt
gwynne Fri, 14 Aug 2009 09:44:45 + Revision: http://svn.php.net/viewvc?view=revisionrevision=287280 Log: fix broken test (spurious tab characters caused run-tests to spaz) Changed paths: U php/php-src/branches/PHP_5_3/ext/simplexml/tests/bug41861.phpt Modified: php/php-src/branches/PHP_5_3/ext/simplexml/tests/bug41861.phpt === --- php/php-src/branches/PHP_5_3/ext/simplexml/tests/bug41861.phpt 2009-08-14 09:44:09 UTC (rev 287279) +++ php/php-src/branches/PHP_5_3/ext/simplexml/tests/bug41861.phpt 2009-08-14 09:44:45 UTC (rev 287280) @@ -1,7 +1,7 @@ --TEST-- Bug #41861 (getNamespaces() returns the namespaces of a node's siblings) - --SKIPIF-- - ?php if (!extension_loaded(simplexml)) print skip; ? +--SKIPIF-- +?php if (!extension_loaded(simplexml)) print skip; ? --FILE-- ?php @@ -39,4 +39,4 @@ children(#ns1): 'node1' -- namespaces: #ns1 children(#ns2): 'node2' -- namespaces: #ns2 children(#ns3): 'node3' -- namespaces: #ns3 -===DONE=== \ No newline at end of file +===DONE=== -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /SVNROOT/ commit-email.php
gwynne Thu, 13 Aug 2009 07:49:49 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=287205
Log:
pear/ci and pear/pear-mirror shouldn't go to pear-core@, per cweiske's request
Changed paths:
U SVNROOT/commit-email.php
Modified: SVNROOT/commit-email.php
===
--- SVNROOT/commit-email.php2009-08-13 07:38:05 UTC (rev 287204)
+++ SVNROOT/commit-email.php2009-08-13 07:49:49 UTC (rev 287205)
@@ -78,6 +78,8 @@
'|^pear/pear-core|' = array('pear-...@lists.php.net',
'pear-c...@lists.php.net'),
'|^pear/packages/installphars|' = array('pear-c...@lists.php.net'),
'|^pear/packages|' = array('pear-...@lists.php.net'),
+'|^pear/ci|' = array('pear-...@lists.php.net'),
+'|^pear/pear-mirror|' = array('pear-...@lists.php.net'),
'|^pear|' = array('pear-...@lists.php.net', 'pear-c...@lists.php.net'),
// PECL
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /SVNROOT/ commit-email.php
gwynne Mon, 10 Aug 2009 19:39:28 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=287054
Log:
Bcc addresses that get copies of all emails; reduces confusion and clutter
Changed paths:
U SVNROOT/commit-email.php
Modified: SVNROOT/commit-email.php
===
--- SVNROOT/commit-email.php2009-08-10 19:34:56 UTC (rev 287053)
+++ SVNROOT/commit-email.php2009-08-10 19:39:28 UTC (rev 287054)
@@ -125,7 +125,6 @@
if (count($emails_to) === 0) {
$emails_to = $fallback_addresses;
}
-$emails_to = array_merge($emails_to, $always_addresses);
$emails_to = array_unique($emails_to);
//
-
@@ -228,7 +227,8 @@
fail(Couldn't connect to SMTP server {$smtp_server}. Errno: {$errno}.\n);
}
-$rcpt_commands = RCPT TO: . implode(\r\nRCPT TO:, $emails_to) . ;
+$smtp_recipients = array_unique(array_merge($emails_to, $always_addresses));
+$rcpt_commands = RCPT TO: . implode(\r\nRCPT TO:, $smtp_recipients) .
;
fwrite($socket, SMTP
EHLO localhost\r
MAIL FROM:this-will-bou...@php.net BODY=8BITMIME\r
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /SVNROOT/ pear_avail
On Aug 10, 2009, at 8:40 PM, Hannes Magnusson wrote:
-# The PEAR group has access to full pear tree
-avail|ashnazg,clockwerx,cweiske,gauthierm,kguest,saltybeagle,shupp|
pear
+# The PEAR group has access to full pear tree, and pear2
+avail|ashnazg,clockwerx,cweiske,gauthierm,kguest,saltybeagle,shupp|
pear,pear2
I don't think this works.. pear_avail is only read for pear/.
(noticing gwynne@ is no longer automatically CCed for all commits..
CCing her now)
I think pear2/ needs an entry in commit-email.php...
Actually, maybe nothing else. pre-commit seems to match against
^pear, not ^pear/ (is that a bug)?
And commits-bugs.php matches pear to pear.php.net/bugs (is the path
to pear2 bugtrakcer different?)
Both pre-commit and post-commit deliberately use only pear and NOT
pear/ as the prefix for pear matching for exactly this reason: so
matching with pear2 will work without special-casing in a dozen
places. It doesn't even need to be specified separately in pear_avail,
as the call for matching paths is fnmatch({$path}*) (this means that
just pear will always match pear2 even in avail). In short, it
just works as long as you don't specifically say pear/
somewhere :). If this isn't the desired behavior, tell me so I can fix
it.
-- Gwynne
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /SVNROOT/ global_avail pear_avail
gwynne Sun, 02 Aug 2009 17:34:36 + Revision: http://svn.php.net/viewvc?view=revisionrevision=286683 Log: Karma granted to the entire repository must appear at the end of the file, or else unavails in the middle (such as for Zend) will deny them access. Changed paths: U SVNROOT/global_avail U SVNROOT/pear_avail Modified: SVNROOT/global_avail === --- SVNROOT/global_avail2009-08-02 17:23:19 UTC (rev 286682) +++ SVNROOT/global_avail2009-08-02 17:34:36 UTC (rev 286683) @@ -5,10 +5,6 @@ unavail -# But members of the PHP Group get access to everything. - -avail|andi,andrei,jimw,rasmus,rubys,sas,ssb,thies,zeev,shane - # Some people also have access to the configuration files in the SVNROOT. avail|sterling,goba,imajes,wez,iliaa,derick,jon,cox,alan_k,jmcastagnetto,mj,pajoye,helly,philip,stas,johannes,gwynne,lsmith|SVNROOT @@ -27,7 +23,7 @@ unavail||php/php-src/*/Zend,php/php-src/*/TSRM # PEAR bits in the main php-src module -avail|cox,mj,vblavet,dickmann,tal,jmcastagnetto,alexmerz,cellog,pajoye,timj,clay,dufuz,bjori,davidc,saltybeagle,derick|php/php-src/*/pear +avail|cox,mj,vblavet,dickmann,tal,jmcastagnetto,alexmerz,cellog,pajoye,timj,clay,dufuz,bjori,davidc,saltybeagle,derick|php/php-src/*/`pear # Some people have access to tests in the Engine avail|ilewis,magnus,michael,zoe,jmessa,sfox,tomerc,felixdv|php/php-src/*/Zend/tests @@ -359,4 +355,8 @@ # cmake karma (GSOC 2008 project) avail|gloob,pierre|php/cmake +# But members of the PHP Group get access to everything. +# Note: This line MUST be at the end so that it overrides any unavail settings +avail|andi,andrei,jimw,rasmus,rubys,sas,ssb,thies,zeev,shane + # vim:set ft=conf sw=2 ts=2 et: Modified: SVNROOT/pear_avail === --- SVNROOT/pear_avail 2009-08-02 17:23:19 UTC (rev 286682) +++ SVNROOT/pear_avail 2009-08-02 17:34:36 UTC (rev 286683) @@ -5,10 +5,6 @@ unavail -# But members of the PHP Group get access to everything. - -avail|andi,andrei,jimw,rasmus,rubys,sas,ssb,thies,zeev,shane - # The PHP Developers have full access to the full source trees for # PHP and PEAR, as well as the documentation. @@ -175,4 +171,8 @@ avail|hschletz|pear/packages/MDB2 avail|tacker|pear/packages/File_Bittorrent,pear/packages/File_Bittorrent2 +# But members of the PHP Group get access to everything. +# Note: This line MUST be at the end so that it overrides any unavail settings +avail|andi,andrei,jimw,rasmus,rubys,sas,ssb,thies,zeev,shane + # 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/ global_avail
gwynne Sun, 02 Aug 2009 17:36:45 + Revision: http://svn.php.net/viewvc?view=revisionrevision=286685 Log: fix typo Changed paths: U SVNROOT/global_avail Modified: SVNROOT/global_avail === --- SVNROOT/global_avail2009-08-02 17:35:28 UTC (rev 286684) +++ SVNROOT/global_avail2009-08-02 17:36:45 UTC (rev 286685) @@ -23,7 +23,7 @@ unavail||php/php-src/*/Zend,php/php-src/*/TSRM # PEAR bits in the main php-src module -avail|cox,mj,vblavet,dickmann,tal,jmcastagnetto,alexmerz,cellog,pajoye,timj,clay,dufuz,bjori,davidc,saltybeagle,derick|php/php-src/*/`pear +avail|cox,mj,vblavet,dickmann,tal,jmcastagnetto,alexmerz,cellog,pajoye,timj,clay,dufuz,bjori,davidc,saltybeagle,derick|php/php-src/*/pear # Some people have access to tests in the Engine avail|ilewis,magnus,michael,zoe,jmessa,sfox,tomerc,felixdv|php/php-src/*/Zend/tests -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /SVNROOT/ global_avail pear_avail
gwynne Sat, 01 Aug 2009 18:45:28 + Revision: http://svn.php.net/viewvc?view=revisionrevision=286631 Log: Gwynne no longer needs superkarma. Zend and TSRM are restricted. Several obsolete lines removed. Changed paths: U SVNROOT/global_avail U SVNROOT/pear_avail Modified: SVNROOT/global_avail === --- SVNROOT/global_avail2009-08-01 18:29:26 UTC (rev 286630) +++ SVNROOT/global_avail2009-08-01 18:45:28 UTC (rev 286631) @@ -5,10 +5,6 @@ unavail -# Gwynne has temporary access to everything in order to sort out early SVN -# problems. This line should be removed ASAP. -avail|gwynne - # But members of the PHP Group get access to everything. avail|andi,andrei,jimw,rasmus,rubys,sas,ssb,thies,zeev,shane @@ -26,6 +22,10 @@ avail|ilewis,mkoppanen,lstrojny,dharmap,kraghuba,stevseea,colder,lwe,auroraeosrose,mike,rolland,cawa,msisolak,alan_k,rrichards,tal,mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabob,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,jani,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,raphael,danda,rbb,mboeren,dougm,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,ianh,k.schroeder,dcowgill,jerenkrantz,jay,ddhill,jorton,thetaphi,abies,vincent,goba,dmitry,pajoye,shie,rafi,magnus,tony2001,johannes,dbs,skoduru! ,nrathna,jesus,gopalv,bjori,nlopess,wrowe,shire,zoe,scottmac,t2man,dsp,davidw,ab5602,nicholsr,lsmith,cellog,davidc,felipe,robinf,jmessa,philip,sixd,gwynne,ant,kalle,mattwil,sfox,hnangelo,ohill,indeyets,felixdv,mich4ld,lbarnaud,cseiler,sean,dkelsey,tabe,ericstewart,mbeccati,sebs,garretts,guenter,srinatar|php/php-src,pecl,phpdoc,phd,web/doc,web/doc-editor +# Engine karma is further restricted (this line MUST come after lines granting +# php-src karma and before lines granting Zend/TSRM karma) +unavail||php/php-src/*/Zend,php/php-src/*/TSRM + # Some people have access to tests in the Engine avail|ilewis,magnus,michael,zoe,jmessa,sfox,tomerc,felixdv|php/php-src/*/Zend/tests @@ -210,7 +210,6 @@ avail|momo|php/php-src/*/ext/standard avail|mbretter,philippe|pecl/radius,pecl/mqseries avail|mcmontero,blade106,scottmac|pecl/imagick -avail|bjori|php/php-src/*/ext/date avail|mg|pecl/lzf avail|mg|pecl/tcpwrap avail|mg|pecl/xdiff @@ -263,8 +262,6 @@ avail|davidc|web/php avail|sankazim|pecl/amfext avail|doury|pecl/ims -avail|janisto|pear/modules/Validate,pear/peardoc -avail|tias|pear/modules/PEAR_Frontend_Web,pear/peardoc avail|va|pecl/yami avail|msaraujo,mansion|pecl/lua avail|merletenney,kirtig,harveyrd,kuntakinte14,ebatutis,tex,vsavchuk|pecl/intl,pecl/unicode,phpdoc/en/*/reference/intl,php/php-src/*/ext/intl @@ -280,7 +277,6 @@ avail|mlively|pecl/runkit,pecl/classkit avail|thierry|pecl/fam avail|hamano|pecl/tcc -avail|tetsuya|pear/modules/Services_Yahoo_JP avail|graham,myang|pecl/optimizer avail|joonas|pecl/llvm avail|indeyets|pecl/spread,pecl/xslcache Modified: SVNROOT/pear_avail === --- SVNROOT/pear_avail 2009-08-01 18:29:26 UTC (rev 286630) +++ SVNROOT/pear_avail 2009-08-01 18:45:28 UTC (rev 286631) @@ -5,10 +5,6 @@ unavail -# Gwynne has temporary access to everything in order to sort out early SVN -# problems. This line should be removed ASAP. -avail|gwynne - # But members of the PHP Group get access to everything. avail|andi,andrei,jimw,rasmus,rubys,sas,ssb,thies,zeev,shane -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /SVNROOT/ global_avail pear_avail
gwynne Sat, 01 Aug 2009 19:19:10 + Revision: http://svn.php.net/viewvc?view=revisionrevision=286632 Log: another fix spotted by bjori Changed paths: U SVNROOT/global_avail U SVNROOT/pear_avail Modified: SVNROOT/global_avail === --- SVNROOT/global_avail2009-08-01 18:45:28 UTC (rev 286631) +++ SVNROOT/global_avail2009-08-01 19:19:10 UTC (rev 286632) @@ -26,6 +26,9 @@ # php-src karma and before lines granting Zend/TSRM karma) unavail||php/php-src/*/Zend,php/php-src/*/TSRM +# PEAR bits in the main php-src module +avail|cox,mj,vblavet,dickmann,tal,jmcastagnetto,alexmerz,cellog,pajoye,timj,clay,dufuz,bjori,davidc,saltybeagle,derick|php/php-src/*/pear + # Some people have access to tests in the Engine avail|ilewis,magnus,michael,zoe,jmessa,sfox,tomerc,felixdv|php/php-src/*/Zend/tests Modified: SVNROOT/pear_avail === --- SVNROOT/pear_avail 2009-08-01 18:45:28 UTC (rev 286631) +++ SVNROOT/pear_avail 2009-08-01 19:19:10 UTC (rev 286632) @@ -20,7 +20,7 @@ avail|andrew,moh,sterling,jon,jlp,sebastian,troels,urs,jpm,adaniel,tuupola,mj,metallic,richard,aj,andre,zimt,uw,bjoern,chregu,tfromm,subjective,cox,jmcastagnetto,kaltoft,jccann,amiller,mansion,zyprexia,alexmerz,yavo,clambert,vblavet,bernd,nohn,mog,mfischer,kvn,jan,eru,murahachibu,hayk,cain,nhoizey,aditus,ludoo,imajes,graeme,eriksson,jasonlotito,dallen,lsmith,timmyg,artka,tal,kk,cmv,rashid,alexios,baba,reywob,ekilfoil,antonio,sagi,jrust,mehl,dickmann,alan_k,fab,thku,busterb,miked,pgc,ctrlsoft,tychay,dexter,sachat,svenasse,mw21st,arahn,matthias,dias,jfbus,derick,chief,sigi,tony,olivier,nepto,voyteck,cnb,dams,peterk,ernani,edink,quipo,egnited,arnaud,mcmontero,mbretter,nicos,philip,xnoguer,sjr,meebey,jellybob,darkelder,max,dcowgill,daggilli,kuboa,ncowham,sklar,krausbn,ordnas,avb,polone,inorm,llucax,davey,moosh,et,mscifo,yunosh,thesaur,hburbach,ohill,cellog,hlellelid,rmcclain,vincent,heino,neufeind,didou,schst,alain,mrcool,mroch,mike,vgoebbels,mixtli,farell,pmjones,jw,darknoise,! tarjei,toby,danielc,ieure,metz,gurugeek,rich_y,asnagy,muesli,hcebay,khassani,zamana,aidan,dufuz,sergiosgc,kouber,enemerson,iridium,ortega,guillaume,koyama,scottmattocks,eric,wenz,goetsch,tacker,aph,bolk,cweiske,amt,jinxidoru,cbleek,nosey,abaker,jayeshsh,fredericpoeydome,sean,toggg,navin,pfischer,davidc,markus,cross,crafics,roychri,kore,troehr,sfrausch,bdunlap,drewish,firman,epte,timj,taak,ssuceveanu,bate,anant,hirose31,amistry,thesee,jausions,ostborn,wiesemann,amir,clockwerx|pear/packages,pear/peardoc,pear2 # PEAR bits in the main php-src module -avail|cox,mj,vblavet,dickmann,tal,jmcastagnetto,alexmerz,cellog,pajoye,timj,clay,dufuz,bjori,davidc,saltybeagle,derick|php/php-src/pear,pear/pear-core +avail|cox,mj,vblavet,dickmann,tal,jmcastagnetto,alexmerz,cellog,pajoye,timj,clay,dufuz,bjori,davidc,saltybeagle,derick|pear/pear-core # PEAR website avail|wez,alan_k,chagenbu,cmv,cox,derick,dickmann,jon,mj,pajoye,richard,tal,antonio,alexmerz,jan,toby,draber,cellog,dufuz,danielc,lsmith,arnaud,davidc,wiesemann,jani,cweiske,saltybeagle,izi,clockwerx|pear/pearweb -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /SVNROOT/ commit-email.php
gwynne Fri, 31 Jul 2009 23:46:19 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=286604
Log:
utf-8 is a charset, not an encoding, as far as RFC2822 is concerned. This
wasn't causing any problems since the charset of the attachment isn't
necessarily used, but it's good to have it correct anyway
Changed paths:
U SVNROOT/commit-email.php
Modified: SVNROOT/commit-email.php
===
--- SVNROOT/commit-email.php2009-07-31 23:44:52 UTC (rev 286603)
+++ SVNROOT/commit-email.php2009-07-31 23:46:19 UTC (rev 286604)
@@ -200,7 +200,7 @@
$diff_data = wordwrap(base64_encode($commit_info['diffs']), 80, PHP_EOL,
TRUE);
$msg_body .= MIMEBODY
-Content-Type: text/x-diff; encoding=utf-8
+Content-Type: text/x-diff; charset=utf-8
Content-Disposition: attachment; filename=svn-diffs-{$REV}.txt
Content-Transfer-Encoding: base64
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /SVNROOT/ pre-commit
gwynne Wed, 29 Jul 2009 17:09:15 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=286524
Log:
Disable checks for commits to tags/. It was a good idea, but there are too many
cases where it would be legit and not enough cases of the protection being
needed.
Changed paths:
U SVNROOT/pre-commit
Modified: SVNROOT/pre-commit
===
--- SVNROOT/pre-commit 2009-07-29 16:52:16 UTC (rev 286523)
+++ SVNROOT/pre-commit 2009-07-29 17:09:15 UTC (rev 286524)
@@ -34,6 +34,9 @@
if (strncmp($changed_path, archived/, strlen(archived/)) === 0) {
fail(Commits to archived modules are not allowed.\n);
}
+
+/* Tags checks disabled. Too many special cases, not enough people making this
+mistake to make the extra work worth it.
// path contains /tags/
if (($tags_loc = strpos($changed_path, '/tags/')) !== FALSE) {
@@ -67,7 +70,7 @@
fail(Committing to a tag is not allowed.\n);
}
}
-
+*/
}
//
-
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: / pecl/phar/trunk/package.php pecl/phar/trunk/package.xml php/php-src/branches/PHP_5_3/ext/phar/package.php php/php-src/branches/PHP_5_3/ext/phar/package.xml php/php-src/trunk/ext/p
On Jul 29, 2009, at 12:29 PM, Greg Beaver wrote: cellog Wed, 29 Jul 2009 16:29:30 + Revision: http://svn.php.net/viewvc?view=revisionrevision=286521 Log: oops, released as beta instead of stable, Gwynne: svn rm tags/ RELEASE_2_0_0 fails, perhaps this can be allowed? I disabled the tags check completely. It was causing a lot more problems than it solved, much like the keywords check. -- Gwynne -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /SVNROOT/ hook-common.inc.php
gwynne Wed, 29 Jul 2009 18:29:12 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=286528
Log:
the ISO/UTF-8 junk should no longer be needed
Changed paths:
U SVNROOT/hook-common.inc.php
Modified: SVNROOT/hook-common.inc.php
===
--- SVNROOT/hook-common.inc.php 2009-07-29 17:35:19 UTC (rev 286527)
+++ SVNROOT/hook-common.inc.php 2009-07-29 18:29:12 UTC (rev 286528)
@@ -102,24 +102,13 @@
function find_user($author)
{
$usersDB = file(__DIR__ . '/users.db');
-$saw_last_ISO = FALSE;
foreach ($usersDB as $userline) {
list ($username, $fullname, $email) = explode(:, trim($userline));
-if ($username === 'ladderalice') {
-$saw_last_ISO = TRUE;
-}
if ($username === $author) {
-if ($saw_last_ISO !== TRUE) {
-$fullname = iconv(ISO-8859-1, UTF-8//TRANSLIT, $fullname);
-}
-$result = array($fullname, $email);
-break;
+return array($fullname, $email);
}
}
-if (!isset($result)) {
-fail(No such user.\n);
-}
-return $result;
+fail(No such user.\n);
}
function common_prefix($str1, $str2)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /SVNROOT/ commit-email.php
gwynne Mon, 27 Jul 2009 18:15:14 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=286425
Log:
pear_avail commits should go to pear lists, and no need for sending SVNROOT
commits to svn-migration anymore
Changed paths:
U SVNROOT/commit-email.php
Modified: SVNROOT/commit-email.php
===
--- SVNROOT/commit-email.php2009-07-27 17:51:08 UTC (rev 286424)
+++ SVNROOT/commit-email.php2009-07-27 18:15:14 UTC (rev 286425)
@@ -96,7 +96,8 @@
// Internals
'|^systems|' = array('syst...@php.net'),
-'|^SVNROOT|' = array('svn-migrat...@lists.php.net',
'php-cvs@lists.php.net'),
+'|^SVNROOT/pear_avail|' = array('pear-...@lists.php.net',
'pear-c...@lists.php.net'),
+'|^SVNROOT|' = array('php-cvs@lists.php.net'),
);
$fallback_addresses = array('php-cvs@lists.php.net');
$always_addresses = array('gwy...@php.net');
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /SVNROOT/
gwynne Sun, 26 Jul 2009 14:47:43 + Revision: http://svn.php.net/viewvc?view=revisionrevision=286358 Log: add secret.inc to ignored files Changed paths: _U SVNROOT/ Property changes on: SVNROOT ___ Modified: svn:ignore - users.db passwd.db + users.db passwd.db secret.inc -- 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/phar/ phar_object.c
gwynne Sun, 26 Jul 2009 15:52:50 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=286361
Log:
fix ZTS build
Changed paths:
U php/php-src/trunk/ext/phar/phar_object.c
Modified: php/php-src/trunk/ext/phar/phar_object.c
===
--- php/php-src/trunk/ext/phar/phar_object.c2009-07-26 15:14:18 UTC (rev
286360)
+++ php/php-src/trunk/ext/phar/phar_object.c2009-07-26 15:52:50 UTC (rev
286361)
@@ -941,7 +941,7 @@
++ext;
#if PHP_MAJOR_VERSION = 6
- if (phar_find_key(Z_ARRVAL_P(mimeoverride), ext,
strlen(ext)+1, (void **) val)) {
+ if (phar_find_key(Z_ARRVAL_P(mimeoverride), ext,
strlen(ext)+1, (void **) val TSRMLS_CC)) {
#else
if (SUCCESS == zend_hash_find(Z_ARRVAL_P(mimeoverride),
ext, strlen(ext)+1, (void **) val)) {
#endif
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /
gwynne Sat, 25 Jul 2009 14:28:54 + Revision: http://svn.php.net/viewvc?view=revisionrevision=284750 Log: preparing for PEAR2 import Changed paths: A pear2/ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /SVNROOT/ pre-commit
gwynne Sat, 25 Jul 2009 14:42:05 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=286303
Log:
correctly match /pear2 as well as /pear for the use of PEAR semantics
Changed paths:
U SVNROOT/pre-commit
Modified: SVNROOT/pre-commit
===
--- SVNROOT/pre-commit 2009-07-22 15:10:15 UTC (rev 286302)
+++ SVNROOT/pre-commit 2009-07-25 14:42:05 UTC (rev 286303)
@@ -59,7 +59,7 @@
// Check commit against it
$exit_val = 0;
foreach ($commit_info['changed_paths'] as $changed_path = $path_actions) {
-if (strncmp($changed_path, pear/, strlen(pear/)) === 0) {
+if (strncmp($changed_path, pear, strlen(pear)) === 0) {
$avail_lines = $pear_avail_db;
debug(Using PEAR avail.);
} else {
@@ -112,11 +112,11 @@
}
if ($exit_val) {
-if (strncmp($last_path, pear/, strlen(pear/)) === 0) {
+if (strncmp($last_path, pear, strlen(pear)) === 0) {
$access_contact_email = 'pear-gr...@php.net';
-} else if (strncmp($last_path, pecl/, strlen(pecl/)) === 0) {
+} else if (strncmp($last_path, pecl, strlen(pecl)) === 0) {
$access_contact_email = 'pecl-gr...@php.net';
-} else if (strncmp($last_path, phpdoc/, strlen(phpdoc/)) === 0) {
+} else if (strncmp($last_path, phpdoc, strlen(phpdoc)) === 0) {
$access_contact_email = 'php...@lists.php.net';
} else {
$access_contact_email = 'gr...@php.net';
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /SVNROOT/ hook-common.inc.php pre-commit
gwynne Sun, 26 Jul 2009 04:00:55 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=286349
Log:
minor whitespace quirk in debug output fixed. More importantly, the creation of
tags/ directories is now allowed subject to location-in-repo restrictions
Changed paths:
U SVNROOT/hook-common.inc.php
U SVNROOT/pre-commit
Modified: SVNROOT/hook-common.inc.php
===
--- SVNROOT/hook-common.inc.php 2009-07-26 03:46:22 UTC (rev 286348)
+++ SVNROOT/hook-common.inc.php 2009-07-26 04:00:55 UTC (rev 286349)
@@ -75,7 +75,7 @@
}
$final_paths[$actual_path] = $path_actions;
}
-debug(print_r($final_paths, 1));
+debug(trim(print_r($final_paths, 1)));
return $final_paths;
}
Modified: SVNROOT/pre-commit
===
--- SVNROOT/pre-commit 2009-07-26 03:46:22 UTC (rev 286348)
+++ SVNROOT/pre-commit 2009-07-26 04:00:55 UTC (rev 286349)
@@ -35,19 +35,39 @@
fail(Commits to archived modules are not allowed.\n);
}
-// path contains /tags/ AND
-// path was not added OR
-// path was not copied OR
-// path is not a directory OR
-// path's immediate ancestor is not tags/
-if (strpos($changed_path, '/tags/') !== FALSE
-(!in_array('added', $path_actions) ||
-!in_array('copied', $path_actions) ||
-substr($changed_path, -1) !== '/' ||
-substr(dirname($changed_path), -5) !== '/tags'))
-{
-fail(Committing to a tag is not allowed.\n);
+// path contains /tags/
+if (($tags_loc = strpos($changed_path, '/tags/')) !== FALSE) {
+$allowed_tag = FALSE;
+
+// path was added AND
+// path was copied AND
+// path is a directory AND
+// path's immediate ancestor is tags/
+if (in_array('added', $path_actions)
+in_array('copied', $path_actions)
+substr($changed_path, -1) === '/'
+substr(dirname($changed_path), -5) === '/tags')
+{
+debug(Tag {$changed_path} passes checks for tag creation.);
+$allowed_tag = TRUE;
+}
+// path was added AND
+// path does not contain any other structure directories AND
+// the first occurrence of /tags/ in path is at the end
+else if (in_array('added', $path_actions)
+ strpos($changed_path, /branches/) === FALSE
+ strpos($changed_path, /trunk/) === FALSE
+ $tags_loc === strlen($changed_path) - 6)
+{
+debug(Path {$changed_path} passes checks for tags directory
creation.);
+$allowed_tag = TRUE;
+}
+
+if (!$allowed_tag) {
+fail(Committing to a tag is not allowed.\n);
+}
}
+
}
//
-
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /SVNROOT/ commit-bugs.php commit-email.php commit-svnroot.php hook-common.inc.php post-commit pre-commit start-commit
gwynne Fri, 24 Jul 2009 18:54:54 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=284714
Log:
- Restructure hooks again. They now use a common include which does a bunch of
common stuff.
- Use PHP_EOL instead of a literal \n for commit emails. Paranoia.
- Now provide more information on copied paths (esp. for tagging)
- Creating tags by copying an existing directory is now allowed
- start-commit doesn't need to do anything
- reduce the number of times the path list is iterated in pre-commit
- Now mix and match the use of global and pear avail files on a per-path basis
- TODO: Parse the avail files only once instead of once per committed path
- Replace regexp with simple string ops for just about everything
- Don't bother storing the URL prefix as part of the bug info, nothing used that
- Remove worthless $Revision$ constants. Another thing nothing used.
Changed paths:
U SVNROOT/commit-bugs.php
U SVNROOT/commit-email.php
U SVNROOT/commit-svnroot.php
A SVNROOT/hook-common.inc.php
U SVNROOT/post-commit
U SVNROOT/pre-commit
U SVNROOT/start-commit
Modified: SVNROOT/commit-bugs.php
===
--- SVNROOT/commit-bugs.php 2009-07-24 18:08:42 UTC (rev 284713)
+++ SVNROOT/commit-bugs.php 2009-07-24 18:54:54 UTC (rev 284714)
@@ -5,7 +5,6 @@
// -
// Constants
-$version = substr('$Revision$', strlen('$Revision: '), -2);
$bug_pattern = '/(?:(pecl|pear|php)\s*)?(?:bug|#)[\s#:]*([0-9]+)/iuX';
$bug_url_prefixes = array(
'pear' = 'http://pear.php.net/bugs',
@@ -45,8 +44,8 @@
$bug['project'] = $matched_bug[1] === ? $bug_project_default : strtolower($matched_bug[1]);
$bug['number'] = intval($matched_bug[2]);
$bugid = $bug['project'] . $bug['number'];
-$bug['url_prefix'] = isset($bug_url_prefixes[$bug['project']]) ? $bug_url_prefixes[$bug['project']] : $bug_url_prefixes[''];
-$bug['url'] = $bug['url_prefix'] . '/' . $bug['number'];
+$url_prefix = isset($bug_url_prefixes[$bug['project']]) ? $bug_url_prefixes[$bug['project']] : $bug_url_prefixes[''];
+$bug['url'] = $url_prefix . '/' . $bug['number'];
$bug['status'] = 'unknown';
$bug['short_desc'] = '';
$bug_list[$bugid] = $bug;
Modified: SVNROOT/commit-email.php
===
--- SVNROOT/commit-email.php 2009-07-24 18:08:42 UTC (rev 284713)
+++ SVNROOT/commit-email.php 2009-07-24 18:54:54 UTC (rev 284714)
@@ -5,7 +5,6 @@
// -
// Constants
-$version = substr('$Revision$', strlen('$Revision: '), -2);
$smtp_server = '127.0.0.1';
$commit_email_list = array(
@@ -103,19 +102,6 @@
$always_addresses = array('gwy...@php.net');
// -
-function common_prefix($str1, $str2)
-{
-$result = ;
-$i = 0;
-$max = min(strlen($str1), strlen($str2));
-while ($i $max $str1[$i] === $str2[$i]) {
-$result .= $str1[$i];
-++$i;
-}
-return $result;
-}
-
-// -
// Build list of e-mail addresses and parent changed path
$emails_to = array();
$parent_path = '/' . $commit_info['dirs_changed'][0];
@@ -150,22 +136,21 @@
// Process bugs
$bugs_body = '';
if (isset($bug_list) count($bug_list) 0) {
-$bugs_body = count($bug_list) 1 ? \nBugs: : \nBug: ;
+$bugs_body = PHP_EOL . (count($bug_list) 1 ? Bugs: : Bug: );
foreach ($bug_list as $n = $bug) {
if (isset($bug['error'])) {
$status = '(error getting bug information)';
} else {
$status = ({$bug['status']}) {$bug['short_desc']};
}
-$bugs_body .= {$bug['url']} {$status}\n ;
+$bugs_body .= {$bug['url']} {$status} . PHP_EOL . ;
}
}
// -
// Process changed paths
$paths_list = $parent_path;
-foreach ($commit_info['changed_paths'] as $changed_path) {
-$changed_path = trim(strstr($changed_path, ' '));
+foreach ($commit_info['changed_paths'] as $changed_path = $path_actions) {
if (substr($changed_path, -1) !== '/') {
$paths_list .= ' ' . substr($changed_path, strlen($parent_path) - 1);
}
@@ -179,13 +164,13 @@
$email_date = date(DATE_RFC2822, $commit_info['date']);
$fullname = =?utf-8?q? . imap_8bit(str_replace(array('?', ' '), array('=3F', '_'), $commit_info['author_name'])) . ?=;
$email_list = implode(', ', $emails_to);
[PHP-CVS] svn: SVNROOT/ commit-bugs.php
gwynne Thu, 23 Jul 2009 15:55:12 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=284653
Log:
fix case-sensitivity problem in bug matcher
Changed paths:
U SVNROOT/commit-bugs.php
Modified: SVNROOT/commit-bugs.php
===
--- SVNROOT/commit-bugs.php 2009-07-23 15:48:04 UTC (rev 284652)
+++ SVNROOT/commit-bugs.php 2009-07-23 15:55:12 UTC (rev 284653)
@@ -25,7 +25,7 @@
//
-
// Pick the default bug project out the of the path in the first changed dir
-switch (substr($commit_info['dirs_changed'][0], 0, 4)) {
+switch (strtolower(substr($commit_info['dirs_changed'][0], 0, 4))) {
case 'pear':
$bug_project_default = 'pear';
break;
@@ -42,7 +42,7 @@
$bug_list = array();
foreach ($matched_bugs as $matched_bug) {
$bug = array();
-$bug['project'] = $matched_bug[1] === ? $bug_project_default :
$matched_bug[1];
+$bug['project'] = $matched_bug[1] === ? $bug_project_default :
strtolower($matched_bug[1]);
$bug['number'] = intval($matched_bug[2]);
$bugid = $bug['project'] . $bug['number'];
$bug['url_prefix'] = isset($bug_url_prefixes[$bug['project']]) ?
$bug_url_prefixes[$bug['project']] : $bug_url_prefixes[''];
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: SVNROOT/ commit-email.php
gwynne Thu, 23 Jul 2009 17:06:43 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=284661
Log:
fix the issue with non-confluent parent paths (multi-project commits)
Changed paths:
U SVNROOT/commit-email.php
Modified: SVNROOT/commit-email.php
===
--- SVNROOT/commit-email.php2009-07-23 17:04:24 UTC (rev 284660)
+++ SVNROOT/commit-email.php2009-07-23 17:06:43 UTC (rev 284661)
@@ -118,7 +118,7 @@
//
-
// Build list of e-mail addresses and parent changed path
$emails_to = array();
-$parent_path = $commit_info['dirs_changed'][0];
+$parent_path = '/' . $commit_info['dirs_changed'][0];
foreach ($commit_info['dirs_changed'] as $changed_path) {
foreach ($commit_email_list as $regex = $email_list) {
@@ -127,12 +127,13 @@
break;
}
}
-if ($changed_path === '/') {
-$parent_path = '';
-} else {
-$parent_path = common_prefix($parent_path, $changed_path);
-}
+$parent_path = common_prefix($parent_path, '/' . ($changed_path === '/' ?
'' : $changed_path));
}
+$parent_path = dirname($parent_path . '~');
+if ($parent_path !== '/') {
+$parent_path .= '/';
+}
+
if (count($emails_to) === 0) {
$emails_to = $fallback_addresses;
}
@@ -162,11 +163,11 @@
//
-
// Process changed paths
-$paths_list = $parent_path === '' ? '/' : $parent_path;
+$paths_list = $parent_path;
foreach ($commit_info['changed_paths'] as $changed_path) {
$changed_path = trim(strstr($changed_path, ' '));
if (substr($changed_path, -1) !== '/') {
-$paths_list .= ' ' . substr($changed_path, strlen($parent_path));
+$paths_list .= ' ' . substr($changed_path, strlen($parent_path) - 1);
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: SVNROOT/ commit-bugs.php
gwynne Wed, 22 Jul 2009 18:22:42 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=284619
Log:
allow for explicit php prefix in bug numbers
Changed paths:
U SVNROOT/commit-bugs.php
Modified: SVNROOT/commit-bugs.php
===
--- SVNROOT/commit-bugs.php 2009-07-22 18:13:38 UTC (rev 284618)
+++ SVNROOT/commit-bugs.php 2009-07-22 18:22:42 UTC (rev 284619)
@@ -6,10 +6,11 @@
//
-
// Constants
$version = substr('$Revision$', strlen('$Revision: '), -2);
-$bug_pattern = '/(?:(pecl|pear)\s*)?(?:bug|#)[\s#:]*([0-9]+)/iuX';
+$bug_pattern = '/(?:(pecl|pear|php)\s*)?(?:bug|#)[\s#:]*([0-9]+)/iuX';
$bug_url_prefixes = array(
'pear' = 'http://pear.php.net/bugs',
'pecl' = 'http://pecl.php.net/bugs',
+'php' = 'http://bugs.php.net',
'' = 'http://bugs.php.net',
);
$bug_rpc_url = 'http://bugs.php.net/rpc.php';
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: SVNROOT/ commit-bugs.php
gwynne Wed, 22 Jul 2009 18:29:28 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=284620
Log:
whoops. fix the fix.
Changed paths:
U SVNROOT/commit-bugs.php
Modified: SVNROOT/commit-bugs.php
===
--- SVNROOT/commit-bugs.php 2009-07-22 18:22:42 UTC (rev 284619)
+++ SVNROOT/commit-bugs.php 2009-07-22 18:29:28 UTC (rev 284620)
@@ -34,6 +34,7 @@
break;
default:
$bug_project_default = '';
+break;
}
//
-
@@ -56,7 +57,7 @@
include __DIR__ . '/secret.inc';
foreach ($bug_list as $k = $bug) {
// Only do this for core PHP bugs
-if ($bug['project'] !== '') {
+if ($bug['project'] !== '' $bug['project'] !== 'php') {
continue;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: SVNROOT/ commit-email.php
gwynne Tue, 21 Jul 2009 08:43:49 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=284472
Log:
whoops, bug links go with the log message
Changed paths:
U SVNROOT/commit-email.php
Modified: SVNROOT/commit-email.php
===
--- SVNROOT/commit-email.php2009-07-21 08:33:19 UTC (rev 284471)
+++ SVNROOT/commit-email.php2009-07-21 08:43:49 UTC (rev 284472)
@@ -192,10 +192,10 @@
\r\n .
Log:\r\n .
{$commit_info['log_message']}\r\n .
+{$bugs_body}\r\n .
\r\n .
Changed paths:\r\n .
\t . implode(\r\n\t, $commit_info['changed_paths']) . \r\n .
-{$bugs_body}\r\n .
str_replace(\n, \r\n, $diffs_string);
if ($diffs_string === NULL) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: SVNROOT/ commit-email.php
gwynne Tue, 21 Jul 2009 11:47:57 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=284485
Log:
- fix bjori's newlines once and for all, I hope- a bit more reorganization of
the code- use easier-to-read-and-understand heredocs- allow a slightly longer
subject- give the diff attachment a more useful name- don't use inconsistent
tabbing anymore- a couple extra comments
Changed paths:
U SVNROOT/commit-email.php
Modified: SVNROOT/commit-email.php
===
--- SVNROOT/commit-email.php2009-07-21 11:36:18 UTC (rev 284484)
+++ SVNROOT/commit-email.php2009-07-21 11:47:57 UTC (rev 284485)
@@ -146,72 +146,89 @@
($diffs_length 8192 ? NULL : $commit_info['diffs']));
//
-
-// Build e-mail
-$boundary = sha1({$commit_info['author']}{$commit_info['date']});
-$messageid = {$commit_info['author']}-{$commit_info['date']}-{$REV}- .
mt_rand();
-$subject = svn: . ($parent_path === '' ? '/' : $parent_path);
-
-foreach ($commit_info['changed_paths'] as $changed_path) {
-$changed_path = trim(strstr($changed_path, ' '));
-if (substr($changed_path, -1) !== '/') {
-$subject .= ' ' . substr($changed_path, strlen($parent_path));
-}
-}
-$subject = substr($subject, 0, 950); // Max SMTP line length = 998. Some slop
in this value.
-
-$fullname = =?utf-8?q? . imap_8bit(str_replace(array('?', ' '), array('=3F',
'_'), $commit_info['author_name'])) . ?=;
-
-$msg_headers = From: {$fullname} {$commit_info['author']...@php.net\r\n .
- To: . implode(', ', $emails_to) . \r\n .
- Message-ID: svn{$message...@svn.php.net\r\n .
- Date: . date(DATE_RFC822, $commit_info['date']) . \r\n .
- Subject: {$subject}\r\n .
- MIME-Version: 1.0\r\n .
- Content-Type: multipart/mixed; boundary=\{$boundary}\\r\n;
-
+// Process bugs
$bugs_body = '';
if (isset($bug_list) count($bug_list) 0) {
-$bugs_body = count($bug_list) 1 ? Bugs: : Bug: ;
+$bugs_body = count($bug_list) 1 ? \nBugs: : \nBug: ;
foreach ($bug_list as $n = $bug) {
if (isset($bug['error'])) {
$status = '(error getting bug information)';
} else {
$status = ({$bug['status']}) {$bug['short_desc']};
}
-$bugs_body .= {$bug['url']} {$status}\r\n ;
+$bugs_body .= {$bug['url']} {$status}\n ;
}
}
-$msg_body = --{$boundary}\r\n .
-Content-Type: text/plain; charset=\utf-8\\r\n .
-Content-Transfer-Encoding: 8bit\r\n .
-\r\n .
-{$commit_info['author']}\t\t . date(DATE_RFC2822,
$commit_info['date']) . \r\n .
-\r\n .
-Revision:
http://svn.php.net/viewvc?view=revisionrevision={$REV}\r\n; .
-\r\n .
-Log:\r\n .
-{$commit_info['log_message']}\r\n .
-{$bugs_body}\r\n .
-\r\n .
-Changed paths:\r\n .
-\t . implode(\r\n\t, $commit_info['changed_paths']) . \r\n .
-str_replace(\n, \r\n, $diffs_string);
+//
-
+// Process changed paths
+$paths_list = $parent_path === '' ? '/' : $parent_path;
+foreach ($commit_info['changed_paths'] as $changed_path) {
+$changed_path = trim(strstr($changed_path, ' '));
+if (substr($changed_path, -1) !== '/') {
+$paths_list .= ' ' . substr($changed_path, strlen($parent_path));
+}
+}
+//
-
+// Build e-mail
+$boundary = sha1({$commit_info['author']}{$commit_info['date']});
+$messageid = {$commit_info['author']}-{$commit_info['date']}-{$REV}- .
mt_rand();
+$subject = substr(svn: {$paths_list}, 0, 970); // Max SMTP line length =
998. Some slop in this value.
+$email_date = date(DATE_RFC2822, $commit_info['date']);
+$fullname = =?utf-8?q? . imap_8bit(str_replace(array('?', ' '), array('=3F',
'_'), $commit_info['author_name'])) . ?=;
+$email_list = implode(', ', $emails_to);
+$readable_path_list = . implode(\n,
$commit_info['changed_paths']);
+$nspaces = str_repeat( , max(1, 72 - strlen($commit_info['author']) -
strlen($email_date)));
+
+$msg_body = MIMEBODY
+From: {$fullname} {$commit_info['author']...@php.net
+To: {$email_list}
+Message-ID: svn{$message...@svn.php.net
+Date: {$email_date}
+Subject: {$subject}
+MIME-Version: 1.0
+Content-Type: multipart/mixed; boundary={$boundary}
+
+--{$boundary}
+Content-Type: text/plain; charset=utf-8
+Content-Transfer-Encoding: 8bit
+
+{$commit_info['author']}{$nspaces}{$email_date}
+
+Revision: http://svn.php.net/viewvc?view=revisionrevision={$REV}
+
+Log:
[PHP-CVS] svn: SVNROOT/ post-commit
gwynne Tue, 21 Jul 2009 11:52:10 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=284486
Log:
oopsy. teehee... log messages need their newlines in order to grow up big and
strong
Changed paths:
U SVNROOT/post-commit
Modified: SVNROOT/post-commit
===
--- SVNROOT/post-commit 2009-07-21 11:47:57 UTC (rev 284485)
+++ SVNROOT/post-commit 2009-07-21 11:52:10 UTC (rev 284486)
@@ -52,7 +52,7 @@
'changed_paths' = run_svnlook('changed'),
'dirs_changed' = run_svnlook('dirs-changed'),
'author' = ($is_DEBUG getenv(DEBUGUSER)) ? getenv(DEBUGUSER) :
trim(implode('', run_svnlook('author'))),
-'log_message' = trim(implode('', run_svnlook('log'))),
+'log_message' = trim(implode(\n, run_svnlook('log'))),
'date' = strtotime(substr(trim(implode('', run_svnlook('date'))), 0,
strlen(-00-00 00:00:00 +))),
'diffs' = implode(\n, run_svnlook('diff')),
);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: SVNROOT/ global_avail
gwynne Tue, 21 Jul 2009 12:28:37 + Revision: http://svn.php.net/viewvc?view=revisionrevision=284489 Log: php-cmake module karma Changed paths: U SVNROOT/global_avail Modified: SVNROOT/global_avail === --- SVNROOT/global_avail2009-07-21 12:01:26 UTC (rev 284488) +++ SVNROOT/global_avail2009-07-21 12:28:37 UTC (rev 284489) @@ -357,4 +357,7 @@ # phpruntests karma avail|zoe,spriebsch,g2|php/phpruntests +# cmake karma (GSOC 2008 project) +avail|gloob,pierre|php/cmake + # 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: php/
gwynne Tue, 21 Jul 2009 12:28:42 + Revision: http://svn.php.net/viewvc?view=revisionrevision=284490 Log: php-cmake module dirs Changed paths: A php/cmake/ A php/cmake/branches/ A php/cmake/tags/ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: SVNROOT/ commit-bugs.php
gwynne Wed, 22 Jul 2009 01:16:33 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=284572
Log:
ws, cs, and fixing Rasmus' substr() bug
Changed paths:
U SVNROOT/commit-bugs.php
Modified: SVNROOT/commit-bugs.php
===
--- SVNROOT/commit-bugs.php 2009-07-22 00:58:57 UTC (rev 284571)
+++ SVNROOT/commit-bugs.php 2009-07-22 01:16:33 UTC (rev 284572)
@@ -24,11 +24,16 @@
//
-
// Pick the default bug project out the of the path in the first changed dir
-switch (substr(trim($commit_info['dirs_changed'][0]),4)) {
-case 'pear': $bug_project_default = 'pear'; break;
-case 'pecl': $bug_project_default = 'pecl'; break;
-default: $bug_project_default = '';
-}
+switch (substr($commit_info['dirs_changed'][0], 0, 4)) {
+case 'pear':
+$bug_project_default = 'pear';
+break;
+case 'pecl':
+$bug_project_default = 'pecl';
+break;
+default:
+$bug_project_default = '';
+}
//
-
// Process the matches
@@ -48,7 +53,7 @@
//
-
// Make an RPC call for each bug
include __DIR__ . '/secret.inc';
-foreach ($bug_list as $k=$bug) {
+foreach ($bug_list as $k = $bug) {
// Only do this for core PHP bugs
if ($bug['project'] !== '') {
continue;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: SVNROOT/ commit-bugs.php
gwynne Wed, 22 Jul 2009 03:05:15 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=284576
Log:
first match is always set. check it for empty string instead
Changed paths:
U SVNROOT/commit-bugs.php
Modified: SVNROOT/commit-bugs.php
===
--- SVNROOT/commit-bugs.php 2009-07-22 02:58:19 UTC (rev 284575)
+++ SVNROOT/commit-bugs.php 2009-07-22 03:05:15 UTC (rev 284576)
@@ -40,7 +40,7 @@
$bug_list = array();
foreach ($matched_bugs as $matched_bug) {
$bug = array();
-$bug['project'] = isset($matched_bug[1]) ? $matched_bug[1] :
$bug_project_default;
+$bug['project'] = $matched_bug[1] === ? $bug_project_default :
$matched_bug[1];
$bug['number'] = intval($matched_bug[2]);
$bugid = $bug['project'] . $bug['number'];
$bug['url_prefix'] = isset($bug_url_prefixes[$bug['project']]) ?
$bug_url_prefixes[$bug['project']] : $bug_url_prefixes[''];
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: SVNROOT/ commit-email.php
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/ 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
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
[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
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: SVNROOT/ global_avail
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
[PHP-CVS] svn: SVNROOT/ pre-commit
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
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
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
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
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
[PHP-CVS] svn: SVNROOT/ global_avail
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_avail2009-07-19 23:58:43 UTC (rev 284401) +++ SVNROOT/global_avail2009-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
[PHP-CVS] svn: SVNROOT/ commit-svnroot.php
gwynne Mon, 20 Jul 2009 04:42:01 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=284414
Changed paths:
U SVNROOT/commit-svnroot.php
Log:
oops, stderr-STDERR
Modified: SVNROOT/commit-svnroot.php
===
--- SVNROOT/commit-svnroot.php 2009-07-20 04:40:31 UTC (rev 284413)
+++ SVNROOT/commit-svnroot.php 2009-07-20 04:42:01 UTC (rev 284414)
@@ -25,7 +25,7 @@
}
chdir(__DIR__);
exec('exec svn update', $output, $status);
-fwrite(stderr, implode(\n, $output) . \n);
+fwrite(STDERR, implode(\n, $output) . \n);
if ($status != 0) {
fail(svn update on SVNROOT failed with exit code {$status}!\n);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: SVNROOT/ commit-bugs.php
gwynne Mon, 20 Jul 2009 04:44:42 + Revision: http://svn.php.net/viewvc?view=revisionrevision=284415 Changed paths: U SVNROOT/commit-bugs.php Log: gah, blasted debugging issues Modified: SVNROOT/commit-bugs.php === --- SVNROOT/commit-bugs.php 2009-07-20 04:42:01 UTC (rev 284414) +++ SVNROOT/commit-bugs.php 2009-07-20 04:44:42 UTC (rev 284415) @@ -77,7 +77,7 @@ } $ch = curl_init(); -curl_setopt_array(array( +curl_setopt_array($ch, array( CURLOPT_URL = $bug_rpc_url, CURLOPT_RETURNTRANSFER = TRUE, CURLOPT_POST = TRUE, -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: SVNROOT/ commit-email.php post-commit
gwynne Fri, 17 Jul 2009 11:28:19 +
URL: http://svn.php.net/viewvc?view=revisionrevision=284250
Changed paths:
U SVNROOT/commit-email.php
U SVNROOT/post-commit
Log:
cleanliness in commit-email, use a consistent DEBUG flag instead of repeating
annoying if checks
Modified: SVNROOT/commit-email.php
===
--- SVNROOT/commit-email.php2009-07-17 11:13:51 UTC (rev 284249)
+++ SVNROOT/commit-email.php2009-07-17 11:28:19 UTC (rev 284250)
@@ -211,13 +211,13 @@
wordwrap(base64_encode($diffs), 80, \r\n, TRUE) . \r\n;
}
-$msg_body .= \r\n--{$boundary}--\r\n;
+$msg_body .= \r\n--{$boundary}--;
$complete_email = $msg_headers . \r\n . str_replace(\r\n.\r\n,
\r\n..\r\n, $msg_body);
//
-
// Send e-mail
-if (isset($_ENV['DEBUG']) $_ENV['DEBUG'] == 'DEBUG') {
+if ($is_DEBUG) {
$socket = fopen(php://stdout, w);
} else {
$socket = fsockopen($smtp_server, getservbyname('smtp', 'tcp'), $errno);
@@ -238,7 +238,9 @@
.\r\n .
QUIT\r\n);
-$discard = stream_get_contents($socket);
+if (!$is_DEBUG) {
+$discard = stream_get_contents($socket);
+}
fclose($socket);
?
Modified: SVNROOT/post-commit
===
--- SVNROOT/post-commit 2009-07-17 11:13:51 UTC (rev 284249)
+++ SVNROOT/post-commit 2009-07-17 11:28:19 UTC (rev 284250)
@@ -16,6 +16,7 @@
//
-
// Constants
$version = substr('$Revision$', strlen('$Revision: '), -2);
+$is_DEBUG = (isset($_ENV['DEBUG']) $_ENV['DEBUG'] === 'DEBUG');
//
-
// Version check
@@ -63,7 +64,7 @@
//
-
// If SVNROOT had a commit, we need to update the admin copy
if ($SVNROOT_changed) {
-if (isset($_ENV['DEBUG']) $_ENV['DEBUG'] == 'DEBUG') {
+if ($is_DEBUG) {
print Updating SVNROOT...\n;
}
chdir(dirname(__FILE__));
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: SVNROOT/ pre-commit
gwynne Fri, 17 Jul 2009 11:40:08 +
URL: http://svn.php.net/viewvc?view=revisionrevision=284252
Changed paths:
U SVNROOT/pre-commit
Log:
disable the keywords check. sigh.
Modified: SVNROOT/pre-commit
===
--- SVNROOT/pre-commit 2009-07-17 11:35:10 UTC (rev 284251)
+++ SVNROOT/pre-commit 2009-07-17 11:40:08 UTC (rev 284252)
@@ -185,7 +185,9 @@
}
//
-
+// CHECK DISABLED BY POPULAR SCREAMING
// Changing text files requires svn:keywords set
+/*
$paths_added = array_filter($paths_changed, create_function('$v', 'return
($v[0] === A);'));
foreach ($paths_added as $path_added) {
preg_match('/^([^[:space:]]+)[[:space:]]+(.*)$/uX', $path_added, $matches);
@@ -218,6 +220,7 @@
print DEBUG: File is binary. Moving on.\n;
}
}
+*/
exit(0);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: SVNROOT/ commit-email.php
gwynne Fri, 17 Jul 2009 12:39:24 +
URL: http://svn.php.net/viewvc?view=revisionrevision=284257
Changed paths:
U SVNROOT/commit-email.php
Log:
significantly improve email subject handling. I hope. Also make the message ID
more useful.
Modified: SVNROOT/commit-email.php
===
--- SVNROOT/commit-email.php2009-07-17 12:31:58 UTC (rev 284256)
+++ SVNROOT/commit-email.php2009-07-17 12:39:24 UTC (rev 284257)
@@ -103,6 +103,19 @@
$always_addresses = array('gwy...@php.net');
//
-
+function common_prefix($str1, $str2)
+{
+$result = ;
+$i = 0;
+$max = min(strlen($str1), strlen($str2));
+while ($i $max $str1[$i] === $str2[$i]) {
+$result .= $str1[$i];
+++$i;
+}
+return $result;
+}
+
+//
-
// Get info from commit
$commit_info = run_svnlook('info');
$commit_user = trim($commit_info[0]);
@@ -144,11 +157,13 @@
break;
}
}
-if (substr_count($changed_path, '/') substr_count($parent_path, '/')) {
-$parent_path = $changed_path;
+if ($changed_path === '/') {
+$parent_path = '';
+} else {
+$parent_path = common_prefix($parent_path, $changed_path);
}
}
-if (count($emails_to) == 0) {
+if (count($emails_to) === 0) {
$emails_to = $fallback_addresses;
}
$emails_to = array_merge($emails_to, $always_addresses);
@@ -165,12 +180,12 @@
//
-
// Build e-mail
$boundary = sha1({$commit_user}{$commit_date});
-$messageid = {$boundary} . mt_rand();
-$subject = svn: {$parent_path};
+$messageid = {$commit_user}-{$commit_date}-{$REV}- . mt_rand();
+$subject = svn: . ($parent_path === '' ? '/' : $parent_path);
foreach ($changed_paths as $changed_path) {
$changed_path = trim(strstr($changed_path, ' '));
if (substr($changed_path, -1) !== '/') {
-$subject .= ' ' . substr($changed_path, $parent_path === '/' ? 0 :
strlen($parent_path));
+$subject .= ' ' . substr($changed_path, strlen($parent_path));
}
}
$subject = substr($subject, 0, 950); // Max SMTP line length = 998. Some slop
in this value.
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: php/php-src/trunk/ php.ini-development php.ini-production
gwynne Fri, 17 Jul 2009 13:22:44 + URL: http://svn.php.net/viewvc?view=revisionrevision=284259 Changed paths: U php/php-src/trunk/php.ini-development U php/php-src/trunk/php.ini-production Log: document the hash name functionality available since 5.3 Modified: php/php-src/trunk/php.ini-development === --- php/php-src/trunk/php.ini-development 2009-07-17 13:17:20 UTC (rev 284258) +++ php/php-src/trunk/php.ini-development 2009-07-17 13:22:44 UTC (rev 284259) @@ -1614,6 +1614,9 @@ ; Possible Values ; 0 (MD5 128 bits) ; 1 (SHA-1 160 bits) +; This option may also be set to the name of any hash function supported by +; the hash extension. A list of available hashes is returned by the hash_alogs() +; function. ; http://php.net/session.hash-function session.hash_function = 0 Modified: php/php-src/trunk/php.ini-production === --- php/php-src/trunk/php.ini-production2009-07-17 13:17:20 UTC (rev 284258) +++ php/php-src/trunk/php.ini-production2009-07-17 13:22:44 UTC (rev 284259) @@ -1622,6 +1622,9 @@ ; Possible Values ; 0 (MD5 128 bits) ; 1 (SHA-1 160 bits) +; This option may also be set to the name of any hash function supported by +; the hash extension. A list of available hashes is returned by the hash_alogs() +; function. ; http://php.net/session.hash-function session.hash_function = 0 -- 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/ php.ini-development php.ini-production
gwynne Fri, 17 Jul 2009 13:22:56 + URL: http://svn.php.net/viewvc?view=revisionrevision=284260 Changed paths: U php/php-src/branches/PHP_5_3/php.ini-development U php/php-src/branches/PHP_5_3/php.ini-production Log: MFH: document the hash name functionality available since 5.3 Modified: php/php-src/branches/PHP_5_3/php.ini-development === --- php/php-src/branches/PHP_5_3/php.ini-development2009-07-17 13:22:44 UTC (rev 284259) +++ php/php-src/branches/PHP_5_3/php.ini-development2009-07-17 13:22:56 UTC (rev 284260) @@ -1614,6 +1614,9 @@ ; Possible Values ; 0 (MD5 128 bits) ; 1 (SHA-1 160 bits) +; This option may also be set to the name of any hash function supported by +; the hash extension. A list of available hashes is returned by the hash_alogs() +; function. ; http://php.net/session.hash-function session.hash_function = 0 Modified: php/php-src/branches/PHP_5_3/php.ini-production === --- php/php-src/branches/PHP_5_3/php.ini-production 2009-07-17 13:22:44 UTC (rev 284259) +++ php/php-src/branches/PHP_5_3/php.ini-production 2009-07-17 13:22:56 UTC (rev 284260) @@ -1622,6 +1622,9 @@ ; Possible Values ; 0 (MD5 128 bits) ; 1 (SHA-1 160 bits) +; This option may also be set to the name of any hash function supported by +; the hash extension. A list of available hashes is returned by the hash_alogs() +; function. ; http://php.net/session.hash-function session.hash_function = 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/session/ session.c tests/031.phpt
gwynne Fri, 17 Jul 2009 14:21:31 +
URL: http://svn.php.net/viewvc?view=revisionrevision=284267
Changed paths:
U php/php-src/trunk/ext/session/session.c
A php/php-src/trunk/ext/session/tests/031.phpt
Log:
fix crash when session hash function generated long hashes with
hash_bits_per_character larger than 4
Modified: php/php-src/trunk/ext/session/session.c
===
--- php/php-src/trunk/ext/session/session.c 2009-07-17 14:11:45 UTC (rev
284266)
+++ php/php-src/trunk/ext/session/session.c 2009-07-17 14:21:31 UTC (rev
284267)
@@ -284,7 +284,7 @@
unsigned char *digest;
int digest_len;
int j;
- char *buf;
+ char *buf, *outid;
struct timeval tv;
zval **array;
zval **token;
@@ -332,6 +332,7 @@
efree(buf);
return NULL;
}
+ efree(buf);
if (PS(entropy_length) 0) {
int fd;
@@ -388,19 +389,15 @@
php_error_docref(NULL TSRMLS_CC, E_WARNING, The ini setting
hash_bits_per_character is out of range (should be 4, 5, or 6) - using 4 for
now);
}
- if (PS_ID_INITIAL_SIZE ((digest_len + 2) * (8 /
PS(hash_bits_per_character))) ) {
- /* 100 bytes is enough for most, but not all hash algos */
- buf = erealloc(buf, (digest_len + 2) * (8 /
PS(hash_bits_per_character)) );
- }
-
- j = (int) (bin_to_readable((char *)digest, digest_len, buf,
PS(hash_bits_per_character)) - buf);
+ outid = emalloc((digest_len + 2) * ((8.0f /
PS(hash_bits_per_character)) + 0.5));
+ j = (int) (bin_to_readable((char *)digest, digest_len, outid,
PS(hash_bits_per_character)) - outid);
efree(digest);
if (newlen) {
*newlen = j;
}
- return buf;
+ return outid;
}
/* }}} */
Added: php/php-src/trunk/ext/session/tests/031.phpt
===
--- php/php-src/trunk/ext/session/tests/031.phpt
(rev 0)
+++ php/php-src/trunk/ext/session/tests/031.phpt2009-07-17 14:21:31 UTC
(rev 284267)
@@ -0,0 +1,22 @@
+--TEST--
+setting hash_function to sha512 and hash_bits_per_character 4 should not
crash
+--SKIPIF--
+?php include('skipif.inc'); ?
+--INI--
+session.use_cookies=0
+session.cache_limiter=
+session.serialize_handler=php
+session.save_handler=files
+session.hash_function=sha512
+session.hash_bits_per_character=5
+--FILE--
+?php
+error_reporting(E_ALL);
+
+session_start();
+session_regenerate_id(TRUE);
+
+print I live\n;
+?
+--EXPECT--
+I live
--
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/session/ session.c tests/031.phpt
gwynne Fri, 17 Jul 2009 14:21:59 +
URL: http://svn.php.net/viewvc?view=revisionrevision=284268
Changed paths:
U php/php-src/branches/PHP_5_3/ext/session/session.c
A php/php-src/branches/PHP_5_3/ext/session/tests/031.phpt
Log:
MFH: fix crash when session hash function generated long hashes with
hash_bits_per_character larger than 4
Modified: php/php-src/branches/PHP_5_3/ext/session/session.c
===
--- php/php-src/branches/PHP_5_3/ext/session/session.c 2009-07-17 14:21:31 UTC
(rev 284267)
+++ php/php-src/branches/PHP_5_3/ext/session/session.c 2009-07-17 14:21:59 UTC
(rev 284268)
@@ -347,7 +347,6 @@
}
/* }}} */
-#define PS_ID_INITIAL_SIZE 100
PHPAPI char *php_session_create_id(PS_CREATE_SID_ARGS) /* {{{ */
{
PHP_MD5_CTX md5_context;
@@ -358,7 +357,7 @@
unsigned char *digest;
int digest_len;
int j;
- char *buf;
+ char *buf, *outid;
struct timeval tv;
zval **array;
zval **token;
@@ -406,6 +405,7 @@
efree(buf);
return NULL;
}
+ efree(buf);
if (PS(entropy_length) 0) {
int fd;
@@ -461,20 +461,16 @@
php_error_docref(NULL TSRMLS_CC, E_WARNING, The ini setting
hash_bits_per_character is out of range (should be 4, 5, or 6) - using 4 for
now);
}
-
- if (PS_ID_INITIAL_SIZE ((digest_len + 2) * (8 /
PS(hash_bits_per_character))) ) {
- /* 100 bytes is enough for most, but not all hash algos */
- buf = erealloc(buf, (digest_len + 2) * (8 /
PS(hash_bits_per_character)) );
- }
-
- j = (int) (bin_to_readable((char *)digest, digest_len, buf,
PS(hash_bits_per_character)) - buf);
+
+ outid = emalloc((digest_len + 2) * ((8.0f /
PS(hash_bits_per_character)) + 0.5));
+ j = (int) (bin_to_readable((char *)digest, digest_len, outid,
PS(hash_bits_per_character)) - outid);
efree(digest);
if (newlen) {
*newlen = j;
}
- return buf;
+ return outid;
}
/* }}} */
Added: php/php-src/branches/PHP_5_3/ext/session/tests/031.phpt
===
--- php/php-src/branches/PHP_5_3/ext/session/tests/031.phpt
(rev 0)
+++ php/php-src/branches/PHP_5_3/ext/session/tests/031.phpt 2009-07-17
14:21:59 UTC (rev 284268)
@@ -0,0 +1,22 @@
+--TEST--
+setting hash_function to sha512 and hash_bits_per_character 4 should not
crash
+--SKIPIF--
+?php include('skipif.inc'); ?
+--INI--
+session.use_cookies=0
+session.cache_limiter=
+session.serialize_handler=php
+session.save_handler=files
+session.hash_function=sha512
+session.hash_bits_per_character=5
+--FILE--
+?php
+error_reporting(E_ALL);
+
+session_start();
+session_regenerate_id(TRUE);
+
+print I live\n;
+?
+--EXPECT--
+I live
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: SVNROOT/ global_avail
gwynne Thu, 16 Jul 2009 22:27:52 + URL: http://svn.php.net/viewvc?view=revisionrevision=284207 Changed paths: U SVNROOT/global_avail Log: fixed typo in global avail Modified: SVNROOT/global_avail === --- SVNROOT/global_avail2009-07-16 22:19:09 UTC (rev 284206) +++ SVNROOT/global_avail2009-07-16 22:27:52 UTC (rev 284207) @@ -303,7 +303,7 @@ avail|jluedke|pecl/drizzle avail|vito,mkoppanen|pecl/gmagick avail|santiago|pecl/gupnp -avail|patrickallaret|php/php-src/*/ext/ldap +avail|patrickallaert|php/php-src/*/ext/ldap # 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
[PHP-CVS] svn: SVNROOT/ commit-email.php httpd.conf
gwynne Fri, 17 Jul 2009 00:54:03 +
URL: http://svn.php.net/viewvc?view=revisionrevision=284219
Changed paths:
U SVNROOT/commit-email.php
U SVNROOT/httpd.conf
Log:
a pair of fixes from dsp
Modified: SVNROOT/commit-email.php
===
--- SVNROOT/commit-email.php2009-07-17 00:48:59 UTC (rev 284218)
+++ SVNROOT/commit-email.php2009-07-17 00:54:03 UTC (rev 284219)
@@ -23,7 +23,7 @@
'|^web/bugtracker|' = array('php-webmas...@lists.php.net'),
'|^web/presentations|' = array('p...@lists.php.net'),
'|^web/pres2|' = array('p...@lists.php.net'),
-'|^web/php-|' = array('php-webmas...@lists.php.net'),
+'|^web/php|' = array('php-webmas...@lists.php.net'),
// Zend/TSRM
'|^php/ZendAPI|' = array('zend-engine-...@lists.php.net',
'doc-...@lists.php.net'),
Modified: SVNROOT/httpd.conf
===
--- SVNROOT/httpd.conf 2009-07-17 00:48:59 UTC (rev 284218)
+++ SVNROOT/httpd.conf 2009-07-17 00:54:03 UTC (rev 284219)
@@ -22,7 +22,6 @@
DAV svn
SVNPath /home/svn/repository
Order allow,deny
- Deny from 81.146.52.16
Allow from all
LimitExcept GET PROPFIND OPTIONS REPORT
Satisfy All
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: php/php-src/trunk/
gwynne Wed, 15 Jul 2009 07:04:43 +
URL: http://svn.php.net/viewvc?view=revisionrevision=284101
Changed paths:
U php/php-src/trunk/Makefile.global
U php/php-src/trunk/configure.in
U php/php-src/trunk/makerpm
D php/php-src/trunk/php5.spec.in
Log:
php5.spec was never used, as far as can be determined. also, php 5 - php 6 in
makerpm, but that script needs considerably more work IMO
Modified: php/php-src/trunk/Makefile.global
===
--- php/php-src/trunk/Makefile.global 2009-07-15 07:01:09 UTC (rev 284100)
+++ php/php-src/trunk/Makefile.global 2009-07-15 07:04:43 UTC (rev 284101)
@@ -115,7 +115,7 @@
rm -f libphp$(PHP_MAJOR_VERSION).la $(SAPI_CLI_PATH) $(OVERALL_TARGET)
modules/* libs/*
distclean: clean
- rm -f config.cache config.log config.status Makefile.objects
Makefile.fragments libtool main/php_config.h stamp-h php5.spec
sapi/apache/libphp$(PHP_MAJOR_VERSION).module buildmk.stamp
+ rm -f config.cache config.log config.status Makefile.objects
Makefile.fragments libtool main/php_config.h stamp-h
sapi/apache/libphp$(PHP_MAJOR_VERSION).module buildmk.stamp
$(EGREP) define'.*include/php' $(top_srcdir)/configure | $(SED)
's/.*//'|xargs rm -f
find . -name Makefile | xargs rm -f
Modified: php/php-src/trunk/configure.in
===
--- php/php-src/trunk/configure.in 2009-07-15 07:01:09 UTC (rev 284100)
+++ php/php-src/trunk/configure.in 2009-07-15 07:04:43 UTC (rev 284101)
@@ -1392,7 +1392,7 @@
$php_shtool mkdir -p scripts
$php_shtool mkdir -p scripts/man1
-ALL_OUTPUT_FILES=php5.spec main/build-defs.h \
+ALL_OUTPUT_FILES=main/build-defs.h \
scripts/phpize scripts/man1/phpize.1 \
scripts/php-config scripts/man1/php-config.1 \
$PHP_OUTPUT_FILES
Modified: php/php-src/trunk/makerpm
===
--- php/php-src/trunk/makerpm 2009-07-15 07:01:09 UTC (rev 284100)
+++ php/php-src/trunk/makerpm 2009-07-15 07:04:43 UTC (rev 284101)
@@ -37,8 +37,8 @@
-e s/TARDIR/$TARDIR/g \
-e s/PREQUIRES/$PREQUIRES/g \
$SPEC 'EOF'
-Summary: PHP 5 - A powerful scripting language
-Name: php5
+Summary: PHP 6 - A powerful scripting language
+Name: php6
Version: PVERSION
Release: PRELEASE
Group: Networking/Daemons
@@ -48,7 +48,7 @@
Requires: PREQUIRES
%description
-PHP 5 is a powerful apache module that adds scripting and database connection
+PHP 6 is a powerful apache module that adds scripting and database connection
capabilities to the apache server. This version includes the php_cgi binary
for suExec and stand alone php scripts too.
Deleted: php/php-src/trunk/php5.spec.in
===
--- php/php-src/trunk/php5.spec.in 2009-07-15 07:01:09 UTC (rev 284100)
+++ php/php-src/trunk/php5.spec.in 2009-07-15 07:04:43 UTC (rev 284101)
@@ -1,48 +0,0 @@
-%define version @VERSION@
-%define so_version 5
-%define release 0
-
-Name: php
-Summary: PHP: Hypertext Preprocessor
-Group: Development/Languages
-Version: %{version}
-Release: %{release}
-Copyright: The PHP license (see LICENSE file included in distribution)
-Source: http://www.php.net/get/php-%{version}.tar.gz/from/a/mirror
-Icon: php.gif
-URL: http://www.php.net/
-Packager: PHP Group gr...@php.net
-
-BuildRoot: /var/tmp/php-%{version}
-
-%description
-PHP is an HTML-embedded scripting language. Much of its syntax is
-borrowed from C, Java and Perl with a couple of unique PHP-specific
-features thrown in. The goal of the language is to allow web
-developers to write dynamically generated pages quickly.
-
-%prep
-
-%setup
-
-%build
-set -x
-./buildconf
-./configure --prefix=/usr --with-apxs \
- --disable-debug \
- --with-xml=shared \
-
-# figure out configure options options based on what packages are installed
-# to override, use the OVERRIDE_OPTIONS environment variable. To add
-# extra options, use the OPTIONS environment variable.
-
-#test rpm -q MySQL-devel /dev/null OPTIONS=$OPTIONS --with-mysql=shared
-#test rpm -q solid-devel /dev/null OPTIONS=$OPTIONS
--with-solid=shared,/home/solid
-#test rpm -q postgresql-devel /dev/null OPTIONS=$OPTIONS
--with-pgsql=shared
-test rpm -q expat /dev/null OPTIONS=$OPTIONS --with-xml=shared
-
-if test x$OVERRIDE_OPTIONS = x; then
-./configure --prefix=/usr --with-apxs=$APXS $OPTIONS
-else
-./configure $OVERRIDE_OPTIONS
-fi
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: SVNROOT/
gwynne Thu, 16 Jul 2009 00:56:35 +
URL: http://svn.php.net/viewvc?view=revisionrevision=284162
Changed paths:
U SVNROOT/commit-email.php
U SVNROOT/pre-commit
Log:
okay, you win. One more attempt at doing the Q-encoding properly. Also, by
ridiculously popular request, the file names in subject lines are back. Finally,
a link to an explanation is given for keywords failures.
Modified: SVNROOT/commit-email.php
===
--- SVNROOT/commit-email.php2009-07-16 00:52:42 UTC (rev 284161)
+++ SVNROOT/commit-email.php2009-07-16 00:56:35 UTC (rev 284162)
@@ -121,8 +121,10 @@
$saw_last_ISO = TRUE;
}
if ($username === $commit_user) {
-$fullname = str_replace(array('~', ', ''), '', iconv($saw_last_ISO
? UTF-8 : ISO-8859-1, ASCII//TRANSLIT, $fullname));
-$from = \{$fullname}\ {$userna...@php.net;
+if ($saw_last_ISO === TRUE) {
+$fullname = iconv(ISO-8859-1, UTF-8//TRANSLIT, $fullname);
+}
+$from = array($username, $fullname);
break;
}
}
@@ -163,12 +165,23 @@
//
-
// Build e-mail
$boundary = sha1({$commit_user}{$commit_date});
+$messageid = {$boundary} . mt_rand();
+$subject = svn: {$parent_path};
+foreach ($changed_paths as $changed_path) {
+$changed_path = trim(strstr($changed_path, ' '));
+if (substr($changed_path, -1) !== '/') {
+$subject .= ' ' . substr($changed_path, $parent_path === '/' ? 0 :
strlen($parent_path));
+}
+}
+$subject = substr($subject, 0, 950); // Max SMTP line length = 998. Some slop
in this value.
-$msg_headers = From: {$from}\r\n .
+$fullname = =?utf-8?q? . imap_8bit(str_replace(array('?', ' '), array('=3F',
'_'), $from[1])) . ?=;
+
+$msg_headers = From: {$fullname} {$from[...@php.net\r\n .
To: . implode(', ', $emails_to) . \r\n .
- Message-ID: svn{$commit_user}{$commit_da...@svn.php.net\r\n
.
+ Message-ID: svn{$message...@svn.php.net\r\n .
Date: . date(DATE_RFC822, $commit_date) . \r\n .
- Subject: svn: {$parent_path}\r\n .
+ Subject: {$subject}\r\n .
MIME-Version: 1.0\r\n .
Content-Type: multipart/mixed; boundary=\{$boundary}\\r\n;
Modified: SVNROOT/pre-commit
===
--- SVNROOT/pre-commit 2009-07-16 00:52:42 UTC (rev 284161)
+++ SVNROOT/pre-commit 2009-07-16 00:56:35 UTC (rev 284162)
@@ -209,7 +209,7 @@
print DEBUG: File is non-binary. Checking for keywords.\n;
}
if (!in_array('svn:keywords', $properties)) {
-fail(svn:keywords not set on textual file {$path_added}.\n);
+fail(svn:keywords not set on textual file {$path_added}. Please
see section 5 of http://darkrainfall.org/phpsvn-guide.html for
instructions.\n);
}
if ($is_DEBUG) {
print DEBUG: File has keywords. Moving on.\n;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: SVNROOT/ commit-email.php
gwynne Thu, 16 Jul 2009 01:03:23 +
URL: http://svn.php.net/viewvc?view=revisionrevision=284165
Changed paths:
U SVNROOT/commit-email.php
Log:
gwynne made a logic booboo
Modified: SVNROOT/commit-email.php
===
--- SVNROOT/commit-email.php2009-07-16 01:00:22 UTC (rev 284164)
+++ SVNROOT/commit-email.php2009-07-16 01:03:23 UTC (rev 284165)
@@ -121,7 +121,7 @@
$saw_last_ISO = TRUE;
}
if ($username === $commit_user) {
-if ($saw_last_ISO === TRUE) {
+if ($saw_last_ISO !== TRUE) {
$fullname = iconv(ISO-8859-1, UTF-8//TRANSLIT, $fullname);
}
$from = array($username, $fullname);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: php/php-src/trunk/ build/build.mk buildconf.bat cvsclean.bat ext/mbstring/libmbfl/mksbcc32.bat ext/session/mod_files.bat ext/standard/tests/file/windows_acls/tiny.bat svnclean svnclean.
gwynne Thu, 16 Jul 2009 04:43:18 +
URL: http://svn.php.net/viewvc?view=revisionrevision=284172
Changed paths:
U php/php-src/trunk/build/build.mk
_U php/php-src/trunk/buildconf.bat
D php/php-src/trunk/cvsclean.bat
_U php/php-src/trunk/ext/mbstring/libmbfl/mksbcc32.bat
_U php/php-src/trunk/ext/session/mod_files.bat
_U php/php-src/trunk/ext/standard/tests/file/windows_acls/tiny.bat
D php/php-src/trunk/svnclean
_U php/php-src/trunk/svnclean.bat
A php/php-src/trunk/vcsclean
_U php/php-src/trunk/win32/EngineSelect.bat
_U php/php-src/trunk/win32/build/configure.bat
_U php/php-src/trunk/win32/build/cvsclean.js
_U php/php-src/trunk/win32/builddef.bat
Log:
dropped some more mime types, svnclean - clean for multiple VCS
Modified: php/php-src/trunk/build/build.mk
===
--- php/php-src/trunk/build/build.mk2009-07-16 03:20:18 UTC (rev 284171)
+++ php/php-src/trunk/build/build.mk2009-07-16 04:43:18 UTC (rev 284172)
@@ -45,7 +45,7 @@
snapshot:
distname='$(DISTNAME)'; \
if test -z $$distname; then \
- distname='php5-snapshot'; \
+ distname='php6-snapshot'; \
fi; \
myname=`basename \`pwd\`` ; \
cd .. cp -rp $$myname $$distname; \
@@ -71,8 +71,11 @@
done
svnclean-work:
- for i in `find . -type d -and -not -path '*/.svn/*'`; do \
- (cd `dirname $$i` 2/dev/null svn propget svn:ignore $i |
xargs rm -rf rm -rf *.o *.a .libs || true); \
+ @for i in `find . -type d -and -not -path '*/.svn/*'`; do \
+ (cd `dirname $$i` 2/dev/null svn propget svn:ignore $$i |
xargs rm -rf rm -rf *.o *.a .libs || true);\
done
+gitclean-work:
+ @echo We don't know how to clean Git checkouts yet.
+
.PHONY: $(ALWAYS) snapshot
Property changes on: php/php-src/trunk/buildconf.bat
___
Deleted: svn:mime-type
- application/x-msdownload
Deleted: php/php-src/trunk/cvsclean.bat
===
(Binary files differ)
Property changes on: php/php-src/trunk/ext/mbstring/libmbfl/mksbcc32.bat
___
Deleted: svn:mime-type
- application/x-msdownload
Property changes on: php/php-src/trunk/ext/session/mod_files.bat
___
Deleted: svn:mime-type
- application/x-msdownload
Property changes on:
php/php-src/trunk/ext/standard/tests/file/windows_acls/tiny.bat
___
Deleted: svn:mime-type
- application/x-msdownload
Deleted: php/php-src/trunk/svnclean
===
--- php/php-src/trunk/svnclean 2009-07-16 03:20:18 UTC (rev 284171)
+++ php/php-src/trunk/svnclean 2009-07-16 04:43:18 UTC (rev 284172)
@@ -1,3 +0,0 @@
-#! /bin/sh
-
-${MAKE:-make} -f build/build.mk svnclean-work
Property changes on: php/php-src/trunk/svnclean.bat
___
Deleted: svn:mime-type
- application/x-msdownload
Copied: php/php-src/trunk/vcsclean (from rev 284099, php/php-src/trunk/svnclean)
===
--- php/php-src/trunk/vcsclean (rev 0)
+++ php/php-src/trunk/vcsclean 2009-07-16 04:43:18 UTC (rev 284172)
@@ -0,0 +1,11 @@
+#! /bin/sh
+
+if test -d 'CVS'; then
+${MAKE:-make} -f build/build.mk cvsclean-work
+elif test -d '.svn'; then
+${MAKE:-make} -f build/build.mk svnclean-work
+elif test -d '.git'; then
+${MAKE:-make} -f build/build.mk gitclean-work
+else
+echo Can't figure out your VCS, not cleaning.
+fi
Property changes on: php/php-src/trunk/win32/EngineSelect.bat
___
Deleted: svn:mime-type
- application/x-msdownload
Property changes on: php/php-src/trunk/win32/build/configure.bat
___
Deleted: svn:mime-type
- application/x-msdownload
Property changes on: php/php-src/trunk/win32/build/cvsclean.js
___
Deleted: svn:mime-type
- application/javascript
Property changes on: php/php-src/trunk/win32/builddef.bat
___
Deleted: svn:mime-type
- application/x-msdownload
--
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/ build/build.mk buildconf.bat cvsclean.bat ext/mbstring/libmbfl/mksbcc32.bat ext/session/mod_files.bat ext/standard/tests/file/windows_acls/tiny.bat svnclea
gwynne Thu, 16 Jul 2009 04:50:06 +
URL: http://svn.php.net/viewvc?view=revisionrevision=284173
Changed paths:
U php/php-src/branches/PHP_5_3/build/build.mk
_U php/php-src/branches/PHP_5_3/buildconf.bat
D php/php-src/branches/PHP_5_3/cvsclean.bat
_U php/php-src/branches/PHP_5_3/ext/mbstring/libmbfl/mksbcc32.bat
_U php/php-src/branches/PHP_5_3/ext/session/mod_files.bat
_U
php/php-src/branches/PHP_5_3/ext/standard/tests/file/windows_acls/tiny.bat
D php/php-src/branches/PHP_5_3/svnclean
_U php/php-src/branches/PHP_5_3/svnclean.bat
A php/php-src/branches/PHP_5_3/vcsclean
_U php/php-src/branches/PHP_5_3/win32/EngineSelect.bat
_U php/php-src/branches/PHP_5_3/win32/build/configure.bat
_U php/php-src/branches/PHP_5_3/win32/build/cvsclean.js
_U php/php-src/branches/PHP_5_3/win32/builddef.bat
Log:
MFH: dropped some more mime types, svnclean - clean for multiple VCS
Modified: php/php-src/branches/PHP_5_3/build/build.mk
===
--- php/php-src/branches/PHP_5_3/build/build.mk 2009-07-16 04:43:18 UTC (rev
284172)
+++ php/php-src/branches/PHP_5_3/build/build.mk 2009-07-16 04:50:06 UTC (rev
284173)
@@ -71,8 +71,11 @@
done
svnclean-work:
- for i in `find . -type d -and -not -path '*/.svn/*'`; do \
- (cd `dirname $$i` 2/dev/null svn propget svn:ignore $i |
xargs rm -rf rm -rf *.o *.a .libs || true); \
+ @for i in `find . -type d -and -not -path '*/.svn/*'`; do \
+ (cd `dirname $$i` 2/dev/null svn propget svn:ignore $$i |
xargs rm -rf rm -rf *.o *.a .libs || true);\
done
+gitclean-work:
+ @echo We don't know how to clean Git checkouts yet.
+
.PHONY: $(ALWAYS) snapshot
Property changes on: php/php-src/branches/PHP_5_3/buildconf.bat
___
Deleted: svn:mime-type
- application/x-msdownload
Deleted: php/php-src/branches/PHP_5_3/cvsclean.bat
===
(Binary files differ)
Property changes on:
php/php-src/branches/PHP_5_3/ext/mbstring/libmbfl/mksbcc32.bat
___
Deleted: svn:mime-type
- application/x-msdownload
Property changes on: php/php-src/branches/PHP_5_3/ext/session/mod_files.bat
___
Deleted: svn:mime-type
- application/x-msdownload
Property changes on:
php/php-src/branches/PHP_5_3/ext/standard/tests/file/windows_acls/tiny.bat
___
Deleted: svn:mime-type
- application/x-msdownload
Deleted: php/php-src/branches/PHP_5_3/svnclean
===
--- php/php-src/branches/PHP_5_3/svnclean 2009-07-16 04:43:18 UTC (rev
284172)
+++ php/php-src/branches/PHP_5_3/svnclean 2009-07-16 04:50:06 UTC (rev
284173)
@@ -1,3 +0,0 @@
-#! /bin/sh
-
-${MAKE:-make} -f build/build.mk svnclean-work
Property changes on: php/php-src/branches/PHP_5_3/svnclean.bat
___
Deleted: svn:mime-type
- application/x-msdownload
Copied: php/php-src/branches/PHP_5_3/vcsclean (from rev 284084,
php/php-src/branches/PHP_5_3/svnclean)
===
--- php/php-src/branches/PHP_5_3/vcsclean (rev 0)
+++ php/php-src/branches/PHP_5_3/vcsclean 2009-07-16 04:50:06 UTC (rev
284173)
@@ -0,0 +1,11 @@
+#! /bin/sh
+
+if test -d 'CVS'; then
+${MAKE:-make} -f build/build.mk cvsclean-work
+elif test -d '.svn'; then
+${MAKE:-make} -f build/build.mk svnclean-work
+elif test -d '.git'; then
+${MAKE:-make} -f build/build.mk gitclean-work
+else
+echo Can't figure out your VCS, not cleaning.
+fi
Property changes on: php/php-src/branches/PHP_5_3/win32/EngineSelect.bat
___
Deleted: svn:mime-type
- application/x-msdownload
Property changes on: php/php-src/branches/PHP_5_3/win32/build/configure.bat
___
Deleted: svn:mime-type
- application/x-msdownload
Property changes on: php/php-src/branches/PHP_5_3/win32/build/cvsclean.js
___
Deleted: svn:mime-type
- application/javascript
Property changes on: php/php-src/branches/PHP_5_3/win32/builddef.bat
___
Deleted: svn:mime-type
- application/x-msdownload
--
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/ build/build.mk buildconf.bat cvsclean.bat ext/mbstring/libmbfl/mksbcc32.bat svnclean svnclean.bat vcsclean win32/EngineSelect.bat win32/build/configure.bat
gwynne Thu, 16 Jul 2009 04:54:26 +
URL: http://svn.php.net/viewvc?view=revisionrevision=284174
Changed paths:
U php/php-src/branches/PHP_5_2/build/build.mk
_U php/php-src/branches/PHP_5_2/buildconf.bat
D php/php-src/branches/PHP_5_2/cvsclean.bat
_U php/php-src/branches/PHP_5_2/ext/mbstring/libmbfl/mksbcc32.bat
D php/php-src/branches/PHP_5_2/svnclean
_U php/php-src/branches/PHP_5_2/svnclean.bat
A php/php-src/branches/PHP_5_2/vcsclean
_U php/php-src/branches/PHP_5_2/win32/EngineSelect.bat
_U php/php-src/branches/PHP_5_2/win32/build/configure.bat
_U php/php-src/branches/PHP_5_2/win32/build/cvsclean.js
_U php/php-src/branches/PHP_5_2/win32/builddef.bat
Log:
MFH: dropped some more mime types, svnclean - clean for multiple VCS
Modified: php/php-src/branches/PHP_5_2/build/build.mk
===
--- php/php-src/branches/PHP_5_2/build/build.mk 2009-07-16 04:50:06 UTC (rev
284173)
+++ php/php-src/branches/PHP_5_2/build/build.mk 2009-07-16 04:54:26 UTC (rev
284174)
@@ -67,12 +67,15 @@
cvsclean-work:
@for i in `find . -name .cvsignore`; do \
- (cd `dirname $$i` 2/dev/null rm -rf `cat .cvsignore | grep
-v config.nice | sed 's/[\r\n]/ /g'` *.o *.a .libs || true); \
+ (cd `dirname $$i` 2/dev/null rm -rf `cat .cvsignore | grep
-v config.nice | sed 's/[[:space:]]/ /g'` *.o *.a .libs || true); \
done
svnclean-work:
- for i in `find . -type d -and -not -path '*/.svn/*'`; do \
- (cd `dirname $$i` 2/dev/null svn propget svn:ignore $i |
xargs rm -rf rm -rf *.o *.a .libs || true); \
+ @for i in `find . -type d -and -not -path '*/.svn/*'`; do \
+ (cd `dirname $$i` 2/dev/null svn propget svn:ignore $$i |
xargs rm -rf rm -rf *.o *.a .libs || true);\
done
+gitclean-work:
+ @echo We don't know how to clean Git checkouts yet.
+
.PHONY: $(ALWAYS) snapshot
Property changes on: php/php-src/branches/PHP_5_2/buildconf.bat
___
Deleted: svn:mime-type
- application/x-msdownload
Deleted: php/php-src/branches/PHP_5_2/cvsclean.bat
===
(Binary files differ)
Property changes on:
php/php-src/branches/PHP_5_2/ext/mbstring/libmbfl/mksbcc32.bat
___
Deleted: svn:mime-type
- application/x-msdownload
Deleted: php/php-src/branches/PHP_5_2/svnclean
===
--- php/php-src/branches/PHP_5_2/svnclean 2009-07-16 04:50:06 UTC (rev
284173)
+++ php/php-src/branches/PHP_5_2/svnclean 2009-07-16 04:54:26 UTC (rev
284174)
@@ -1,3 +0,0 @@
-#! /bin/sh
-
-${MAKE:-make} -f build/build.mk svnclean-work
Property changes on: php/php-src/branches/PHP_5_2/svnclean.bat
___
Deleted: svn:mime-type
- application/x-msdownload
Copied: php/php-src/branches/PHP_5_2/vcsclean (from rev 283992,
php/php-src/branches/PHP_5_2/svnclean)
===
--- php/php-src/branches/PHP_5_2/vcsclean (rev 0)
+++ php/php-src/branches/PHP_5_2/vcsclean 2009-07-16 04:54:26 UTC (rev
284174)
@@ -0,0 +1,11 @@
+#! /bin/sh
+
+if test -d 'CVS'; then
+${MAKE:-make} -f build/build.mk cvsclean-work
+elif test -d '.svn'; then
+${MAKE:-make} -f build/build.mk svnclean-work
+elif test -d '.git'; then
+${MAKE:-make} -f build/build.mk gitclean-work
+else
+echo Can't figure out your VCS, not cleaning.
+fi
Property changes on: php/php-src/branches/PHP_5_2/win32/EngineSelect.bat
___
Deleted: svn:mime-type
- application/x-msdownload
Property changes on: php/php-src/branches/PHP_5_2/win32/build/configure.bat
___
Deleted: svn:mime-type
- application/x-msdownload
Property changes on: php/php-src/branches/PHP_5_2/win32/build/cvsclean.js
___
Deleted: svn:mime-type
- application/javascript
Property changes on: php/php-src/branches/PHP_5_2/win32/builddef.bat
___
Deleted: svn:mime-type
- application/x-msdownload
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: SVNROOT/ commit-email.php
gwynne Thu, 16 Jul 2009 05:31:26 +
URL: http://svn.php.net/viewvc?view=revisionrevision=284177
Changed paths:
U SVNROOT/commit-email.php
Log:
handle the case of an empty diff (only deleted files) correctly
Modified: SVNROOT/commit-email.php
===
--- SVNROOT/commit-email.php2009-07-16 05:22:15 UTC (rev 284176)
+++ SVNROOT/commit-email.php2009-07-16 05:31:26 UTC (rev 284177)
@@ -160,7 +160,7 @@
$diffs = implode(\n, $diffs);
$diffs_length = strlen($diffs);
$diffs_string = ($diffs_length 262144 ? diffs exceeded maximum size :
-($diffs_length 8192 ? : $diffs));
+($diffs_length 8192 ? NULL : $diffs));
//
-
// Build e-mail
@@ -201,7 +201,7 @@
\r\n .
$diffs_string;
-if ($diffs_string === ) {
+if ($diffs_string === NULL) {
$msg_body .=
--{$boundary}\r\n .
Content-Type: text/x-diff; encoding=\utf-8\\r\n .
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: SVNROOT/
gwynne Tue, 14 Jul 2009 09:21:16 + URL: http://svn.php.net/viewvc?view=revisionrevision=284062 Changed paths: U SVNROOT/commit-email.php Log: go back to manually constructing MIME emails for now. Yet another stab at fixing the email encoding problems. Cleaner handling of attachment vs. non-attachment. Better handling of newline conversion. Better conversation with SMTP server -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: SVNROOT/
gwynne Tue, 14 Jul 2009 10:02:22 +
URL: http://svn.php.net/viewvc?view=revisionrevision=284067
Changed paths:
U SVNROOT/commit-email.php
Log:
Okay, I give up. Full names are now encoded LOSSILY as ASCII. Also added a
couple of missing which-list expressions.
Modified: SVNROOT/commit-email.php
===
--- SVNROOT/commit-email.php2009-07-14 09:57:09 UTC (rev 284066)
+++ SVNROOT/commit-email.php2009-07-14 10:02:22 UTC (rev 284067)
@@ -17,6 +17,7 @@
'|^gtk/php-gtk-web|' = array('gtk-webmas...@php.net'),
'|^gtk/php-gtk-doc|' = array('php-gtk-...@lists.php.net'),
'|^gtk/php-gtk|' = array('php-gtk-...@lists.php.net'),
+'|^gtk|' = array('php-gtk-...@lists.php.net'),
// Web
'|^web/bugtracker|' = array('php-webmas...@lists.php.net'),
@@ -67,6 +68,7 @@
'|^phd|' = array('doc-...@lists.php.net'),
'|^web/doc|' = array('doc-...@lists.php.net'),
'|^doc-editor|' = array('doc-...@lists.php.net'),
+'|^phpdoc|' = array('doc-...@lists.php.net'),
// PEAR
'|^pear/pearbot|' = array('pear-...@lists.php.net'),
@@ -119,9 +121,7 @@
$saw_last_ISO = TRUE;
}
if ($username === $commit_user) {
-if (!$saw_last_ISO) {
-$fullname = iconv(ISO-8859-1, UTF-8//TRANSLIT, $fullname);
-}
+$fullname = str_replace(array('~', ', ''), '', iconv($saw_last_ISO
? UTF-8 : ISO-8859-1, ASCII//TRANSLIT, $fullname));
$from = \{$fullname}\ {$userna...@php.net;
break;
}
@@ -164,7 +164,7 @@
// Build e-mail
$boundary = sha1({$commit_user}{$commit_date});
-$msg_headers = From: . imap_8bit($from) . \r\n .
+$msg_headers = From: {$from}\r\n .
To: . implode(', ', $emails_to) . \r\n .
Message-ID: svn{$commit_user}{$commit_da...@svn.php.net\r\n
.
Date: . date(DATE_RFC822, $commit_date) . \r\n .
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] Commit freeze is officially over
On Jul 14, 2009, at 4:36 PM, Knut Urdalen wrote: Any other issues, please bring them to my attention. Preferably via email, not IRC :). Are we going to have a similar page like the one for Anonymous CVS Access [1] for svn.php.net? Please in the future avoid cross-posting to seven lists; use svn- migration@ for this kind of question. To answer the question, anonsvn.php has already been commited to phpweb and should show up as soon as we get rsync back in service. -- Gwynne -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: php/php-src/trunk/
gwynne Tue, 14 Jul 2009 21:49:26 +
URL: http://svn.php.net/viewvc?view=revisionrevision=284085
Changed paths:
U php/php-src/trunk/makedist
Log:
CVS-SVN
Modified: php/php-src/trunk/makedist
===
--- php/php-src/trunk/makedist 2009-07-14 21:35:06 UTC (rev 284084)
+++ php/php-src/trunk/makedist 2009-07-14 21:49:26 UTC (rev 284085)
@@ -1,25 +1,22 @@
#!/bin/sh
#
-# Distribution generator for CVS based packages.
+# Distribution generator for SVN based packages.
# To work, this script needs a consistent tagging of all releases.
# Each release of a package should have a tag of the form
#
# package_version
#
-# where package is the package name and the CVS module
+# where package is the package name and the SVN module
# and version s the version number with underscores instead of dots.
#
-# For example: cvs tag php_5_0_1
+# For example: svn cp $PHPROOT/php/php-src/trunk
$PHPROOT/php/php-src/tags/php_5_0_1
#
# The distribution ends up in a .tar.gz file that contains the distribution
# in a directory called package-version. The distribution contains all
-# directories from the CVS module except the one called nodist, but only
+# directories from the SVN module except the one called nodist, but only
# the files INSTALL, README and config* are included.
+# A .tar.bz2 file is also created.
#
-# Since you can no longer set the CVS password via an env variable, you
-# need to have previously done a cvs login for the server and user id
-# this script uses so it will have an entry in your ~/.cvspasswd file.
-#
# Usage: makedist package version
#
# Written by Stig Bakken s...@guardian.no 1997-05-28.
@@ -44,8 +41,8 @@
fi
IFS=$old_IFS
-PHPROOT=:pserver:cvsr...@cvs.php.net:/repository
-PHPMOD=php-src
+PHPROOT=http://svn.php.net/repository
+PHPMOD=php/php-src
LT_TARGETS='ltconfig ltmain.sh config.guess config.sub'
if echo '\c' | grep -s c /dev/null 21
@@ -62,7 +59,7 @@
# the destination .tar.gz file
ARCHIVE=$MY_OLDPWD/$PKG-$VER.tar
-# temporary directory used to check out files from CVS
+# temporary directory used to check out files from SVN
DIR=$PKG-$VER
DIRPATH=$MY_OLDPWD/$DIR
@@ -72,28 +69,28 @@
exit 1
fi
-# version part of the CVS release tag
-CVSVER=`echo $VER | sed -e 's/[\.\-]/_/g'`
+# version part of the SVN release tag
+SVNVER=`echo $VER | sed -e 's/[\.\-]/_/g'`
-# CVS release tag
-if test $VER != HEAD; then
- CVSTAG=${PKG}_$CVSVER
+# SVN release tag
+if test $VER != HEAD -a $VER != trunk; then
+ SVNTAG=tags/${PKG}_$SVNVER
else
- CVSTAG=HEAD
+ SVNTAG=trunk
fi
-if test ! -d $DIRPATH; then
-mkdir -p $DIRPATH || exit 2
-fi
+#if test ! -d $DIRPATH; then
+#mkdir -p $DIRPATH || exit 2
+#fi
# Export PHP
-$ECHO_N makedist: exporting tag '$CVSTAG' from '$PHPMOD'...$ECHO_C
-cvs -z 9 -d $PHPROOT export -d $DIR -r $CVSTAG $PHPMOD || exit 4
+$ECHO_N makedist: exporting tag '$SVNTAG' from '$PHPMOD'...$ECHO_C
+svn export $PHPROOT/$PHPMOD/$SVNTAG $DIRPATH || exit 4
echo
-# remove CVS stuff...
+# remove SVN stuff...
cd $DIR || exit 5
-find . \( \( -name CVS -type d \) -o -name .cvsignore \) -exec rm -rf {} \;
+find . \( -name .svn -type d \) -exec rm -rf {} \;
# The full ChangeLog is available separately from lxr.php.net
rm -f ChangeLog*
--
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/
gwynne Tue, 14 Jul 2009 21:49:36 +
URL: http://svn.php.net/viewvc?view=revisionrevision=284086
Changed paths:
U php/php-src/branches/PHP_5_2/makedist
Log:
MFH: CVS-SVN
Modified: php/php-src/branches/PHP_5_2/makedist
===
--- php/php-src/branches/PHP_5_2/makedist 2009-07-14 21:49:26 UTC (rev
284085)
+++ php/php-src/branches/PHP_5_2/makedist 2009-07-14 21:49:36 UTC (rev
284086)
@@ -1,25 +1,22 @@
#!/bin/sh
#
-# Distribution generator for CVS based packages.
+# Distribution generator for SVN based packages.
# To work, this script needs a consistent tagging of all releases.
# Each release of a package should have a tag of the form
#
# package_version
#
-# where package is the package name and the CVS module
+# where package is the package name and the SVN module
# and version s the version number with underscores instead of dots.
#
-# For example: cvs tag php_5_0_1
+# For example: svn cp $PHPROOT/php/php-src/trunk
$PHPROOT/php/php-src/tags/php_5_0_1
#
# The distribution ends up in a .tar.gz file that contains the distribution
# in a directory called package-version. The distribution contains all
-# directories from the CVS module except the one called nodist, but only
+# directories from the SVN module except the one called nodist, but only
# the files INSTALL, README and config* are included.
+# A .tar.bz2 file is also created.
#
-# Since you can no longer set the CVS password via an env variable, you
-# need to have previously done a cvs login for the server and user id
-# this script uses so it will have an entry in your ~/.cvspasswd file.
-#
# Usage: makedist package version
#
# Written by Stig Bakken s...@guardian.no 1997-05-28.
@@ -44,8 +41,8 @@
fi
IFS=$old_IFS
-PHPROOT=:pserver:cvsr...@cvs.php.net:/repository
-PHPMOD=php-src
+PHPROOT=http://svn.php.net/repository
+PHPMOD=php/php-src
LT_TARGETS='ltconfig ltmain.sh config.guess config.sub'
if echo '\c' | grep -s c /dev/null 21
@@ -62,7 +59,7 @@
# the destination .tar.gz file
ARCHIVE=$MY_OLDPWD/$PKG-$VER.tar
-# temporary directory used to check out files from CVS
+# temporary directory used to check out files from SVN
DIR=$PKG-$VER
DIRPATH=$MY_OLDPWD/$DIR
@@ -72,28 +69,28 @@
exit 1
fi
-# version part of the CVS release tag
-CVSVER=`echo $VER | sed -e 's/[\.\-]/_/g'`
+# version part of the SVN release tag
+SVNVER=`echo $VER | sed -e 's/[\.\-]/_/g'`
-# CVS release tag
-if test $VER != HEAD; then
- CVSTAG=${PKG}_$CVSVER
+# SVN release tag
+if test $VER != HEAD -a $VER != trunk; then
+ SVNTAG=tags/${PKG}_$SVNVER
else
- CVSTAG=HEAD
+ SVNTAG=trunk
fi
-if test ! -d $DIRPATH; then
-mkdir -p $DIRPATH || exit 2
-fi
+#if test ! -d $DIRPATH; then
+#mkdir -p $DIRPATH || exit 2
+#fi
# Export PHP
-$ECHO_N makedist: exporting tag '$CVSTAG' from '$PHPMOD'...$ECHO_C
-cvs -z 9 -d $PHPROOT export -d $DIR -r $CVSTAG $PHPMOD || exit 4
+$ECHO_N makedist: exporting tag '$SVNTAG' from '$PHPMOD'...$ECHO_C
+svn export $PHPROOT/$PHPMOD/$SVNTAG $DIRPATH || exit 4
echo
-# remove CVS stuff...
+# remove SVN stuff...
cd $DIR || exit 5
-find . \( \( -name CVS -type d \) -o -name .cvsignore \) -exec rm -rf {} \;
+find . \( -name .svn -type d \) -exec rm -rf {} \;
# The full ChangeLog is available separately from lxr.php.net
rm -f ChangeLog*
--
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/
gwynne Tue, 14 Jul 2009 21:49:44 +
URL: http://svn.php.net/viewvc?view=revisionrevision=284087
Changed paths:
U php/php-src/branches/PHP_5_3/makedist
Log:
MFH: CVS-SVN
Modified: php/php-src/branches/PHP_5_3/makedist
===
--- php/php-src/branches/PHP_5_3/makedist 2009-07-14 21:49:36 UTC (rev
284086)
+++ php/php-src/branches/PHP_5_3/makedist 2009-07-14 21:49:44 UTC (rev
284087)
@@ -1,25 +1,22 @@
#!/bin/sh
#
-# Distribution generator for CVS based packages.
+# Distribution generator for SVN based packages.
# To work, this script needs a consistent tagging of all releases.
# Each release of a package should have a tag of the form
#
# package_version
#
-# where package is the package name and the CVS module
+# where package is the package name and the SVN module
# and version s the version number with underscores instead of dots.
#
-# For example: cvs tag php_5_0_1
+# For example: svn cp $PHPROOT/php/php-src/trunk
$PHPROOT/php/php-src/tags/php_5_0_1
#
# The distribution ends up in a .tar.gz file that contains the distribution
# in a directory called package-version. The distribution contains all
-# directories from the CVS module except the one called nodist, but only
+# directories from the SVN module except the one called nodist, but only
# the files INSTALL, README and config* are included.
+# A .tar.bz2 file is also created.
#
-# Since you can no longer set the CVS password via an env variable, you
-# need to have previously done a cvs login for the server and user id
-# this script uses so it will have an entry in your ~/.cvspasswd file.
-#
# Usage: makedist package version
#
# Written by Stig Bakken s...@guardian.no 1997-05-28.
@@ -44,8 +41,8 @@
fi
IFS=$old_IFS
-PHPROOT=:pserver:cvsr...@cvs.php.net:/repository
-PHPMOD=php-src
+PHPROOT=http://svn.php.net/repository
+PHPMOD=php/php-src
LT_TARGETS='ltconfig ltmain.sh config.guess config.sub'
if echo '\c' | grep -s c /dev/null 21
@@ -62,7 +59,7 @@
# the destination .tar.gz file
ARCHIVE=$MY_OLDPWD/$PKG-$VER.tar
-# temporary directory used to check out files from CVS
+# temporary directory used to check out files from SVN
DIR=$PKG-$VER
DIRPATH=$MY_OLDPWD/$DIR
@@ -72,28 +69,28 @@
exit 1
fi
-# version part of the CVS release tag
-CVSVER=`echo $VER | sed -e 's/[\.\-]/_/g'`
+# version part of the SVN release tag
+SVNVER=`echo $VER | sed -e 's/[\.\-]/_/g'`
-# CVS release tag
-if test $VER != HEAD; then
- CVSTAG=${PKG}_$CVSVER
+# SVN release tag
+if test $VER != HEAD -a $VER != trunk; then
+ SVNTAG=tags/${PKG}_$SVNVER
else
- CVSTAG=HEAD
+ SVNTAG=trunk
fi
-if test ! -d $DIRPATH; then
-mkdir -p $DIRPATH || exit 2
-fi
+#if test ! -d $DIRPATH; then
+#mkdir -p $DIRPATH || exit 2
+#fi
# Export PHP
-$ECHO_N makedist: exporting tag '$CVSTAG' from '$PHPMOD'...$ECHO_C
-cvs -z 9 -d $PHPROOT export -d $DIR -r $CVSTAG $PHPMOD || exit 4
+$ECHO_N makedist: exporting tag '$SVNTAG' from '$PHPMOD'...$ECHO_C
+svn export $PHPROOT/$PHPMOD/$SVNTAG $DIRPATH || exit 4
echo
-# remove CVS stuff...
+# remove SVN stuff...
cd $DIR || exit 5
-find . \( \( -name CVS -type d \) -o -name .cvsignore \) -exec rm -rf {} \;
+find . \( -name .svn -type d \) -exec rm -rf {} \;
# The full ChangeLog is available separately from lxr.php.net
rm -f ChangeLog*
--
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/bcmath/
gwynne Tue, 14 Jul 2009 21:51:40 + URL: http://svn.php.net/viewvc?view=revisionrevision=284088 Changed paths: _U php/php-src/branches/PHP_5_3/ext/bcmath/package.xml _U php/php-src/branches/PHP_5_3/ext/bz2/package.xml _U php/php-src/branches/PHP_5_3/ext/calendar/package.xml _U php/php-src/branches/PHP_5_3/ext/com_dotnet/package.xml _U php/php-src/branches/PHP_5_3/ext/ctype/ctype.xml _U php/php-src/branches/PHP_5_3/ext/ctype/package.xml _U php/php-src/branches/PHP_5_3/ext/curl/package.xml _U php/php-src/branches/PHP_5_3/ext/dom/examples/note-invalid.xml _U php/php-src/branches/PHP_5_3/ext/dom/examples/note.xml _U php/php-src/branches/PHP_5_3/ext/dom/examples/relaxNG.xml _U php/php-src/branches/PHP_5_3/ext/dom/examples/shipping.xml _U php/php-src/branches/PHP_5_3/ext/dom/tests/book.xml _U php/php-src/branches/PHP_5_3/ext/dom/tests/dom.xml _U php/php-src/branches/PHP_5_3/ext/dom/tests/nsdoc.xml _U php/php-src/branches/PHP_5_3/ext/dom/tests/xinclude.xml _U php/php-src/branches/PHP_5_3/ext/enchant/package.xml _U php/php-src/branches/PHP_5_3/ext/exif/package.xml _U php/php-src/branches/PHP_5_3/ext/fileinfo/package.xml _U php/php-src/branches/PHP_5_3/ext/ftp/package.xml _U php/php-src/branches/PHP_5_3/ext/hash/package.xml _U php/php-src/branches/PHP_5_3/ext/json/package.xml _U php/php-src/branches/PHP_5_3/ext/libxml/tests/test.xml _U php/php-src/branches/PHP_5_3/ext/mysql/package.xml _U php/php-src/branches/PHP_5_3/ext/mysqli/package.xml _U php/php-src/branches/PHP_5_3/ext/oci8/package.xml _U php/php-src/branches/PHP_5_3/ext/pcntl/package.xml _U php/php-src/branches/PHP_5_3/ext/pdo/package2.xml _U php/php-src/branches/PHP_5_3/ext/pdo_dblib/package2.xml _U php/php-src/branches/PHP_5_3/ext/pdo_firebird/package2.xml _U php/php-src/branches/PHP_5_3/ext/pdo_mysql/package2.xml _U php/php-src/branches/PHP_5_3/ext/pdo_oci/package2.xml _U php/php-src/branches/PHP_5_3/ext/pdo_odbc/package2.xml _U php/php-src/branches/PHP_5_3/ext/pdo_pgsql/package2.xml _U php/php-src/branches/PHP_5_3/ext/pdo_sqlite/package2.xml _U php/php-src/branches/PHP_5_3/ext/phar/package.xml _U php/php-src/branches/PHP_5_3/ext/phar/tests/cache_list/files/config.xml _U php/php-src/branches/PHP_5_3/ext/phar/tests/files/config.xml _U php/php-src/branches/PHP_5_3/ext/posix/package.xml _U php/php-src/branches/PHP_5_3/ext/session/package.xml _U php/php-src/branches/PHP_5_3/ext/shmop/package.xml _U php/php-src/branches/PHP_5_3/ext/shmop/package2.xml _U php/php-src/branches/PHP_5_3/ext/simplexml/examples/book.xml _U php/php-src/branches/PHP_5_3/ext/simplexml/examples/security.xml _U php/php-src/branches/PHP_5_3/ext/simplexml/tests/000.xml _U php/php-src/branches/PHP_5_3/ext/simplexml/tests/book.xml _U php/php-src/branches/PHP_5_3/ext/simplexml/tests/bug24392.xml _U php/php-src/branches/PHP_5_3/ext/simplexml/tests/bug25756_1.xml _U php/php-src/branches/PHP_5_3/ext/simplexml/tests/bug25756_2.xml _U php/php-src/branches/PHP_5_3/ext/simplexml/tests/sxe.xml _U php/php-src/branches/PHP_5_3/ext/soap/package.xml _U php/php-src/branches/PHP_5_3/ext/sockets/package.xml _U php/php-src/branches/PHP_5_3/ext/spl/package.xml _U php/php-src/branches/PHP_5_3/ext/sqlite/package.xml _U php/php-src/branches/PHP_5_3/ext/sysvmsg/package.xml _U php/php-src/branches/PHP_5_3/ext/sysvsem/package.xml _U php/php-src/branches/PHP_5_3/ext/sysvshm/package.xml _U php/php-src/branches/PHP_5_3/ext/tidy/package.xml _U php/php-src/branches/PHP_5_3/ext/tokenizer/package.xml _U php/php-src/branches/PHP_5_3/ext/wddx/package.xml _U php/php-src/branches/PHP_5_3/ext/wddx/tests/wddx.xml _U php/php-src/branches/PHP_5_3/ext/xml/package.xml _U php/php-src/branches/PHP_5_3/ext/xml/tests/xmltest.xml _U php/php-src/branches/PHP_5_3/ext/xmlreader/examples/dtdexample.xml _U php/php-src/branches/PHP_5_3/ext/xmlreader/examples/relaxNG.xml _U php/php-src/branches/PHP_5_3/ext/xmlreader/examples/xmlreader.xml _U php/php-src/branches/PHP_5_3/ext/xmlreader/package.xml _U php/php-src/branches/PHP_5_3/ext/xmlreader/tests/012.xml _U php/php-src/branches/PHP_5_3/ext/xmlwriter/package.xml _U php/php-src/branches/PHP_5_3/ext/xmlwriter/package2.xml _U php/php-src/branches/PHP_5_3/ext/xsl/tests/area_name.xml _U php/php-src/branches/PHP_5_3/ext/xsl/tests/exslt.xml _U php/php-src/branches/PHP_5_3/ext/xsl/tests/xslt.xml _U
[PHP-CVS] svn: php/php-src/branches/PHP_5_2/ext/bcmath/
gwynne Tue, 14 Jul 2009 21:52:43 + URL: http://svn.php.net/viewvc?view=revisionrevision=284089 Changed paths: _U php/php-src/branches/PHP_5_2/ext/bcmath/package.xml _U php/php-src/branches/PHP_5_2/ext/bz2/package.xml _U php/php-src/branches/PHP_5_2/ext/calendar/package.xml _U php/php-src/branches/PHP_5_2/ext/com_dotnet/package.xml _U php/php-src/branches/PHP_5_2/ext/ctype/ctype.xml _U php/php-src/branches/PHP_5_2/ext/ctype/package.xml _U php/php-src/branches/PHP_5_2/ext/curl/package.xml _U php/php-src/branches/PHP_5_2/ext/dbase/package.xml _U php/php-src/branches/PHP_5_2/ext/dom/examples/note-invalid.xml _U php/php-src/branches/PHP_5_2/ext/dom/examples/note.xml _U php/php-src/branches/PHP_5_2/ext/dom/examples/relaxNG.xml _U php/php-src/branches/PHP_5_2/ext/dom/examples/shipping.xml _U php/php-src/branches/PHP_5_2/ext/dom/tests/book.xml _U php/php-src/branches/PHP_5_2/ext/dom/tests/dom.xml _U php/php-src/branches/PHP_5_2/ext/dom/tests/nsdoc.xml _U php/php-src/branches/PHP_5_2/ext/dom/tests/xinclude.xml _U php/php-src/branches/PHP_5_2/ext/exif/package.xml _U php/php-src/branches/PHP_5_2/ext/fdf/package.xml _U php/php-src/branches/PHP_5_2/ext/ftp/package.xml _U php/php-src/branches/PHP_5_2/ext/hash/package.xml _U php/php-src/branches/PHP_5_2/ext/json/package.xml _U php/php-src/branches/PHP_5_2/ext/libxml/tests/test.xml _U php/php-src/branches/PHP_5_2/ext/mime_magic/package.xml _U php/php-src/branches/PHP_5_2/ext/mysql/package.xml _U php/php-src/branches/PHP_5_2/ext/mysqli/package.xml _U php/php-src/branches/PHP_5_2/ext/ncurses/package.xml _U php/php-src/branches/PHP_5_2/ext/oci8/package.xml _U php/php-src/branches/PHP_5_2/ext/oci8/package2.xml _U php/php-src/branches/PHP_5_2/ext/pcntl/package.xml _U php/php-src/branches/PHP_5_2/ext/pdo/package2.xml _U php/php-src/branches/PHP_5_2/ext/pdo_dblib/package2.xml _U php/php-src/branches/PHP_5_2/ext/pdo_firebird/package2.xml _U php/php-src/branches/PHP_5_2/ext/pdo_mysql/package2.xml _U php/php-src/branches/PHP_5_2/ext/pdo_oci/package2.xml _U php/php-src/branches/PHP_5_2/ext/pdo_odbc/package2.xml _U php/php-src/branches/PHP_5_2/ext/pdo_pgsql/package2.xml _U php/php-src/branches/PHP_5_2/ext/pdo_sqlite/package2.xml _U php/php-src/branches/PHP_5_2/ext/posix/package.xml _U php/php-src/branches/PHP_5_2/ext/session/package.xml _U php/php-src/branches/PHP_5_2/ext/shmop/package.xml _U php/php-src/branches/PHP_5_2/ext/shmop/package2.xml _U php/php-src/branches/PHP_5_2/ext/simplexml/examples/book.xml _U php/php-src/branches/PHP_5_2/ext/simplexml/examples/security.xml _U php/php-src/branches/PHP_5_2/ext/simplexml/tests/000.xml _U php/php-src/branches/PHP_5_2/ext/simplexml/tests/book.xml _U php/php-src/branches/PHP_5_2/ext/simplexml/tests/bug24392.xml _U php/php-src/branches/PHP_5_2/ext/simplexml/tests/bug25756_1.xml _U php/php-src/branches/PHP_5_2/ext/simplexml/tests/bug25756_2.xml _U php/php-src/branches/PHP_5_2/ext/simplexml/tests/sxe.xml _U php/php-src/branches/PHP_5_2/ext/soap/package.xml _U php/php-src/branches/PHP_5_2/ext/sockets/package.xml _U php/php-src/branches/PHP_5_2/ext/spl/package.xml _U php/php-src/branches/PHP_5_2/ext/sqlite/package.xml _U php/php-src/branches/PHP_5_2/ext/sysvmsg/package.xml _U php/php-src/branches/PHP_5_2/ext/sysvsem/package.xml _U php/php-src/branches/PHP_5_2/ext/sysvshm/package.xml _U php/php-src/branches/PHP_5_2/ext/tidy/package.xml _U php/php-src/branches/PHP_5_2/ext/tokenizer/package.xml _U php/php-src/branches/PHP_5_2/ext/wddx/package.xml _U php/php-src/branches/PHP_5_2/ext/wddx/tests/wddx.xml _U php/php-src/branches/PHP_5_2/ext/xml/package.xml _U php/php-src/branches/PHP_5_2/ext/xml/tests/xmltest.xml _U php/php-src/branches/PHP_5_2/ext/xmlreader/examples/dtdexample.xml _U php/php-src/branches/PHP_5_2/ext/xmlreader/examples/relaxNG.xml _U php/php-src/branches/PHP_5_2/ext/xmlreader/examples/xmlreader.xml _U php/php-src/branches/PHP_5_2/ext/xmlreader/package.xml _U php/php-src/branches/PHP_5_2/ext/xmlreader/tests/012.xml _U php/php-src/branches/PHP_5_2/ext/xmlwriter/package.xml _U php/php-src/branches/PHP_5_2/ext/xmlwriter/package2.xml _U php/php-src/branches/PHP_5_2/ext/xsl/tests/area_name.xml _U php/php-src/branches/PHP_5_2/ext/xsl/tests/exslt.xml _U php/php-src/branches/PHP_5_2/ext/xsl/tests/xslt.xml _U php/php-src/branches/PHP_5_2/ext/xsl/tests/xslt011.xml _U
