date:20120203

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/README.RELEASE_PROCESS branches/PHP_5_4/README.RELEASE_PROCESS trunk/README.RELEASE_PROCESS

2012-02-03 Thread David Soria Parra

dsp  Fri, 03 Feb 2012 08:14:39 +

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

Log:
mention git

Changed paths:
U   php/php-src/branches/PHP_5_3/README.RELEASE_PROCESS
U   php/php-src/branches/PHP_5_4/README.RELEASE_PROCESS
U   php/php-src/trunk/README.RELEASE_PROCESS

Modified: php/php-src/branches/PHP_5_3/README.RELEASE_PROCESS
===
--- php/php-src/branches/PHP_5_3/README.RELEASE_PROCESS 2012-02-03 08:13:39 UTC 
(rev 323039)
+++ php/php-src/branches/PHP_5_3/README.RELEASE_PROCESS 2012-02-03 08:14:39 UTC 
(rev 323040)
@@ -104,7 +104,7 @@

 ``sudo -u ezmlm ezmlm-sub ~ezmlm/primary-qa-tester/mod 
moderator-email-address``

-3. Update ``web/qa/trunk/include/release-qa.php`` with the appropriate 
information.
+3. Update ``qa.git/include/release-qa.php`` with the appropriate information.
See the documentation within release-qa.php for more information, but all 
releases
and RCs are configured here. Only $QA_RELEASES needs to be edited.

@@ -113,15 +113,15 @@

Note: Remember to update the MD5 checksum information.

-4. Update ``web/php/trunk/include/version.inc`` (x=major version number)
+4. Update ``php.git/include/version.inc`` (x=major version number)

  a. ``$PHP_x_RC`` = 5.3.0RC1

  b. ``$PHP_x_RC_DATE`` = 06 September 2007

-5. Commit those changes:
+5. Commit and push those changes:

- a. ``svn commit web/qa/trunk web/php-bugs/trunk web/php/trunk``
+ a. ``git commit -a  git push origin master``

 6. For the first RC, write the doc team (php...@lists.php.net) about updating 
the
 INSTALL and win32/install.txt files which are generated from the PHP manual 
sources.

Modified: php/php-src/branches/PHP_5_4/README.RELEASE_PROCESS
===
--- php/php-src/branches/PHP_5_4/README.RELEASE_PROCESS 2012-02-03 08:13:39 UTC 
(rev 323039)
+++ php/php-src/branches/PHP_5_4/README.RELEASE_PROCESS 2012-02-03 08:14:39 UTC 
(rev 323040)
@@ -104,7 +104,7 @@

 ``sudo -u ezmlm ezmlm-sub ~ezmlm/primary-qa-tester/mod 
moderator-email-address``

-3. Update ``web/qa/trunk/include/release-qa.php`` with the appropriate 
information.
+3. Update ``qa.git/include/release-qa.php`` with the appropriate information.
See the documentation within release-qa.php for more information, but all 
releases
and RCs are configured here. Only $QA_RELEASES needs to be edited.

@@ -113,15 +113,15 @@

Note: Remember to update the MD5 checksum information.

-4. Update ``web/php/trunk/include/version.inc`` (x=major version number)
+4. Update ``php.git/include/version.inc`` (x=major version number)

  a. ``$PHP_x_RC`` = 5.4.0RC1

  b. ``$PHP_x_RC_DATE`` = 06 September 2007

-5. Commit those changes:
+5. Commit and push those changes:

- a. ``svn commit web/qa/trunk web/php-bugs/trunk web/php/trunk``
+ a. ``git commit -a  git push origin master``

 6. For the first RC, write the doc team (php...@lists.php.net) about updating 
the
 INSTALL and win32/install.txt files which are generated from the PHP manual 
sources.

Modified: php/php-src/trunk/README.RELEASE_PROCESS
===
--- php/php-src/trunk/README.RELEASE_PROCESS2012-02-03 08:13:39 UTC (rev 
323039)
+++ php/php-src/trunk/README.RELEASE_PROCESS2012-02-03 08:14:39 UTC (rev 
323040)
@@ -104,7 +104,7 @@

 ``sudo -u ezmlm ezmlm-sub ~ezmlm/primary-qa-tester/mod 
moderator-email-address``

-3. Update ``web/qa/trunk/include/release-qa.php`` with the appropriate 
information.
+3. Update ``qa.git/include/release-qa.php`` with the appropriate information.
See the documentation within release-qa.php for more information, but all 
releases
and RCs are configured here. Only $QA_RELEASES needs to be edited.

