[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ext/standard/ info.c
aharvey Tue, 23 Aug 2011 06:07:24 + Revision: http://svn.php.net/viewvc?view=revisionrevision=315332 Log: Fix bug #55483 (extra at the end of html tag in phpinfo). Bug: https://bugs.php.net/55483 (Assigned) extra at the end of html tag in phpinfo Changed paths: U php/php-src/branches/PHP_5_3/ext/standard/info.c Modified: php/php-src/branches/PHP_5_3/ext/standard/info.c === --- php/php-src/branches/PHP_5_3/ext/standard/info.c2011-08-23 04:16:40 UTC (rev 315331) +++ php/php-src/branches/PHP_5_3/ext/standard/info.c2011-08-23 06:07:24 UTC (rev 315332) @@ -626,7 +626,7 @@ PUTS(!DOCTYPE html PUBLIC \-//W3C//DTD XHTML 1.0 Transitional//EN\ \DTD/xhtml1-transitional.dtd\\n); - PUTS(html xmlns=\http://www.w3.org/1999/xhtml\;); + PUTS(html xmlns=\http://www.w3.org/1999/xhtml\;); PUTS(head\n); php_info_print_style(TSRMLS_C); PUTS(titlephpinfo()/title); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/
johannes Tue, 23 Aug 2011 07:54:01 + Revision: http://svn.php.net/viewvc?view=revisionrevision=315335 Log: - Release branch for re-tagging 5.3.8 Changed paths: A + php/php-src/branches/PHP_5_3_8/ (from php/php-src/tags/php_5_3_7/:r315334) Property changes on: php/php-src/branches/PHP_5_3_8 ___ Added: svn:ignore + *.gcda *.gcno *.la *.lo *.ncb *.opt *.plg FBCIndex FBCLockFolder deps libs Debug Debug_TS Makefile Makefile.fragments Makefile.objects Release Release_TS Release_TSDbg Release_TS_inline Release_inline ZendEngine1 _libs acconfig.h aclocal.m4 autom4te.cache bsd_converted buildconf.stamp buildmk.stamp confdefs.h config.cache config.h.in config.log config.nice config.nice.bat config.status config_vars.mk configuration-parser.c configuration-parser.h configuration-parser.output configuration-scanner.c configure configure.bat configure.js conftest conftest.c debug.log diff generated_lists include install-sh internal_functions.c lcov_data lcov_html libs libtool meta_cc meta_ccld missing mkinstalldirs modules php php-*.tar.gz php5.spec php_lcov.info php_test_results_*.txt php_version.h results.txt shlibtool stamp-h test.php3 tmp-php.ini want_dependencies x64 Added: svn:mergeinfo + /php/php-src/trunk:284726,305015,305018-305019 -- 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_8/ ext/standard/php_crypt_r.c
johannes Tue, 23 Aug 2011 08:09:55 + Revision: http://svn.php.net/viewvc?view=revisionrevision=315338 Log: Merge r315218 - Unbreak crypt() (fix bug #55439) (stas) Bug: https://bugs.php.net/55439 (Closed) crypt() returns only the salt for MD5 Changed paths: _U php/php-src/branches/PHP_5_3_8/ U php/php-src/branches/PHP_5_3_8/ext/standard/php_crypt_r.c Property changes on: php/php-src/branches/PHP_5_3_8 ___ Modified: svn:mergeinfo - /php/php-src/trunk:284726,305015,305018-305019 + /php/php-src/branches/PHP_5_3:315218 /php/php-src/trunk:284726,305015,305018-305019 Modified: php/php-src/branches/PHP_5_3_8/ext/standard/php_crypt_r.c === --- php/php-src/branches/PHP_5_3_8/ext/standard/php_crypt_r.c 2011-08-23 08:02:38 UTC (rev 315337) +++ php/php-src/branches/PHP_5_3_8/ext/standard/php_crypt_r.c 2011-08-23 08:09:55 UTC (rev 315338) @@ -382,7 +382,7 @@ /* Now make the output string */ memcpy(passwd, MD5_MAGIC, MD5_MAGIC_LEN); strlcpy(passwd + MD5_MAGIC_LEN, sp, sl + 1); - strlcat(passwd, $, 1); + strcat(passwd, $); PHP_MD5Final(final, ctx); -- 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_8/ ext/openssl/xp_ssl.c
johannes Tue, 23 Aug 2011 08:12:58 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=315339
Log:
Mere r315310 (Revert r313515)
Changed paths:
_U php/php-src/branches/PHP_5_3_8/
U php/php-src/branches/PHP_5_3_8/ext/openssl/xp_ssl.c
Property changes on: php/php-src/branches/PHP_5_3_8
___
Modified: svn:mergeinfo
- /php/php-src/branches/PHP_5_3:315218
/php/php-src/trunk:284726,305015,305018-305019
+ /php/php-src/branches/PHP_5_3:315218,315310
/php/php-src/trunk:284726,305015,305018-305019
Modified: php/php-src/branches/PHP_5_3_8/ext/openssl/xp_ssl.c
===
--- php/php-src/branches/PHP_5_3_8/ext/openssl/xp_ssl.c 2011-08-23 08:09:55 UTC
(rev 315338)
+++ php/php-src/branches/PHP_5_3_8/ext/openssl/xp_ssl.c 2011-08-23 08:12:58 UTC
(rev 315339)
@@ -204,36 +204,6 @@
return didwrite;
}
-static void php_openssl_stream_wait_for_data(php_stream *stream,
php_netstream_data_t *sock TSRMLS_DC)
-{
- int retval;
- struct timeval *ptimeout;
-
- if (sock-socket == -1) {
- return;
- }
-
- sock-timeout_event = 0;
-
- if (sock-timeout.tv_sec == -1)
- ptimeout = NULL;
- else
- ptimeout = sock-timeout;
-
- while(1) {
- retval = php_pollfd_for(sock-socket, PHP_POLLREADABLE,
ptimeout);
-
- if (retval == 0)
- sock-timeout_event = 1;
-
- if (retval = 0)
- break;
-
- if (php_socket_errno() != EINTR)
- break;
- }
-}
-
static size_t php_openssl_sockop_read(php_stream *stream, char *buf, size_t
count TSRMLS_DC)
{
php_openssl_netstream_data_t *sslsock =
(php_openssl_netstream_data_t*)stream-abstract;
@@ -243,13 +213,6 @@
int retry = 1;
do {
- if (sslsock-s.is_blocked) {
- php_openssl_stream_wait_for_data(stream,
(sslsock-s) TSRMLS_CC);
- if (sslsock-s.timeout_event) {
- break;
- }
- /* there is no guarantee that there is
application data available but something is there */
- }
nr_bytes = SSL_read(sslsock-ssl_handle, buf, count);
if (nr_bytes = 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_8/ NEWS
johannes Tue, 23 Aug 2011 08:14:15 + Revision: http://svn.php.net/viewvc?view=revisionrevision=315340 Log: - Update NEWS Changed paths: U php/php-src/branches/PHP_5_3_8/NEWS Modified: php/php-src/branches/PHP_5_3_8/NEWS === --- php/php-src/branches/PHP_5_3_8/NEWS 2011-08-23 08:12:58 UTC (rev 315339) +++ php/php-src/branches/PHP_5_3_8/NEWS 2011-08-23 08:14:15 UTC (rev 315340) @@ -1,5 +1,14 @@ PHPNEWS ||| +23 Aug 2011, PHP 5.3.8 + +- Core: + . Fixed bug #55439 (crypt() returns only the salt for MD5). (Stas) + +- OpenSSL: + . Reverted a change in timeout handling restoring PHP 5.3.6 behavior. (Pierre, +Andrey, Johannes) + 18 Aug 2011, PHP 5.3.7 - Upgraded bundled SQLite to version 3.7.7.1. (Scott) - Upgraded bundled PCRE to version 8.12. (Scott) -- 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_8/ NEWS
johannes Tue, 23 Aug 2011 08:31:07 + Revision: http://svn.php.net/viewvc?view=revisionrevision=315341 Log: Make more verbose Changed paths: U php/php-src/branches/PHP_5_3_8/NEWS Modified: php/php-src/branches/PHP_5_3_8/NEWS === --- php/php-src/branches/PHP_5_3_8/NEWS 2011-08-23 08:14:15 UTC (rev 315340) +++ php/php-src/branches/PHP_5_3_8/NEWS 2011-08-23 08:31:07 UTC (rev 315341) @@ -6,8 +6,9 @@ . Fixed bug #55439 (crypt() returns only the salt for MD5). (Stas) - OpenSSL: - . Reverted a change in timeout handling restoring PHP 5.3.6 behavior. (Pierre, -Andrey, Johannes) + . Reverted a change in timeout handling restoring PHP 5.3.6 behavior, +as the new behavior caused mysqlnd SSL connections to hang (#55283). +(Pierre, Andrey, Johannes) 18 Aug 2011, PHP 5.3.7 - Upgraded bundled SQLite to version 3.7.7.1. (Scott) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /SVNROOT/ global_avail
bjoriTue, 23 Aug 2011 08:37:36 + Revision: http://svn.php.net/viewvc?view=revisionrevision=315342 Log: They only need phpweb karma, not full web/* karma Changed paths: U SVNROOT/global_avail Modified: SVNROOT/global_avail === --- SVNROOT/global_avail2011-08-23 08:31:07 UTC (rev 315341) +++ SVNROOT/global_avail2011-08-23 08:37:36 UTC (rev 315342) @@ -55,7 +55,7 @@ avail|salathe,scottmac,jmertic,lsmith,johannes,ilia,cmv,tcobb,gareth,jah,eschmid,ronabop,derick,sterling,stas,phildriscoll,jmoore,andre,jani,david,lyric,zimt,mk,goba,zak,jmcastagnetto,dams,tom,jacques,sebastian,georg,mj,imajes,cortesi,sander,markonen,edink,jan,victor,mfischer,wez,sesser,pollita,alindeman,magnus,iliaa,philip,didou,sfox,sean,dufuz,nlopess,pajoye,helly,tony2001,bjori,felipe,dsp,aharvey,danbrown,moacir,till,vrana,tyrael|web/php,web/php-bugs,web/php-master,web/php-news,web/php-hosts,web/php-wiki,web/php-people,web/pecl,web/qa avail|degeberg|web/php-bugs -avail|danielc|web/php +avail|danielc|web/php/ avail|ericstewart|web/php/*/archive avail|odoucet|web/php-news/,web/qa/ avail|shein|web/php-news/ @@ -248,7 +248,7 @@ avail|mike|pecl/http avail|gabe|pecl/intercept avail|jon|web/php/extra -avail|iamsure|web/php +avail|iamsure|web/php/ avail|scottmattocks|gtk/php-gtk/test avail|mboeren|pecl/dbx avail|mike|pecl/win32ps @@ -270,7 +270,7 @@ avail|wharmby|php/php-src avail|void|pecl/bbcode avail|sankazim|pecl/amf -avail|davidc|web/php +avail|davidc|web/php/ avail|sankazim,zardozrocks|pecl/amfext,phpdoc avail|doury|pecl/ims avail|va|pecl/yami -- 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_8/ configure.in main/php_version.h
johannes Tue, 23 Aug 2011 08:56:29 + Revision: http://svn.php.net/viewvc?view=revisionrevision=315343 Log: PHP 5.3.8 (based on 5.3.7 + selected backports) Changed paths: U php/php-src/branches/PHP_5_3_8/configure.in U php/php-src/branches/PHP_5_3_8/main/php_version.h Modified: php/php-src/branches/PHP_5_3_8/configure.in === --- php/php-src/branches/PHP_5_3_8/configure.in 2011-08-23 08:37:36 UTC (rev 315342) +++ php/php-src/branches/PHP_5_3_8/configure.in 2011-08-23 08:56:29 UTC (rev 315343) @@ -41,7 +41,7 @@ PHP_MAJOR_VERSION=5 PHP_MINOR_VERSION=3 -PHP_RELEASE_VERSION=7 +PHP_RELEASE_VERSION=8 PHP_EXTRA_VERSION= PHP_VERSION=$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 1 + [$]PHP_MINOR_VERSION \* 100 + [$]PHP_RELEASE_VERSION` Modified: php/php-src/branches/PHP_5_3_8/main/php_version.h === --- php/php-src/branches/PHP_5_3_8/main/php_version.h 2011-08-23 08:37:36 UTC (rev 315342) +++ php/php-src/branches/PHP_5_3_8/main/php_version.h 2011-08-23 08:56:29 UTC (rev 315343) @@ -2,7 +2,7 @@ /* edit configure.in to change version number */ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 3 -#define PHP_RELEASE_VERSION 7 +#define PHP_RELEASE_VERSION 8 #define PHP_EXTRA_VERSION -#define PHP_VERSION 5.3.7 -#define PHP_VERSION_ID 50307 +#define PHP_VERSION 5.3.8 +#define PHP_VERSION_ID 50308 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/tags/
johannes Tue, 23 Aug 2011 09:24:39 + Revision: http://svn.php.net/viewvc?view=revisionrevision=315345 Log: - Remove old 5.3.8 Changed paths: D php/php-src/tags/php_5_3_8/ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/tags/
johannes Tue, 23 Aug 2011 09:28:57 + Revision: http://svn.php.net/viewvc?view=revisionrevision=315347 Log: - PHP 5.3.8 Changed paths: A + php/php-src/tags/php_5_3_8/ (from php/php-src/branches/PHP_5_3_8/:r315346) Property changes on: php/php-src/tags/php_5_3_8 ___ Added: svn:ignore + *.gcda *.gcno *.la *.lo *.ncb *.opt *.plg FBCIndex FBCLockFolder deps libs Debug Debug_TS Makefile Makefile.fragments Makefile.objects Release Release_TS Release_TSDbg Release_TS_inline Release_inline ZendEngine1 _libs acconfig.h aclocal.m4 autom4te.cache bsd_converted buildconf.stamp buildmk.stamp confdefs.h config.cache config.h.in config.log config.nice config.nice.bat config.status config_vars.mk configuration-parser.c configuration-parser.h configuration-parser.output configuration-scanner.c configure configure.bat configure.js conftest conftest.c debug.log diff generated_lists include install-sh internal_functions.c lcov_data lcov_html libs libtool meta_cc meta_ccld missing mkinstalldirs modules php php-*.tar.gz php5.spec php_lcov.info php_test_results_*.txt php_version.h results.txt shlibtool stamp-h test.php3 tmp-php.ini want_dependencies x64 Added: svn:mergeinfo + /php/php-src/branches/PHP_5_3:315218,315310 /php/php-src/trunk:284726,305015,305018-305019 -- 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 branches/PHP_5_4/php.ini-development trunk/php.ini-development
bjoriTue, 23 Aug 2011 10:00:18 + Revision: http://svn.php.net/viewvc?view=revisionrevision=315352 Log: Sync -development with -production Changed paths: U php/php-src/branches/PHP_5_3/php.ini-development U php/php-src/branches/PHP_5_4/php.ini-development U php/php-src/trunk/php.ini-development Modified: php/php-src/branches/PHP_5_3/php.ini-development === --- php/php-src/branches/PHP_5_3/php.ini-development2011-08-23 09:39:56 UTC (rev 315351) +++ php/php-src/branches/PHP_5_3/php.ini-development2011-08-23 10:00:18 UTC (rev 315352) @@ -969,7 +969,6 @@ ;extension=php_pdo_pgsql.dll ;extension=php_pdo_sqlite.dll ;extension=php_pgsql.dll -;extension=php_phar.dll ;extension=php_pspell.dll ;extension=php_shmop.dll @@ -1248,6 +1247,14 @@ ; http://php.net/mysqli.max-persistent mysqli.max_persistent = -1 +; Allow accessing, from PHP's perspective, local files with LOAD DATA statements +; http://php.net/mysqli.allow_local_infile +;mysqli.allow_local_infile = On + +; Allow or prevent persistent links. +; http://php.net/mysqli.allow-persistent +mysqli.allow_persistent = On + ; Maximum number of links. -1 means no limit. ; http://php.net/mysqli.max-links mysqli.max_links = -1 Modified: php/php-src/branches/PHP_5_4/php.ini-development === --- php/php-src/branches/PHP_5_4/php.ini-development2011-08-23 09:39:56 UTC (rev 315351) +++ php/php-src/branches/PHP_5_4/php.ini-development2011-08-23 10:00:18 UTC (rev 315352) @@ -871,14 +871,12 @@ ;extension=php_oci8_11g.dll ; Use with Oracle 11g Instant Client ;extension=php_openssl.dll ;extension=php_pdo_firebird.dll -;extension=php_pdo_mssql.dll ;extension=php_pdo_mysql.dll ;extension=php_pdo_oci.dll ;extension=php_pdo_odbc.dll ;extension=php_pdo_pgsql.dll ;extension=php_pdo_sqlite.dll ;extension=php_pgsql.dll -;extension=php_phar.dll ;extension=php_pspell.dll ;extension=php_shmop.dll Modified: php/php-src/trunk/php.ini-development === --- php/php-src/trunk/php.ini-development 2011-08-23 09:39:56 UTC (rev 315351) +++ php/php-src/trunk/php.ini-development 2011-08-23 10:00:18 UTC (rev 315352) @@ -871,14 +871,12 @@ ;extension=php_oci8_11g.dll ; Use with Oracle 11g Instant Client ;extension=php_openssl.dll ;extension=php_pdo_firebird.dll -;extension=php_pdo_mssql.dll ;extension=php_pdo_mysql.dll ;extension=php_pdo_oci.dll ;extension=php_pdo_odbc.dll ;extension=php_pdo_pgsql.dll ;extension=php_pdo_sqlite.dll ;extension=php_pgsql.dll -;extension=php_phar.dll ;extension=php_pspell.dll ;extension=php_shmop.dll -- 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/ereg/ereg.c ext/ereg/regex/regerror.c ext/mysqlnd/mysqlnd_charset.c ext/standard/var.c main/streams/cast.c
laruence Tue, 23 Aug 2011 10:18:48 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=315356
Log:
Sync r314808 to 5_3 branch
Eliminated compiler warnings comparison is always false, cast to pointer
from integer of different siz and tail zero warnings
Changed paths:
U php/php-src/branches/PHP_5_3/ext/ereg/ereg.c
U php/php-src/branches/PHP_5_3/ext/ereg/regex/regerror.c
U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_charset.c
U php/php-src/branches/PHP_5_3/ext/standard/var.c
U php/php-src/branches/PHP_5_3/main/streams/cast.c
Modified: php/php-src/branches/PHP_5_3/ext/ereg/ereg.c
===
--- php/php-src/branches/PHP_5_3/ext/ereg/ereg.c2011-08-23 10:18:16 UTC
(rev 315355)
+++ php/php-src/branches/PHP_5_3/ext/ereg/ereg.c2011-08-23 10:18:48 UTC
(rev 315356)
@@ -475,6 +475,7 @@
buf_len = 1 + buf_len + 2 * new_l;
nbuf = emalloc(buf_len);
strncpy(nbuf, buf, buf_len-1);
+ nbuf[buf_len - 1] = '\0';
efree(buf);
buf = nbuf;
}
@@ -486,7 +487,7 @@
walkbuf = buf[tmp + subs[0].rm_so];
walk = replace;
while (*walk) {
- if ('\\' == *walk isdigit(walk[1])
walk[1] - '0' = (int)re.re_nsub) {
+ if ('\\' == *walk isdigit((unsigned
char)walk[1]) ((unsigned char)walk[1]) - '0' = (int)re.re_nsub) {
if (subs[walk[1] - '0'].rm_so -1
subs[walk[1] - '0'].rm_eo -1
/* this next case shouldn't
happen. it does. */
subs[walk[1] - '0'].rm_so =
subs[walk[1] - '0'].rm_eo) {
Modified: php/php-src/branches/PHP_5_3/ext/ereg/regex/regerror.c
===
--- php/php-src/branches/PHP_5_3/ext/ereg/regex/regerror.c 2011-08-23
10:18:16 UTC (rev 315355)
+++ php/php-src/branches/PHP_5_3/ext/ereg/regex/regerror.c 2011-08-23
10:18:48 UTC (rev 315356)
@@ -82,10 +82,12 @@
break;
if (errcodeREG_ITOA) {
- if (r-code = 0)
- (void) strncpy(convbuf, r-name, 50);
- else
+ if (r-code = 0) {
+ (void) strncpy(convbuf, r-name,
sizeof(convbuf) - 1);
+ convbuf[sizeof(convbuf) - 1] = '\0';
+ } else {
snprintf(convbuf, sizeof(convbuf), REG_0x%x,
target);
+ }
assert(strlen(convbuf) sizeof(convbuf));
s = convbuf;
} else
Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_charset.c
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_charset.c 2011-08-23
10:18:16 UTC (rev 315355)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_charset.c 2011-08-23
10:18:48 UTC (rev 315356)
@@ -125,8 +125,8 @@
if (!((start[1] ^ 0x80) 0x40
(start[2] ^ 0x80) 0x40
(start[3] ^ 0x80) 0x40
- (c = 0xf1 || start[1] = 0x90)
- (c = 0xf3 || start[1] = 0x8F)))
+ (c = 0xf1 || start[1] = (char)0x90)
+ (c = 0xf3 || start[1] = (char)0x8F)))
{
return 0; /* invalid utf8 character */
}
Modified: php/php-src/branches/PHP_5_3/ext/standard/var.c
===
--- php/php-src/branches/PHP_5_3/ext/standard/var.c 2011-08-23 10:18:16 UTC
(rev 315355)
+++ php/php-src/branches/PHP_5_3/ext/standard/var.c 2011-08-23 10:18:48 UTC
(rev 315356)
@@ -598,7 +598,7 @@
PHP_SET_CLASS_ATTRIBUTES(struc);
smart_str_appendl(buf, O:, 2);
- smart_str_append_long(buf, (long)name_len);
+ smart_str_append_long(buf, (int)name_len);
smart_str_appendl(buf, :\, 2);
smart_str_appendl(buf, class_name, name_len);
smart_str_appendl(buf, \:, 2);
@@ -764,12 +764,12 @@
if (ce-serialize(struc,
serialized_data, serialized_length, (zend_serialize_data *)var_hash
TSRMLS_CC) == SUCCESS) {
smart_str_appendl(buf, C:, 2);
- smart_str_append_long(buf,
(long)Z_OBJCE_P(struc)-name_length);
+
[PHP-CVS] svn: /php/php-src/trunk/ README.RELEASE_PROCESS
johannes Tue, 23 Aug 2011 15:43:40 + Revision: http://svn.php.net/viewvc?view=revisionrevision=315375 Log: - Add a note to mention changeLog and downloads in the news entry Changed paths: U php/php-src/trunk/README.RELEASE_PROCESS Modified: php/php-src/trunk/README.RELEASE_PROCESS === --- php/php-src/trunk/README.RELEASE_PROCESS2011-08-23 15:40:32 UTC (rev 315374) +++ php/php-src/trunk/README.RELEASE_PROCESS2011-08-23 15:43:40 UTC (rev 315375) @@ -228,7 +228,7 @@ 7. Add a short notice to phpweb stating that there is a new release, and highlight the major important things (security fixes) and when it is important -to upgrade. +to upgrade. Make sure the news entry links to the ChangeLog and downloads. a. Call php bin/createNewsEntry in your local phpweb checkout -- 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/tests/DateTime_data-dates.inc branches/PHP_5_3/ext/date/tests/DateTime_data-february.inc branches/PHP_5_3/ext/date/tests/DateTime_sub-dates.phpt
danielc Tue, 23 Aug 2011 16:40:19 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=315376
Log:
Fix differences in some sub() results that were causing tests to fail.
Changed paths:
U php/php-src/branches/PHP_5_3/ext/date/tests/DateTime_data-dates.inc
U php/php-src/branches/PHP_5_3/ext/date/tests/DateTime_data-february.inc
U php/php-src/branches/PHP_5_3/ext/date/tests/DateTime_sub-dates.phpt
U php/php-src/branches/PHP_5_3/ext/date/tests/DateTime_sub-february.phpt
U php/php-src/branches/PHP_5_4/ext/date/tests/DateTime_data-dates.inc
U php/php-src/branches/PHP_5_4/ext/date/tests/DateTime_data-february.inc
U php/php-src/branches/PHP_5_4/ext/date/tests/DateTime_sub-dates.phpt
U php/php-src/branches/PHP_5_4/ext/date/tests/DateTime_sub-february.phpt
U php/php-src/trunk/ext/date/tests/DateTime_data-dates.inc
U php/php-src/trunk/ext/date/tests/DateTime_data-february.inc
U php/php-src/trunk/ext/date/tests/DateTime_sub-dates.phpt
U php/php-src/trunk/ext/date/tests/DateTime_sub-february.phpt
Modified: php/php-src/branches/PHP_5_3/ext/date/tests/DateTime_data-dates.inc
===
--- php/php-src/branches/PHP_5_3/ext/date/tests/DateTime_data-dates.inc 2011-08-23 15:43:40 UTC (rev 315375)
+++ php/php-src/branches/PHP_5_3/ext/date/tests/DateTime_data-dates.inc 2011-08-23 16:40:19 UTC (rev 315376)
@@ -20,6 +20,7 @@
echo test_years_positive__7_by_1_day: ;
examine_diff('2007-02-08', '2000-02-07', 'P+7Y0M1DT0H0M0S', 2558);
+// NOTE: sub() produces different answer.
echo test_years_positive__6_shy_1_day: ;
examine_diff('2007-02-06', '2000-02-07', 'P+6Y11M30DT0H0M0S', 2556);
@@ -48,6 +49,7 @@
echo test_years_negative__7_by_1_day: ;
examine_diff('2000-02-07', '2007-02-08', 'P-7Y0M1DT0H0M0S', 2558);
+// NOTE: sub() produces different answer.
echo test_years_negative__6_shy_1_day: ;
examine_diff('2000-02-07', '2007-02-06', 'P-6Y11M28DT0H0M0S', 2556);
Modified: php/php-src/branches/PHP_5_3/ext/date/tests/DateTime_data-february.inc
===
--- php/php-src/branches/PHP_5_3/ext/date/tests/DateTime_data-february.inc 2011-08-23 15:43:40 UTC (rev 315375)
+++ php/php-src/branches/PHP_5_3/ext/date/tests/DateTime_data-february.inc 2011-08-23 16:40:19 UTC (rev 315376)
@@ -71,15 +71,19 @@
echo test_bug_49081__20: ;
examine_diff('2010-03-01', '2010-01-31', 'P+0Y0M29DT0H0M0S', 29);
+// NOTE: sub() produces different answer.
echo test_bug_49081__21: ;
examine_diff('2010-03-27', '2010-01-31', 'P+0Y1M24DT0H0M0S', 55);
+// NOTE: sub() produces different answer.
echo test_bug_49081__22: ;
examine_diff('2010-03-28', '2010-01-31', 'P+0Y1M25DT0H0M0S', 56);
+// NOTE: sub() produces different answer.
echo test_bug_49081__23: ;
examine_diff('2010-03-29', '2010-01-31', 'P+0Y1M26DT0H0M0S', 57);
+// NOTE: sub() produces different answer.
echo test_bug_49081__24: ;
examine_diff('2010-03-30', '2010-01-31', 'P+0Y1M27DT0H0M0S', 58);
@@ -168,18 +172,23 @@
echo test_bug_49081_negative__19: ;
examine_diff('2010-01-01', '2010-03-01', 'P-0Y2M0DT0H0M0S', 59);
+// NOTE: sub() produces different answer.
echo test_bug_49081_negative__20: ;
examine_diff('2010-01-31', '2010-03-01', 'P-0Y1M1DT0H0M0S', 29);
+// NOTE: sub() produces different answer.
echo test_bug_49081_negative__21: ;
examine_diff('2010-01-31', '2010-03-27', 'P-0Y1M27DT0H0M0S', 55);
+// NOTE: sub() produces different answer.
echo test_bug_49081_negative__22: ;
examine_diff('2010-01-31', '2010-03-28', 'P-0Y1M28DT0H0M0S', 56);
+// NOTE: sub() produces different answer.
echo test_bug_49081_negative__23: ;
examine_diff('2010-01-31', '2010-03-29', 'P-0Y1M29DT0H0M0S', 57);
+// NOTE: sub() produces different answer.
echo test_bug_49081_negative__24: ;
examine_diff('2010-01-31', '2010-03-30', 'P-0Y1M30DT0H0M0S', 58);
Modified: php/php-src/branches/PHP_5_3/ext/date/tests/DateTime_sub-dates.phpt
===
--- php/php-src/branches/PHP_5_3/ext/date/tests/DateTime_sub-dates.phpt 2011-08-23 15:43:40 UTC (rev 315375)
+++ php/php-src/branches/PHP_5_3/ext/date/tests/DateTime_sub-dates.phpt 2011-08-23 16:40:19 UTC (rev 315376)
@@ -14,7 +14,7 @@
test__7: SUB: 2009-01-14 00:00:00 EST - P+0Y0M7DT0H0M0S = **2009-01-07 00:00:00 EST**
test_years_positive__7_by_0_day: SUB: 2007-02-07 00:00:00 EST - P+7Y0M0DT0H0M0S = **2000-02-07 00:00:00 EST**
test_years_positive__7_by_1_day: SUB: 2007-02-08 00:00:00 EST - P+7Y0M1DT0H0M0S = **2000-02-07 00:00:00 EST**
-test_years_positive__6_shy_1_day: SUB: 2007-02-06 00:00:00 EST - P+6Y11M30DT0H0M0S = **2000-02-07 00:00:00 EST**
+test_years_positive__6_shy_1_day: SUB: 2007-02-06 00:00:00 EST - P+6Y11M30DT0H0M0S = **2000-02-05 00:00:00 EST**
test_years_positive__7_by_1_month: SUB: 2007-03-07 00:00:00 EST - P+7Y1M0DT0H0M0S = **2000-02-07 00:00:00 EST**
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ NEWS
thetaphi Tue, 23 Aug 2011 17:03:19 + Revision: http://svn.php.net/viewvc?view=revisionrevision=315377 Log: Fix NEWS entries for ongoing 5.3.9 development Changed paths: U php/php-src/branches/PHP_5_3/NEWS Modified: php/php-src/branches/PHP_5_3/NEWS === --- php/php-src/branches/PHP_5_3/NEWS 2011-08-23 16:40:19 UTC (rev 315376) +++ php/php-src/branches/PHP_5_3/NEWS 2011-08-23 17:03:19 UTC (rev 315377) @@ -2,10 +2,7 @@ ||| ?? ??? 2011, PHP 5.3.9 -23 Aug 2011, PHP 5.3.8 - - Core: - . Fixed bug #55439 (crypt() returns only the salt for MD5). (Stas) . Fixed bug #52461 (Incomplete doctype and missing xmlns). (virsacer at web dot de, Pierre) @@ -13,9 +10,15 @@ . Don't set $_SERVER['HTTPS'] on unsecure connection (bug #55403). (Uwe Schindler) +23 Aug 2011, PHP 5.3.8 + +- Core: + . Fixed bug #55439 (crypt() returns only the salt for MD5). (Stas) + - OpenSSL: - . Reverted a change in timeout handling restoring PHP 5.3.6 behavior. (Pierre, -Andrey, Johannes) + . Reverted a change in timeout handling restoring PHP 5.3.6 behavior, +as the new behavior caused mysqlnd SSL connections to hang (#55283). +(Pierre, Andrey, Johannes) 18 Aug 2011, PHP 5.3.7 - Upgraded bundled SQLite to version 3.7.7.1. (Scott) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] =?utf-8?q?svn:_/php/php-src/_branches/PHP=5F5=5F3/ext/date/tests/DateTime=5Fdata-dates.inc_branches/PHP=5F5=5F3/ext/date/tests/DateTime=5Fdata-february.inc_branches/PHP=5F5=5F3/ext/date/
On 8/23/11 9:40 AM, Daniel Convissor wrote: danielc Tue, 23 Aug 2011 16:40:19 + Revision: http://svn.php.net/viewvc?view=revisionrevision=315376 Log: Fix differences in some sub() results that were causing tests to fail. I don't understand this fix. How comes that diff test has: test_years_positive__6_shy_1_day: DIFF: 2007-02-06 00:00:00 EST - 2000-02-07 00:00:00 EST = **P+6Y11M30DT0H0M0S** And the add test has: test_years_positive__6_shy_1_day: ADD: 2000-02-07 00:00:00 EST + P+6Y11M30DT0H0M0S = **2007-02-06 00:00:00 EST** but now sub test has: test_years_positive__6_shy_1_day: SUB: 2007-02-06 00:00:00 EST - P+6Y11M30DT0H0M0S = **2000-02-05 00:00:00 EST** Shouldn't the dates match? -- Stanislav Malyshev, Software Architect SugarCRM: http://www.sugarcrm.com/ (408)454-6900 ext. 227 -- 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/main/php_variables.c trunk/main/php_variables.c
pajoye Tue, 23 Aug 2011 18:32:53 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=315380
Log:
- ws
Changed paths:
U php/php-src/branches/PHP_5_4/main/php_variables.c
U php/php-src/trunk/main/php_variables.c
Modified: php/php-src/branches/PHP_5_4/main/php_variables.c
===
--- php/php-src/branches/PHP_5_4/main/php_variables.c 2011-08-23 18:25:13 UTC
(rev 315379)
+++ php/php-src/branches/PHP_5_4/main/php_variables.c 2011-08-23 18:32:53 UTC
(rev 315380)
@@ -597,7 +597,7 @@
|| (key_type == HASH_KEY_IS_STRING
zend_hash_find(dest, string_key, string_key_len, (void **) dest_entry) !=
SUCCESS)
|| (key_type == HASH_KEY_IS_LONG
zend_hash_index_find(dest, num_key, (void **)dest_entry) != SUCCESS)
|| Z_TYPE_PP(dest_entry) != IS_ARRAY
-) {
+ ) {
Z_ADDREF_PP(src_entry);
if (key_type == HASH_KEY_IS_STRING) {
if (!globals_check || string_key_len !=
sizeof(GLOBALS) || memcmp(string_key, GLOBALS, sizeof(GLOBALS) - 1)) {
@@ -662,7 +662,7 @@
zval *vars;
if (PG(variables_order)
- (strchr(PG(variables_order),'P') ||
strchr(PG(variables_order),'p'))
+ (strchr(PG(variables_order),'P') ||
strchr(PG(variables_order),'p'))
!SG(headers_sent)
SG(request_info).request_method
!strcasecmp(SG(request_info).request_method, POST)) {
@@ -736,7 +736,7 @@
zval **argc, **argv;
if (zend_hash_find(EG(symbol_table), argc,
sizeof(argc), (void**)argc) == SUCCESS
- zend_hash_find(EG(symbol_table), argv,
sizeof(argv), (void**)argv) == SUCCESS) {
+ zend_hash_find(EG(symbol_table),
argv, sizeof(argv), (void**)argv) == SUCCESS) {
Z_ADDREF_PP(argc);
Z_ADDREF_PP(argv);
zend_hash_update(Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_SERVER]), argv,
sizeof(argv), argv, sizeof(zval *), NULL);
Modified: php/php-src/trunk/main/php_variables.c
===
--- php/php-src/trunk/main/php_variables.c 2011-08-23 18:25:13 UTC (rev
315379)
+++ php/php-src/trunk/main/php_variables.c 2011-08-23 18:32:53 UTC (rev
315380)
@@ -597,7 +597,7 @@
|| (key_type == HASH_KEY_IS_STRING
zend_hash_find(dest, string_key, string_key_len, (void **) dest_entry) !=
SUCCESS)
|| (key_type == HASH_KEY_IS_LONG
zend_hash_index_find(dest, num_key, (void **)dest_entry) != SUCCESS)
|| Z_TYPE_PP(dest_entry) != IS_ARRAY
-) {
+ ) {
Z_ADDREF_PP(src_entry);
if (key_type == HASH_KEY_IS_STRING) {
if (!globals_check || string_key_len !=
sizeof(GLOBALS) || memcmp(string_key, GLOBALS, sizeof(GLOBALS) - 1)) {
@@ -662,7 +662,7 @@
zval *vars;
if (PG(variables_order)
- (strchr(PG(variables_order),'P') ||
strchr(PG(variables_order),'p'))
+ (strchr(PG(variables_order),'P') ||
strchr(PG(variables_order),'p'))
!SG(headers_sent)
SG(request_info).request_method
!strcasecmp(SG(request_info).request_method, POST)) {
@@ -736,7 +736,7 @@
zval **argc, **argv;
if (zend_hash_find(EG(symbol_table), argc,
sizeof(argc), (void**)argc) == SUCCESS
- zend_hash_find(EG(symbol_table), argv,
sizeof(argv), (void**)argv) == SUCCESS) {
+ zend_hash_find(EG(symbol_table),
argv, sizeof(argv), (void**)argv) == SUCCESS) {
Z_ADDREF_PP(argc);
Z_ADDREF_PP(argv);
zend_hash_update(Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_SERVER]), argv,
sizeof(argv), argv, sizeof(zval *), NULL);
--
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/snmp/tests/ README snmpd.conf
lytboris Tue, 23 Aug 2011 19:13:49 + Revision: http://svn.php.net/viewvc?view=revisionrevision=315386 Log: apply docs fixes suggested in BR #55474 Bug: https://bugs.php.net/55474 (Open) Improve tests/README... Changed paths: U php/php-src/trunk/ext/snmp/tests/README A php/php-src/trunk/ext/snmp/tests/snmpd.conf Modified: php/php-src/trunk/ext/snmp/tests/README === --- php/php-src/trunk/ext/snmp/tests/README 2011-08-23 19:11:10 UTC (rev 315385) +++ php/php-src/trunk/ext/snmp/tests/README 2011-08-23 19:13:49 UTC (rev 315386) @@ -21,44 +21,17 @@ On Linux/FreeBSD -- Install package net-snmpd (name may differ based on your distribution) -- Edit config file (by default this is /etc/snmp/snmpd.conf on Linux and - usr/local/etc/snmp/snmpd.conf on FreeBSD) and replace whole content - with following lines: +- Install package net-snmpd (name may differ based on your distribution). +- Replace config file (by default this is /etc/snmp/snmpd.conf on Linux and + /usr/local/etc/snmp/snmpd.conf on FreeBSD) with snmpd.conf supplied. -## Config file # -rocommunity public 127.0.0.1 -rocommunity6 public ::1 -rwcommunity private 127.0.0.1 - -Do not enable them - being set here they make appropriate OID switch into r/o -#syslocation Somewhere in the world -#syscontact root - -#SNMPv3 credentials -rouser adminMD5 -rouser adminSHA -rwuser adminMD5AES -rouser adminMD5AES128 -rouser adminMD5DES -createUser adminMD5 MD5 test1234 -createUser adminSHA SHA test1234 -createUser adminMD5AES MD5 test1234 AES test1234 -createUser adminMD5AES128 MD5 test1234 AES test1234 -createUser adminMD5DES MD5 test1234 DES test1234 - -createUser noAuthUser -authuser read noAuthUser noauth -## End # - Before launching daemon make sure that there is no file /var/net-snmp/snmpd.conf -Delete it if exists. Ingoring to to so will fail SNMPv3 tests +Delete it if exists. Ingoring to to so will fail SNMPv3 tests. -Make snmpd bind on localhost only. To do so, pass '127.0.0.1' into it's startup arguments -(see /etc/init.d/snmpd on Linux and set snmpd_flags=127.0.0.1 in rc.conf in FreeBSD). -Otherwise your SNMP daemon will answer SNMPv3 messages from remote clients. +- Launch snmpd (service snmpd start or /etc/init.d/snmpd start). + Alternatively you can start snmpd daemon using following command line: +sudo snmpd -C -c ./snmpd.conf -f -Le -- Launch snmpd (service snmpd start or /etc/init.d/snmpd start) On Windows -- Added: php/php-src/trunk/ext/snmp/tests/snmpd.conf === --- php/php-src/trunk/ext/snmp/tests/snmpd.conf (rev 0) +++ php/php-src/trunk/ext/snmp/tests/snmpd.conf 2011-08-23 19:13:49 UTC (rev 315386) @@ -0,0 +1,25 @@ +# Listen for connections from the local system only +agentaddress udp:127.0.0.1:161,udp6:[::1]:161 + +rocommunity public 127.0.0.1 +rocommunity6 public ::1 +rwcommunity private 127.0.0.1 + +Do not enable them - being set here they make appropriate OID switch into r/o +#syslocation Somewhere in the world +#syscontact root + +#SNMPv3 credentials +rouser adminMD5 +rouser adminSHA +rwuser adminMD5AES +rouser adminMD5AES128 +rouser adminMD5DES +createUser adminMD5 MD5 test1234 +createUser adminSHA SHA test1234 +createUser adminMD5AES MD5 test1234 AES test1234 +createUser adminMD5AES128 MD5 test1234 AES test1234 +createUser adminMD5DES MD5 test1234 DES test1234 + +createUser noAuthUser +authuser read noAuthUser noauth -- 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/snmp/tests/ README snmpd.conf
lytboris Tue, 23 Aug 2011 19:15:58 + Revision: http://svn.php.net/viewvc?view=revisionrevision=315387 Log: apply docs fixes suggested in BR #55474 Bug: https://bugs.php.net/55474 (Feedback) Improve tests/README... Changed paths: _U php/php-src/branches/PHP_5_4/ext/snmp/tests/ U php/php-src/branches/PHP_5_4/ext/snmp/tests/README A + php/php-src/branches/PHP_5_4/ext/snmp/tests/snmpd.conf (from php/php-src/trunk/ext/snmp/tests/snmpd.conf:r315386) Property changes on: php/php-src/branches/PHP_5_4/ext/snmp/tests ___ Added: svn:mergeinfo + /php/php-src/trunk/ext/snmp/tests:284726,311033-315236,315386 Modified: php/php-src/branches/PHP_5_4/ext/snmp/tests/README === --- php/php-src/branches/PHP_5_4/ext/snmp/tests/README 2011-08-23 19:13:49 UTC (rev 315386) +++ php/php-src/branches/PHP_5_4/ext/snmp/tests/README 2011-08-23 19:15:58 UTC (rev 315387) @@ -21,44 +21,17 @@ On Linux/FreeBSD -- Install package net-snmpd (name may differ based on your distribution) -- Edit config file (by default this is /etc/snmp/snmpd.conf on Linux and - usr/local/etc/snmp/snmpd.conf on FreeBSD) and replace whole content - with following lines: +- Install package net-snmpd (name may differ based on your distribution). +- Replace config file (by default this is /etc/snmp/snmpd.conf on Linux and + /usr/local/etc/snmp/snmpd.conf on FreeBSD) with snmpd.conf supplied. -## Config file # -rocommunity public 127.0.0.1 -rocommunity6 public ::1 -rwcommunity private 127.0.0.1 - -Do not enable them - being set here they make appropriate OID switch into r/o -#syslocation Somewhere in the world -#syscontact root - -#SNMPv3 credentials -rouser adminMD5 -rouser adminSHA -rwuser adminMD5AES -rouser adminMD5AES128 -rouser adminMD5DES -createUser adminMD5 MD5 test1234 -createUser adminSHA SHA test1234 -createUser adminMD5AES MD5 test1234 AES test1234 -createUser adminMD5AES128 MD5 test1234 AES test1234 -createUser adminMD5DES MD5 test1234 DES test1234 - -createUser noAuthUser -authuser read noAuthUser noauth -## End # - Before launching daemon make sure that there is no file /var/net-snmp/snmpd.conf -Delete it if exists. Ingoring to to so will fail SNMPv3 tests +Delete it if exists. Ingoring to to so will fail SNMPv3 tests. -Make snmpd bind on localhost only. To do so, pass '127.0.0.1' into it's startup arguments -(see /etc/init.d/snmpd on Linux and set snmpd_flags=127.0.0.1 in rc.conf in FreeBSD). -Otherwise your SNMP daemon will answer SNMPv3 messages from remote clients. +- Launch snmpd (service snmpd start or /etc/init.d/snmpd start). + Alternatively you can start snmpd daemon using following command line: +sudo snmpd -C -c ./snmpd.conf -f -Le -- Launch snmpd (service snmpd start or /etc/init.d/snmpd start) On Windows -- Copied: php/php-src/branches/PHP_5_4/ext/snmp/tests/snmpd.conf (from rev 315386, php/php-src/trunk/ext/snmp/tests/snmpd.conf) === --- php/php-src/branches/PHP_5_4/ext/snmp/tests/snmpd.conf (rev 0) +++ php/php-src/branches/PHP_5_4/ext/snmp/tests/snmpd.conf 2011-08-23 19:15:58 UTC (rev 315387) @@ -0,0 +1,25 @@ +# Listen for connections from the local system only +agentaddress udp:127.0.0.1:161,udp6:[::1]:161 + +rocommunity public 127.0.0.1 +rocommunity6 public ::1 +rwcommunity private 127.0.0.1 + +Do not enable them - being set here they make appropriate OID switch into r/o +#syslocation Somewhere in the world +#syscontact root + +#SNMPv3 credentials +rouser adminMD5 +rouser adminSHA +rwuser adminMD5AES +rouser adminMD5AES128 +rouser adminMD5DES +createUser adminMD5 MD5 test1234 +createUser adminSHA SHA test1234 +createUser adminMD5AES MD5 test1234 AES test1234 +createUser adminMD5AES128 MD5 test1234 AES test1234 +createUser adminMD5DES MD5 test1234 DES test1234 + +createUser noAuthUser +authuser read noAuthUser noauth -- 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/sapi/cli/tests/016.phpt branches/PHP_5_4/sapi/cli/tests/016.phpt trunk/sapi/cli/tests/016.phpt
sixd Tue, 23 Aug 2011 20:59:10 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=315404
Log:
Update log, marking 5.4 and trunk as XFAIL due to bug #55496
Bug: https://bugs.php.net/55496 (Assigned) Interactive mode doesn't force a
newline before the prompt
Changed paths:
U php/php-src/branches/PHP_5_3/sapi/cli/tests/016.phpt
U php/php-src/branches/PHP_5_4/sapi/cli/tests/016.phpt
U php/php-src/trunk/sapi/cli/tests/016.phpt
Modified: php/php-src/branches/PHP_5_3/sapi/cli/tests/016.phpt
===
--- php/php-src/branches/PHP_5_3/sapi/cli/tests/016.phpt2011-08-23
20:22:07 UTC (rev 315403)
+++ php/php-src/branches/PHP_5_3/sapi/cli/tests/016.phpt2011-08-23
20:59:10 UTC (rev 315404)
@@ -65,25 +65,37 @@
--
Interactive shell
-php Hello world
-php
+php echo 'Hello world';
+Hello world
+php exit
+
--
Snippet no. 2:
--
Interactive shell
-php php ' php ' multine
+php echo 'multine
+php ' single
+php ' quote';
+multine
single
quote
-php
+php exit
+
--
Snippet no. 3:
--
Interactive shell
-phpHere
+php echo HEREDOC
+ Here
+ comes
+ the
+ doc
+ HEREDOC;
+Here
comes
the
doc
@@ -94,7 +106,11 @@
--
Interactive shell
-php php { php { php Done
+php if (0) {
+php { echo I'm not there;
+php { }
+php echo Done;
+Done
php
--
@@ -102,7 +118,11 @@
--
Interactive shell
-php php { php { php I was called!
+php function a_function_with_some_name() {
+php { echo I was called!;
+php { }
+php a_function_with_some_name();
+I was called!
php
Done
Modified: php/php-src/branches/PHP_5_4/sapi/cli/tests/016.phpt
===
--- php/php-src/branches/PHP_5_4/sapi/cli/tests/016.phpt2011-08-23
20:22:07 UTC (rev 315403)
+++ php/php-src/branches/PHP_5_4/sapi/cli/tests/016.phpt2011-08-23
20:59:10 UTC (rev 315404)
@@ -59,31 +59,45 @@
echo \nDone\n;
?
+--XFAIL--
+https://bugs.php.net/bug.php?id=55496
--EXPECTF--
--
Snippet no. 1:
--
Interactive shell
-php Hello world
-php
+php echo 'Hello world';
+Hello world
+php exit
+
--
Snippet no. 2:
--
Interactive shell
-php php ' php ' multine
+php echo 'multine
+php ' single
+php ' quote';
+multine
single
quote
-php
+php exit
+
--
Snippet no. 3:
--
Interactive shell
-phpHere
+php echo HEREDOC
+ Here
+ comes
+ the
+ doc
+ HEREDOC;
+Here
comes
the
doc
@@ -94,7 +108,11 @@
--
Interactive shell
-php php { php { php Done
+php if (0) {
+php { echo I'm not there;
+php { }
+php echo Done;
+Done
php
--
@@ -102,7 +120,11 @@
--
Interactive shell
-php php { php { php I was called!
+php function a_function_with_some_name() {
+php { echo I was called!;
+php { }
+php a_function_with_some_name();
+I was called!
php
Done
Modified: php/php-src/trunk/sapi/cli/tests/016.phpt
===
--- php/php-src/trunk/sapi/cli/tests/016.phpt 2011-08-23 20:22:07 UTC (rev
315403)
+++ php/php-src/trunk/sapi/cli/tests/016.phpt 2011-08-23 20:59:10 UTC (rev
315404)
@@ -59,31 +59,45 @@
echo \nDone\n;
?
+--XFAIL--
+https://bugs.php.net/bug.php?id=55496
--EXPECTF--
--
Snippet no. 1:
--
Interactive shell
-php Hello world
-php
+php echo 'Hello world';
+Hello world
+php exit
+
--
Snippet no. 2:
--
Interactive shell
-php php ' php ' multine
+php echo 'multine
+php ' single
+php ' quote';
+multine
single
quote
-php
+php exit
+
--
Snippet no. 3:
--
Interactive shell
-phpHere
+php echo HEREDOC
+ Here
+ comes
+ the
+ doc
+ HEREDOC;
+Here
comes
the
doc
@@ -94,7 +108,11 @@
--
Interactive shell
-php php { php { php Done
+php if (0) {
+php { echo I'm not there;
+php { }
+php echo Done;
+Done
php
--
@@ -102,7 +120,11 @@
--
Interactive shell
-php php { php { php I was called!
+php function a_function_with_some_name() {
+php { echo I was called!;
+php { }
+php a_function_with_some_name();
+I was called!
php
Done
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