@@ -113,15 +113,15 @@

Note: Remember to update the MD5 checksum information.

-4. Update ``web/php/trunk/include/version.inc`` (x=major version number)
+4. Update ``php.git/include/version.inc`` (x=major version number)

  a. ``$PHP_x_RC`` = 5.4.0RC1

  b. ``$PHP_x_RC_DATE`` = 06 September 2007

-5. Commit those changes:
+5. Commit and push those changes:

- a. ``svn commit web/qa/trunk web/php-bugs/trunk web/php/trunk``
+ a. ``git commit -a  git push origin master``

 6. For the first RC, write the doc team (php...@lists.php.net) about updating 
the
 INSTALL and win32/install.txt files which are generated from the PHP manual 
sources.

-- 
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/tests/general_functions/bug60227.phpt ext/standard/tests/general_functions/bug60227_1.phpt ext/standard/tests/general_functions/bug60227

2012-02-03 Thread Gustavo André dos Santos Lopes

cataphract   Fri, 03 Feb 2012 08:48:34 +

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

Log:
- Merging r323033 into 5.3 (see bug #60227).

Bug: https://bugs.php.net/60227 (Closed) header() cannot detect the multi-line 
header with CR(0x0D).
  
Changed paths:
U   php/php-src/branches/PHP_5_3/NEWS
D   
php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/bug60227.phpt
A + 
php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/bug60227_1.phpt
(from 
php/php-src/trunk/ext/standard/tests/general_functions/bug60227_1.phpt:r323033)
A + 
php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/bug60227_2.phpt
(from 
php/php-src/trunk/ext/standard/tests/general_functions/bug60227_2.phpt:r323033)
U   php/php-src/branches/PHP_5_3/main/SAPI.c

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2012-02-03 08:14:39 UTC (rev 323040)
+++ php/php-src/branches/PHP_5_3/NEWS   2012-02-03 08:48:34 UTC (rev 323041)
@@ -7,7 +7,7 @@

 - Core:
   . Fixed bug #60227 (header() cannot detect the multi-line header with CR).
-(rui)
+(rui, Gustavo)
   . Fixed bug #60825 (Segfault when running symfony 2 tests).
 (Dmitry, Laruence)
   . Fix bug #60895 (Possible invalid handler usage in windows random

Deleted: 
php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/bug60227.phpt
===
--- 
php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/bug60227.phpt 
2012-02-03 08:14:39 UTC (rev 323040)
+++ 
php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/bug60227.phpt 
2012-02-03 08:48:34 UTC (rev 323041)
@@ -1,20 +0,0 @@
---TEST--
-Bug #60227 (header() cannot detect the multi-line header with CR)
---FILE--
-?php
-header(X-Foo1: a);
-header(X-Foo2: b\n );
-header(X-Foo3: c\r\n );
-header(X-Foo4: d\r );
-header(X-Foo5: e\rSet-Cookie: ID=123);
-echo 'foo';
-?
---EXPECTF--
-Warning: Header may not contain more than a single header, new line detected. 
in %s on line %d
-foo
---EXPECTHEADERS--
-X-Foo1: a
-X-Foo2: b
-X-Foo3: c
-X-Foo4: d
-

Copied: 
php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/bug60227_1.phpt
 (from rev 323033, 
php/php-src/trunk/ext/standard/tests/general_functions/bug60227_1.phpt)
===
--- 
php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/bug60227_1.phpt
   (rev 0)
+++ 
php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/bug60227_1.phpt
   2012-02-03 08:48:34 UTC (rev 323041)
@@ -0,0 +1,20 @@
+--TEST--
+Bug #60227 (header() cannot detect the multi-line header with CR)
+--FILE--
+?php
+header(X-Foo1: a);
+header(X-Foo2: b\n );
+header(X-Foo3: c\r\n );
+header(X-Foo4: d\r );
+header(X-Foo5: e\rSet-Cookie: ID=123);
+echo 'foo';
+?
+--EXPECTF--
+Warning: Header may not contain more than a single header, new line detected. 
in %s on line %d
+foo
+--EXPECTHEADERS--
+X-Foo1: a
+X-Foo2: b
+X-Foo3: c
+X-Foo4: d
+

Copied: 
php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/bug60227_2.phpt
 (from rev 323033, 
php/php-src/trunk/ext/standard/tests/general_functions/bug60227_2.phpt)
===
--- 
php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/bug60227_2.phpt
   (rev 0)
+++ 
php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/bug60227_2.phpt
   2012-02-03 08:48:34 UTC (rev 323041)
@@ -0,0 +1,14 @@
+--TEST--
+Bug #60227 (header() cannot detect the multi-line header with CR), \r before \n
+--FILE--
+?php
+header(X-foo: e\n foo);
+header(X-Foo6: e\rSet-Cookie: ID=123\n d);
+echo 'foo';
+?
+--EXPECTF--
+Warning: Header may not contain more than a single header, new line detected. 
in %s on line %d
+foo
+--EXPECTHEADERS--
+X-foo: e
+foo

Modified: php/php-src/branches/PHP_5_3/main/SAPI.c
===
--- php/php-src/branches/PHP_5_3/main/SAPI.c2012-02-03 08:14:39 UTC (rev 
323040)
+++ php/php-src/branches/PHP_5_3/main/SAPI.c2012-02-03 08:48:34 UTC (rev 
323041)
@@ -591,10 +591,11 @@
}
} else {
/* new line safety check */
-   char *s = header_line, *e = header_line + header_line_len, *p;
-   while (s  e  ((p = memchr(s, '\n', (e - s))) || (p = 
memchr(s, '\r', (e - s) {
-   if (*(p + 1) == ' ' || *(p + 1) == '\t') {
-   s = p + 1;
+   char *s = header_line;
+   while (s = strpbrk(s, \n\r)) {
+   if (s[1] == ' ' || s[1] == '\t') {
+   /* RFC 2616 allows new lines if followed by SP 
or HT */
+

[PHP-CVS] svn: /php/php-src/trunk/ ext/standard/tests/general_functions/bug60227_1.phpt ext/standard/tests/general_functions/bug60227_2.phpt ext/standard/tests/general_functions/bug60227_3.phpt ext/st

2012-02-03 Thread Gustavo André dos Santos Lopes

cataphract   Fri, 03 Feb 2012 13:56:37 +

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

Log:
- Headers: forbid \r and \n also after \0, allow CRLF followed by HT or SP and
  forbid \0. See bug #60227.

Bug: https://bugs.php.net/60227 (Closed) header() cannot detect the multi-line 
header with CR(0x0D).
  
Changed paths:
U   php/php-src/trunk/ext/standard/tests/general_functions/bug60227_1.phpt
U   php/php-src/trunk/ext/standard/tests/general_functions/bug60227_2.phpt
A + php/php-src/trunk/ext/standard/tests/general_functions/bug60227_3.phpt
(from 
php/php-src/trunk/ext/standard/tests/general_functions/bug60227_2.phpt:r323040)
A + php/php-src/trunk/ext/standard/tests/general_functions/bug60227_4.phpt
(from 
php/php-src/trunk/ext/standard/tests/general_functions/bug60227_2.phpt:r323040)
U   php/php-src/trunk/main/SAPI.c

Modified: php/php-src/trunk/ext/standard/tests/general_functions/bug60227_1.phpt
===
--- php/php-src/trunk/ext/standard/tests/general_functions/bug60227_1.phpt  
2012-02-03 11:35:15 UTC (rev 323042)
+++ php/php-src/trunk/ext/standard/tests/general_functions/bug60227_1.phpt  
2012-02-03 13:56:37 UTC (rev 323043)
@@ -10,7 +10,7 @@
 echo 'foo';
 ?
 --EXPECTF--
-Warning: Header may not contain more than a single header, new line detected. 
in %s on line %d
+Warning: Header may not contain more than a single header, new line detected 
in %s on line %d
 foo
 --EXPECTHEADERS--
 X-Foo1: a

Modified: php/php-src/trunk/ext/standard/tests/general_functions/bug60227_2.phpt
===
--- php/php-src/trunk/ext/standard/tests/general_functions/bug60227_2.phpt  
2012-02-03 11:35:15 UTC (rev 323042)
+++ php/php-src/trunk/ext/standard/tests/general_functions/bug60227_2.phpt  
2012-02-03 13:56:37 UTC (rev 323043)
@@ -7,7 +7,7 @@
 echo 'foo';
 ?
 --EXPECTF--
-Warning: Header may not contain more than a single header, new line detected. 
in %s on line %d
+Warning: Header may not contain more than a single header, new line detected 
in %s on line %d
 foo
 --EXPECTHEADERS--
 X-foo: e

Copied: php/php-src/trunk/ext/standard/tests/general_functions/bug60227_3.phpt 
(from rev 323040, 
php/php-src/trunk/ext/standard/tests/general_functions/bug60227_2.phpt)
===
--- php/php-src/trunk/ext/standard/tests/general_functions/bug60227_3.phpt  
(rev 0)
+++ php/php-src/trunk/ext/standard/tests/general_functions/bug60227_3.phpt  
2012-02-03 13:56:37 UTC (rev 323043)
@@ -0,0 +1,14 @@
+--TEST--
+Bug #60227 (header() cannot detect the multi-line header with CR), \0 before \n
+--FILE--
+?php
+header(X-foo: e\n foo);
+header(X-Foo6: e\0Set-Cookie: ID=\n123\n d);
+echo 'foo';
+?
+--EXPECTF--
+Warning: Header may not contain NUL bytes in %s on line %d
+foo
+--EXPECTHEADERS--
+X-foo: e
+foo

Copied: php/php-src/trunk/ext/standard/tests/general_functions/bug60227_4.phpt 
(from rev 323040, 
php/php-src/trunk/ext/standard/tests/general_functions/bug60227_2.phpt)
===
--- php/php-src/trunk/ext/standard/tests/general_functions/bug60227_4.phpt  
(rev 0)
+++ php/php-src/trunk/ext/standard/tests/general_functions/bug60227_4.phpt  
2012-02-03 13:56:37 UTC (rev 323043)
@@ -0,0 +1,14 @@
+--TEST--
+Bug #60227 (header() cannot detect the multi-line header with CR), CRLF
+--FILE--
+?php
+header(X-foo: e\r\n foo);
+header(X-foo: e\r\nfoo);
+echo 'foo';
+?
+--EXPECTF--
+Warning: Header may not contain more than a single header, new line detected 
in %s on line %d
+foo
+--EXPECTHEADERS--
+X-foo: e
+ foo

Modified: php/php-src/trunk/main/SAPI.c
===
--- php/php-src/trunk/main/SAPI.c   2012-02-03 11:35:15 UTC (rev 323042)
+++ php/php-src/trunk/main/SAPI.c   2012-02-03 13:56:37 UTC (rev 323043)
@@ -710,17 +710,26 @@
efree(header_line);
return SUCCESS;
} else {
-   /* new line safety check */
-   char *s = header_line;
-   while (s = strpbrk(s, \n\r)) {
-   if (s[1] == ' ' || s[1] == '\t') {
-   /* RFC 2616 allows new lines if followed by SP 
or HT */
-   s++;
-   continue;
+   /* new line/NUL character safety check */
+   int i;
+   for (i = 0; i  header_line_len; i++) {
+   /* RFC 2616 allows new lines if followed by SP or HT */
+   int illegal_break =
+   (header_line[i+1] != ' '  
header_line[i+1] != '\t')
+(
+

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/reflection/php_reflection.c branches/PHP_5_3/ext/reflection/tests/bug60367.phpt trunk/NEWS trunk/ext/reflection/php_reflection.c

2012-02-03 Thread Xinchen Hui

laruence Fri, 03 Feb 2012 16:27:35 +

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

Log:
Fixed bug #60968 (Late static binding doesn't work with 
ReflectionMethod::invokeArgs())

Bug: https://bugs.php.net/60968 (Assigned) Late static binding doesn't work 
with ReflectionMethod::invokeArgs()
  
Changed paths:
U   php/php-src/branches/PHP_5_3/NEWS
U   php/php-src/branches/PHP_5_3/ext/reflection/php_reflection.c
U   php/php-src/branches/PHP_5_3/ext/reflection/tests/bug60367.phpt
U   php/php-src/trunk/NEWS
U   php/php-src/trunk/ext/reflection/php_reflection.c
U   php/php-src/trunk/ext/reflection/tests/bug60367.phpt

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2012-02-03 16:21:08 UTC (rev 323044)
+++ php/php-src/branches/PHP_5_3/NEWS   2012-02-03 16:27:35 UTC (rev 323045)
@@ -36,6 +36,10 @@
 - SOAP:
   . Fixed basic HTTP authentication for WSDL sub requests. (Dmitry)

+- Reflection:
+  . Fixed bug #60968 (Late static binding doesn't work with
+ReflectionMethod::invokeArgs()). (Laruence)
+
 ?? ??? 2012, PHP 5.3.10

 (to be added)

Modified: php/php-src/branches/PHP_5_3/ext/reflection/php_reflection.c
===
--- php/php-src/branches/PHP_5_3/ext/reflection/php_reflection.c
2012-02-03 16:21:08 UTC (rev 323044)
+++ php/php-src/branches/PHP_5_3/ext/reflection/php_reflection.c
2012-02-03 16:27:35 UTC (rev 323045)
@@ -2744,7 +2744,7 @@
fcc.initialized = 1;
fcc.function_handler = mptr;
fcc.calling_scope = obj_ce;
-   fcc.called_scope = obj_ce;
+   fcc.called_scope = intern-ce;
fcc.object_ptr = object;

result = zend_call_function(fci, fcc TSRMLS_CC);

Modified: php/php-src/branches/PHP_5_3/ext/reflection/tests/bug60367.phpt
===
--- php/php-src/branches/PHP_5_3/ext/reflection/tests/bug60367.phpt 
2012-02-03 16:21:08 UTC (rev 323044)
+++ php/php-src/branches/PHP_5_3/ext/reflection/tests/bug60367.phpt 
2012-02-03 16:27:35 UTC (rev 323045)
@@ -20,7 +20,9 @@

 $method = new ReflectionMethod(b::call);
 $method-invoke(null);
+$method-invokeArgs(null, array());
 $method = new ReflectionMethod(A::call);
 $method-invoke(null);
+$method-invokeArgs(null, array());
 --EXPECTF--
-BA
+BBAA

Modified: php/php-src/trunk/NEWS
===
--- php/php-src/trunk/NEWS  2012-02-03 16:21:08 UTC (rev 323044)
+++ php/php-src/trunk/NEWS  2012-02-03 16:27:35 UTC (rev 323045)
@@ -35,4 +35,8 @@
 - pgsql
   . Added pg_escape_literal() and pg_escape_identifier() (Yasuo)

+- Reflection:
+  . Fixed bug #60968 (Late static binding doesn't work with
+ReflectionMethod::invokeArgs()). (Laruence)
+
  NOTE: Insert NEWS from last stable release here prior to actual release! 


Modified: php/php-src/trunk/ext/reflection/php_reflection.c
===
--- php/php-src/trunk/ext/reflection/php_reflection.c   2012-02-03 16:21:08 UTC 
(rev 323044)
+++ php/php-src/trunk/ext/reflection/php_reflection.c   2012-02-03 16:27:35 UTC 
(rev 323045)
@@ -2920,7 +2920,7 @@
fcc.initialized = 1;
fcc.function_handler = mptr;
fcc.calling_scope = obj_ce;
-   fcc.called_scope = obj_ce;
+   fcc.called_scope = intern-ce;
fcc.object_ptr = object;

result = zend_call_function(fci, fcc TSRMLS_CC);

Modified: php/php-src/trunk/ext/reflection/tests/bug60367.phpt
===
--- php/php-src/trunk/ext/reflection/tests/bug60367.phpt2012-02-03 
16:21:08 UTC (rev 323044)
+++ php/php-src/trunk/ext/reflection/tests/bug60367.phpt2012-02-03 
16:27:35 UTC (rev 323045)
@@ -20,7 +20,9 @@

 $method = new ReflectionMethod(b::call);
 $method-invoke(null);
+$method-invokeArgs(null, array());
 $method = new ReflectionMethod(A::call);
 $method-invoke(null);
+$method-invokeArgs(null, array());
 --EXPECTF--
-BA
+BBAA

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

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/README.RELEASE_PROCESS branches/PHP_5_4/README.RELEASE_PROCESS trunk/README.RELEASE_PROCESS

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ NEWS ext/standard/tests/general_functions/bug60227.phpt ext/standard/tests/general_functions/bug60227_1.phpt ext/standard/tests/general_functions/bug60227

[PHP-CVS] svn: /php/php-src/trunk/ ext/standard/tests/general_functions/bug60227_1.phpt ext/standard/tests/general_functions/bug60227_2.phpt ext/standard/tests/general_functions/bug60227_3.phpt ext/st

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/reflection/php_reflection.c branches/PHP_5_3/ext/reflection/tests/bug60367.phpt trunk/NEWS trunk/ext/reflection/php_reflection.c

4 matches

Site Navigation

Mail list logo

Footer information