[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ README.NEW-OUTPUT-API Zend/zend_highlight.c Zend/zend_indent.c ext/iconv/iconv.c ext/session/session.c ext/soap/soap.c ext/standard/basic_functions.c ext/
jani Thu, 11 Mar 2010 10:24:29 + Revision: http://svn.php.net/viewvc?view=revisionrevision=296062 Log: MFH: Improved / fixed output buffering (Michael Wallner) Changed paths: A php/php-src/branches/PHP_5_3/README.NEW-OUTPUT-API U php/php-src/branches/PHP_5_3/Zend/zend_highlight.c U php/php-src/branches/PHP_5_3/Zend/zend_indent.c U php/php-src/branches/PHP_5_3/ext/iconv/iconv.c U php/php-src/branches/PHP_5_3/ext/session/session.c U php/php-src/branches/PHP_5_3/ext/soap/soap.c U php/php-src/branches/PHP_5_3/ext/standard/basic_functions.c U php/php-src/branches/PHP_5_3/ext/standard/exec.c U php/php-src/branches/PHP_5_3/ext/standard/head.c U php/php-src/branches/PHP_5_3/ext/standard/info.c U php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/ob_get_flush_error.phpt U php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/phpinfo.phpt U php/php-src/branches/PHP_5_3/ext/standard/url_scanner_ex.c U php/php-src/branches/PHP_5_3/ext/standard/url_scanner_ex.re U php/php-src/branches/PHP_5_3/ext/standard/var.c U php/php-src/branches/PHP_5_3/ext/tidy/php_tidy.h U php/php-src/branches/PHP_5_3/ext/tidy/tidy.c U php/php-src/branches/PHP_5_3/ext/zlib/CREDITS U php/php-src/branches/PHP_5_3/ext/zlib/config0.m4 U php/php-src/branches/PHP_5_3/ext/zlib/php_zlib.h U php/php-src/branches/PHP_5_3/ext/zlib/tests/005.phpt U php/php-src/branches/PHP_5_3/ext/zlib/tests/006.phpt U php/php-src/branches/PHP_5_3/ext/zlib/tests/007.phpt U php/php-src/branches/PHP_5_3/ext/zlib/tests/gzcompress_basic1.phpt U php/php-src/branches/PHP_5_3/ext/zlib/tests/gzcompress_error1.phpt U php/php-src/branches/PHP_5_3/ext/zlib/tests/gzcompress_variation1.phpt U php/php-src/branches/PHP_5_3/ext/zlib/tests/gzdeflate_basic1.phpt U php/php-src/branches/PHP_5_3/ext/zlib/tests/gzdeflate_error1.phpt U php/php-src/branches/PHP_5_3/ext/zlib/tests/gzdeflate_variation1.phpt U php/php-src/branches/PHP_5_3/ext/zlib/tests/gzencode_basic1.phpt U php/php-src/branches/PHP_5_3/ext/zlib/tests/gzencode_error1.phpt U php/php-src/branches/PHP_5_3/ext/zlib/tests/gzencode_variation1.phpt A php/php-src/branches/PHP_5_3/ext/zlib/tests/gzencode_variation2-win32.phpt U php/php-src/branches/PHP_5_3/ext/zlib/tests/gzencode_variation2.phpt U php/php-src/branches/PHP_5_3/ext/zlib/tests/gzfile_variation10.phpt U php/php-src/branches/PHP_5_3/ext/zlib/tests/gzfilegzreadfile.phpt U php/php-src/branches/PHP_5_3/ext/zlib/tests/gzinflate-bug42663.phpt U php/php-src/branches/PHP_5_3/ext/zlib/tests/gzinflate_length.phpt U php/php-src/branches/PHP_5_3/ext/zlib/tests/gzopen_variation5.phpt U php/php-src/branches/PHP_5_3/ext/zlib/tests/gzopen_variation8.phpt U php/php-src/branches/PHP_5_3/ext/zlib/tests/gzread_variation1.phpt U php/php-src/branches/PHP_5_3/ext/zlib/tests/gzreadgzwrite.phpt U php/php-src/branches/PHP_5_3/ext/zlib/tests/gzreadgzwriteplain.phpt U php/php-src/branches/PHP_5_3/ext/zlib/tests/gzuncompress_basic1.phpt U php/php-src/branches/PHP_5_3/ext/zlib/tests/gzuncompress_error1.phpt U php/php-src/branches/PHP_5_3/ext/zlib/tests/gzwrite_basic.phpt U php/php-src/branches/PHP_5_3/ext/zlib/tests/gzwrite_variation1.phpt A php/php-src/branches/PHP_5_3/ext/zlib/tests/ob_001.phpt A php/php-src/branches/PHP_5_3/ext/zlib/tests/ob_002.phpt A php/php-src/branches/PHP_5_3/ext/zlib/tests/ob_003.phpt A php/php-src/branches/PHP_5_3/ext/zlib/tests/ob_004.phpt A php/php-src/branches/PHP_5_3/ext/zlib/tests/ob_005.phpt U php/php-src/branches/PHP_5_3/ext/zlib/tests/readgzfile_variation10.phpt U php/php-src/branches/PHP_5_3/ext/zlib/tests/readgzfile_variation14.phpt U php/php-src/branches/PHP_5_3/ext/zlib/tests/readgzfile_variation4.phpt U php/php-src/branches/PHP_5_3/ext/zlib/tests/readgzfile_variation5.phpt U php/php-src/branches/PHP_5_3/ext/zlib/tests/readgzfile_variation6.phpt U php/php-src/branches/PHP_5_3/ext/zlib/tests/readgzfile_variation7.phpt U php/php-src/branches/PHP_5_3/ext/zlib/tests/zlib_filter_inflate2.phpt U php/php-src/branches/PHP_5_3/ext/zlib/tests/zlib_scheme_copy_variation2.phpt U php/php-src/branches/PHP_5_3/ext/zlib/zlib.c U php/php-src/branches/PHP_5_3/ext/zlib/zlib_filter.c U php/php-src/branches/PHP_5_3/ext/zlib/zlib_fopen_wrapper.c U php/php-src/branches/PHP_5_3/main/SAPI.c U php/php-src/branches/PHP_5_3/main/main.c U php/php-src/branches/PHP_5_3/main/output.c U php/php-src/branches/PHP_5_3/main/php.h U php/php-src/branches/PHP_5_3/main/php_logos.c U php/php-src/branches/PHP_5_3/main/php_output.h U php/php-src/branches/PHP_5_3/sapi/apache/libpre.c U
Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ README.NEW-OUTPUT-API Zend/zend_highlight.c Zend/zend_indent.c ext/iconv/iconv.c ext/session/session.c ext/soap/soap.c ext/standard/basic_functions.c
On Thu, 2010-03-11 at 10:24 +, Jani Taskinen wrote: jani Thu, 11 Mar 2010 10:24:29 + Revision: http://svn.php.net/viewvc?view=revisionrevision=296062 Log: MFH: Improved / fixed output buffering (Michael Wallner) Yes the old code had many bugs, where most were known. But there were discussions to backport this to 5.3 before release but back then nobody was around who was willing to do the maintenance for this new code with new unknown bugs. Therefore it was left out. Merging such major changes in a released branch like 5.3 is no option. johannes -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/main/ main.c
jani Thu, 11 Mar 2010 11:23:38 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=296065
Log:
- Fix conflict
Changed paths:
U php/php-src/branches/PHP_5_3/main/main.c
Modified: php/php-src/branches/PHP_5_3/main/main.c
===
--- php/php-src/branches/PHP_5_3/main/main.c2010-03-11 10:32:17 UTC (rev
296064)
+++ php/php-src/branches/PHP_5_3/main/main.c2010-03-11 11:23:38 UTC (rev
296065)
@@ -1088,19 +1088,7 @@
php_log_err(log_buffer TSRMLS_CC);
efree(log_buffer);
}
- .mine
if (PG(display_errors) ((module_initialized
!PG(during_request_startup)) || (PG(display_startup_errors {
-===
-
- if (PG(display_errors)
-((module_initialized !PG(during_request_startup))
- || (PG(display_startup_errors)
-
(OG(php_body_write)==php_default_output_func ||
OG(php_body_write)==php_ub_body_write_no_header ||
OG(php_body_write)==php_ub_body_write)
- )
- )
- ) {
-
- .r294302
if (PG(xmlrpc_errors)) {
php_printf(?xml
version=\1.0\?methodResponsefaultvaluestructmembernamefaultCode/namevalueint%ld/int/value/membermembernamefaultString/namevaluestring%s:%s
in %s on line
%d/string/value/member/struct/value/fault/methodResponse,
PG(xmlrpc_error_number), error_type_str, buffer, error_filename, error_lineno);
} else {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /SVNROOT/ pear_avail
saltybeagle Thu, 11 Mar 2010 14:40:23 + Revision: http://svn.php.net/viewvc?view=revisionrevision=296071 Log: Grant Gregory Currie (gregorycu) access to pear2/sandbox/HTML_Template_IT Changed paths: U SVNROOT/pear_avail Modified: SVNROOT/pear_avail === --- SVNROOT/pear_avail 2010-03-11 14:38:29 UTC (rev 296070) +++ SVNROOT/pear_avail 2010-03-11 14:40:23 UTC (rev 296071) @@ -29,6 +29,7 @@ # PEAR2 packages avail|amir|pear2/sandbox/SimpleChannelFrontend +avail|gregorycu|pear2/sandbox/HTML_Template_IT # Some people get access to the peardoc avail|ebihara,vincentlascaux,damian,techtonik,sroebke,thierry_bo,schst,mcgyver5,sousk,gurugeek,norbert_m,didou,poz,romain,haruki,jurbo,kusor,cipri,yannick,radzaw,adamg,justinpatrin,peterhuewe,ssttoo,mfonda,shimooka,jystewart,xolphin,takagi,aashley,cortesi,webdi,colder,zefredz,ifeghali,lithis,dw31415,weierophinney,linemayr,till,mcorne,mumumu|pear/peardoc -- 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/zlib/tests/bug51269.phpt branches/PHP_5_2/ext/zlib/zlib.c branches/PHP_5_3/NEWS branches/PHP_5_3/ext/zlib/tests/bug51269.p
On Thu, Mar 11, 2010 at 07:20, Adam Harvey ahar...@php.net wrote: aharvey Thu, 11 Mar 2010 06:20:22 + Revision: http://svn.php.net/viewvc?view=revisionrevision=296060 Log: Fixed bug #51269 (zlib.output_compression Overwrites Vary Header). Isn't this the same as #40325, which is fixed in HEAD? -Hannes -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/main/streams/transports.c branches/PHP_5_3/main/streams/xp_socket.c trunk/main/streams/transports.c trunk/main/streams/xp_socket.c
mike Thu, 11 Mar 2010 16:37:24 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=296079
Log:
add backlock socket context option for stream_socket_server(),
which had a hardcoded backlog of 5 at two occurrances
Changed paths:
U php/php-src/branches/PHP_5_3/main/streams/transports.c
U php/php-src/branches/PHP_5_3/main/streams/xp_socket.c
U php/php-src/trunk/main/streams/transports.c
U php/php-src/trunk/main/streams/xp_socket.c
Modified: php/php-src/branches/PHP_5_3/main/streams/transports.c
===
--- php/php-src/branches/PHP_5_3/main/streams/transports.c 2010-03-11
16:19:43 UTC (rev 296078)
+++ php/php-src/branches/PHP_5_3/main/streams/transports.c 2010-03-11
16:37:24 UTC (rev 296079)
@@ -157,7 +157,20 @@
ERR_RETURN(error_string, error_text,
bind() failed: %s);
failed = 1;
} else if (flags STREAM_XPORT_LISTEN) {
- if (0 !=
php_stream_xport_listen(stream, 5, error_text TSRMLS_CC)) {
+ zval **zbacklog = NULL;
+ int backlog = 32;
+
+ if (stream-context
php_stream_context_get_option(stream-context, socket, backlog, zbacklog)
== SUCCESS) {
+ zval *ztmp = *zbacklog;
+
+ convert_to_long_ex(ztmp);
+ backlog = Z_LVAL_P(ztmp);
+ if (ztmp != *zbacklog) {
+ zval_ptr_dtor(ztmp);
+ }
+ }
+
+ if (0 !=
php_stream_xport_listen(stream, backlog, error_text TSRMLS_CC)) {
ERR_RETURN(error_string,
error_text, listen() failed: %s);
failed = 1;
}
Modified: php/php-src/branches/PHP_5_3/main/streams/xp_socket.c
===
--- php/php-src/branches/PHP_5_3/main/streams/xp_socket.c 2010-03-11
16:19:43 UTC (rev 296078)
+++ php/php-src/branches/PHP_5_3/main/streams/xp_socket.c 2010-03-11
16:37:24 UTC (rev 296079)
@@ -324,7 +324,7 @@
switch (xparam-op) {
case STREAM_XPORT_OP_LISTEN:
- xparam-outputs.returncode =
(listen(sock-socket, 5) == 0) ? 0: -1;
+ xparam-outputs.returncode =
(listen(sock-socket, xparam-inputs.backlog) == 0) ? 0: -1;
return PHP_STREAM_OPTION_RETURN_OK;
case STREAM_XPORT_OP_GET_NAME:
Modified: php/php-src/trunk/main/streams/transports.c
===
--- php/php-src/trunk/main/streams/transports.c 2010-03-11 16:19:43 UTC (rev
296078)
+++ php/php-src/trunk/main/streams/transports.c 2010-03-11 16:37:24 UTC (rev
296079)
@@ -157,7 +157,20 @@
ERR_RETURN(error_string, error_text,
bind() failed: %s);
failed = 1;
} else if (flags STREAM_XPORT_LISTEN) {
- if (0 !=
php_stream_xport_listen(stream, 5, error_text TSRMLS_CC)) {
+ zval **zbacklog = NULL;
+ int backlog = 32;
+
+ if (stream-context
php_stream_context_get_option(stream-context, socket, backlog, zbacklog)
== SUCCESS) {
+ zval *ztmp = *zbacklog;
+
+ convert_to_long_ex(ztmp);
+ backlog = Z_LVAL_P(ztmp);
+ if (ztmp != *zbacklog) {
+ zval_ptr_dtor(ztmp);
+ }
+ }
+
+ if (0 !=
php_stream_xport_listen(stream, backlog, error_text TSRMLS_CC)) {
ERR_RETURN(error_string,
error_text, listen() failed: %s);
failed = 1;
}
Modified: php/php-src/trunk/main/streams/xp_socket.c
===
--- php/php-src/trunk/main/streams/xp_socket.c
[PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ configure.in main/php_version.h
jani Thu, 11 Mar 2010 16:52:44 + Revision: http://svn.php.net/viewvc?view=revisionrevision=296081 Log: - This is 5.4.0 (for now..:) Changed paths: U php/php-src/branches/PHP_5_4/configure.in U php/php-src/branches/PHP_5_4/main/php_version.h Modified: php/php-src/branches/PHP_5_4/configure.in === --- php/php-src/branches/PHP_5_4/configure.in 2010-03-11 16:52:05 UTC (rev 296080) +++ php/php-src/branches/PHP_5_4/configure.in 2010-03-11 16:52:44 UTC (rev 296081) @@ -40,8 +40,8 @@ AC_CONFIG_HEADER(main/php_config.h) PHP_MAJOR_VERSION=5 -PHP_MINOR_VERSION=3 -PHP_RELEASE_VERSION=3 +PHP_MINOR_VERSION=4 +PHP_RELEASE_VERSION=0 PHP_EXTRA_VERSION=-dev PHP_VERSION=$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 1 + [$]PHP_MINOR_VERSION \* 100 + [$]PHP_RELEASE_VERSION` Modified: php/php-src/branches/PHP_5_4/main/php_version.h === --- php/php-src/branches/PHP_5_4/main/php_version.h 2010-03-11 16:52:05 UTC (rev 296080) +++ php/php-src/branches/PHP_5_4/main/php_version.h 2010-03-11 16:52:44 UTC (rev 296081) @@ -1,8 +1,8 @@ /* automatically generated by configure */ /* edit configure.in to change version number */ #define PHP_MAJOR_VERSION 5 -#define PHP_MINOR_VERSION 3 -#define PHP_RELEASE_VERSION 3 +#define PHP_MINOR_VERSION 4 +#define PHP_RELEASE_VERSION 0 #define PHP_EXTRA_VERSION -dev -#define PHP_VERSION 5.3.3-dev -#define PHP_VERSION_ID 50303 +#define PHP_VERSION 5.4.0-dev +#define PHP_VERSION_ID 50400 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ext/pgsql/ pgsql.c
bjoriThu, 11 Mar 2010 19:50:04 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=296086
Log:
Fix build (see r296062)
Changed paths:
U php/php-src/branches/PHP_5_3/ext/pgsql/pgsql.c
Modified: php/php-src/branches/PHP_5_3/ext/pgsql/pgsql.c
===
--- php/php-src/branches/PHP_5_3/ext/pgsql/pgsql.c 2010-03-11 19:28:44 UTC
(rev 296085)
+++ php/php-src/branches/PHP_5_3/ext/pgsql/pgsql.c 2010-03-11 19:50:04 UTC
(rev 296086)
@@ -3303,7 +3303,7 @@
tbytes = 0;
while ((nbytes = lo_read((PGconn *)pgsql-conn, pgsql-lofd, buf,
PGSQL_LO_READ_BUF_SIZE))0) {
- php_body_write(buf, nbytes TSRMLS_CC);
+ PHPWRITE(buf, nbytes);
tbytes += nbytes;
}
RETURN_LONG(tbytes);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ext/pgsql/ pgsql.c
hi Hannes,
Please don't fix what has been broken by this commit, it will be
reverted (from this branch).
Cheers,
On Thu, Mar 11, 2010 at 8:50 PM, Hannes Magnusson bj...@php.net wrote:
bjori Thu, 11 Mar 2010 19:50:04 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=296086
Log:
Fix build (see r296062)
Changed paths:
U php/php-src/branches/PHP_5_3/ext/pgsql/pgsql.c
Modified: php/php-src/branches/PHP_5_3/ext/pgsql/pgsql.c
===
--- php/php-src/branches/PHP_5_3/ext/pgsql/pgsql.c 2010-03-11 19:28:44
UTC (rev 296085)
+++ php/php-src/branches/PHP_5_3/ext/pgsql/pgsql.c 2010-03-11 19:50:04
UTC (rev 296086)
@@ -3303,7 +3303,7 @@
tbytes = 0;
while ((nbytes = lo_read((PGconn *)pgsql-conn, pgsql-lofd, buf,
PGSQL_LO_READ_BUF_SIZE))0) {
- php_body_write(buf, nbytes TSRMLS_CC);
+ PHPWRITE(buf, nbytes);
tbytes += nbytes;
}
RETURN_LONG(tbytes);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
--
Pierre
@pierrejoye | http://blog.thepimp.net | http://www.libgd.org
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ext/pgsql/ pgsql.c
I cannot see any possible reasons why the build has to be broken.
If it should be reverted then go for it, until then we would like to
be able to build PHP.
-Hannes
On Thu, Mar 11, 2010 at 20:55, Pierre Joye pierre@gmail.com wrote:
hi Hannes,
Please don't fix what has been broken by this commit, it will be
reverted (from this branch).
Cheers,
On Thu, Mar 11, 2010 at 8:50 PM, Hannes Magnusson bj...@php.net wrote:
bjori Thu, 11 Mar 2010 19:50:04 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=296086
Log:
Fix build (see r296062)
Changed paths:
U php/php-src/branches/PHP_5_3/ext/pgsql/pgsql.c
Modified: php/php-src/branches/PHP_5_3/ext/pgsql/pgsql.c
===
--- php/php-src/branches/PHP_5_3/ext/pgsql/pgsql.c 2010-03-11 19:28:44
UTC (rev 296085)
+++ php/php-src/branches/PHP_5_3/ext/pgsql/pgsql.c 2010-03-11 19:50:04
UTC (rev 296086)
@@ -3303,7 +3303,7 @@
tbytes = 0;
while ((nbytes = lo_read((PGconn *)pgsql-conn, pgsql-lofd, buf,
PGSQL_LO_READ_BUF_SIZE))0) {
- php_body_write(buf, nbytes TSRMLS_CC);
+ PHPWRITE(buf, nbytes);
tbytes += nbytes;
}
RETURN_LONG(tbytes);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
--
Pierre
@pierrejoye | http://blog.thepimp.net | http://www.libgd.org
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ext/pgsql/ pgsql.c
On Thu, 2010-03-11 at 21:06 +0100, Hannes Magnusson wrote: I cannot see any possible reasons why the build has to be broken. If it should be reverted then go for it, until then we would like to be able to build PHP. Following a discussion with Jani I assumed he'd revert the change from this branch. ( Jani And then reverting is done..how?) I will do it if this doesn't happen soonish. johannes -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ext/pgsql/ pgsql.c
11.3.2010 22:14, Johannes Schlüter wrote: On Thu, 2010-03-11 at 21:06 +0100, Hannes Magnusson wrote: I cannot see any possible reasons why the build has to be broken. If it should be reverted then go for it, until then we would like to be able to build PHP. Following a discussion with Jani I assumed he'd revert the change from this branch. ( Jani And then reverting is done..how?) I will do it if this doesn't happen soonish. I was kinda hoping someone knew some clever and easy commands to do that with SVN? I can do it, but it'll have to wait til tomorrow. :( --Jani -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ext/pgsql/ pgsql.c
2010/3/11 Jani Taskinen jani.taski...@sci.fi: 11.3.2010 22:14, Johannes Schlüter wrote: On Thu, 2010-03-11 at 21:06 +0100, Hannes Magnusson wrote: I cannot see any possible reasons why the build has to be broken. If it should be reverted then go for it, until then we would like to be able to build PHP. Following a discussion with Jani I assumed he'd revert the change from this branch. ( Jani And then reverting is done..how?) I will do it if this doesn't happen soonish. I was kinda hoping someone knew some clever and easy commands to do that with SVN? I can do it, but it'll have to wait til tomorrow. :( svn merge -c rev right before your commit svn status to check the M files svn diff to verify the revert test a clean build svn commit Cheers, -- Pierre @pierrejoye | http://blog.thepimp.net | http://www.libgd.org -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/NEWS branches/PHP_5_2/ext/zlib/tests/bug51269.phpt branches/PHP_5_2/ext/zlib/zlib.c branches/PHP_5_3/NEWS branches/PHP_5_3/ext/zlib/tests/bug51269.p
On 12 March 2010 00:11, Hannes Magnusson hannes.magnus...@gmail.com wrote: On Thu, Mar 11, 2010 at 07:20, Adam Harvey ahar...@php.net wrote: aharvey Thu, 11 Mar 2010 06:20:22 + Revision: http://svn.php.net/viewvc?view=revisionrevision=296060 Log: Fixed bug #51269 (zlib.output_compression Overwrites Vary Header). Isn't this the same as #40325, which is fixed in HEAD? Not exactly, although it is closely related. #40325 was about sending Vary: Accept-Encoding in the general case when the gzip output handler is being used — this is well and good, but because sapi_add_header_ex() was being called with the replace flag set, any other Vary headers (such as the Vary: Cookie example in #51269) were being obliterated. The linked revision changes that. The codepath for HEAD is obviously quite different due to the new output handling code, but it had the same issue. Adam -- 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/dba/tests/ dba012.phpt dba013.phpt dba014.phpt dba015.phpt dba_db4_003.phpt
sixd Fri, 12 Mar 2010 00:27:57 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=296095
Log:
New and improved DBA tests
Changed paths:
A php/php-src/branches/PHP_5_3/ext/dba/tests/dba012.phpt
A php/php-src/branches/PHP_5_3/ext/dba/tests/dba013.phpt
A php/php-src/branches/PHP_5_3/ext/dba/tests/dba014.phpt
A php/php-src/branches/PHP_5_3/ext/dba/tests/dba015.phpt
U php/php-src/branches/PHP_5_3/ext/dba/tests/dba_db4_003.phpt
Added: php/php-src/branches/PHP_5_3/ext/dba/tests/dba012.phpt
===
--- php/php-src/branches/PHP_5_3/ext/dba/tests/dba012.phpt
(rev 0)
+++ php/php-src/branches/PHP_5_3/ext/dba/tests/dba012.phpt 2010-03-12
00:27:57 UTC (rev 296095)
@@ -0,0 +1,42 @@
+--TEST--
+DBA dba.default_handler tests
+--SKIPIF--
+?php
+$handler = flatfile;
+require_once(dirname(__FILE__) .'/skipif.inc');
+?
+--INI--
+dba.default_handler=flatfile
+--FILE--
+?php
+$handler = flatfile;
+require_once(dirname(__FILE__) .'/test.inc');
+echo database handler: $handler\n;
+
+echo Test 1\n;
+
+ini_set('dba.default_handler', 'does_not_exist');
+
+var_dump(dba_open($db_filename, 'c'));
+
+echo Test 2\n;
+
+ini_set('dba.default_handler', '');
+
+var_dump(dba_open($db_filename, 'n'));
+
+?
+--CLEAN--
+?php
+require(dirname(__FILE__) .'/clean.inc');
+?
+--EXPECTF--
+database handler: flatfile
+Test 1
+
+Warning: ini_set(): No such handler: does_not_exist in %sdba012.php on line %d
+resource(%d) of type (dba)
+Test 2
+
+Warning: dba_open(%stest0.dbm,n): No default handler selected in %sdba012.php
on line %d
+bool(false)
Property changes on: php/php-src/branches/PHP_5_3/ext/dba/tests/dba012.phpt
___
Added: svn:keywords
+ Id Rev Revision
Added: svn:eol-style
+ native
Added: php/php-src/branches/PHP_5_3/ext/dba/tests/dba013.phpt
===
--- php/php-src/branches/PHP_5_3/ext/dba/tests/dba013.phpt
(rev 0)
+++ php/php-src/branches/PHP_5_3/ext/dba/tests/dba013.phpt 2010-03-12
00:27:57 UTC (rev 296095)
@@ -0,0 +1,27 @@
+--TEST--
+DBA with array key with empty array
+--SKIPIF--
+?php
+require_once(dirname(__FILE__) .'/skipif.inc');
+die(info $HND handler used);
+?
+--FILE--
+?php
+require_once(dirname(__FILE__) .'/test.inc');
+echo database handler: $handler\n;
+
+if (($db_file=dba_open($db_file, n, $handler))!==FALSE) {
+dba_insert(array(), Content String 1, $db_file);
+} else {
+echo Error creating database\n;
+}
+
+?
+--CLEAN--
+?php
+require(dirname(__FILE__) .'/clean.inc');
+?
+--EXPECTF--
+database handler: %s
+
+Catchable fatal error: dba_insert(): Key does not have exactly two elements:
(key, name) in %sdba013.php on line %d
Property changes on: php/php-src/branches/PHP_5_3/ext/dba/tests/dba013.phpt
___
Added: svn:keywords
+ Id Rev Revision
Added: svn:eol-style
+ native
Added: php/php-src/branches/PHP_5_3/ext/dba/tests/dba014.phpt
===
--- php/php-src/branches/PHP_5_3/ext/dba/tests/dba014.phpt
(rev 0)
+++ php/php-src/branches/PHP_5_3/ext/dba/tests/dba014.phpt 2010-03-12
00:27:57 UTC (rev 296095)
@@ -0,0 +1,27 @@
+--TEST--
+DBA with array key with array containing too many elements
+--SKIPIF--
+?php
+require_once(dirname(__FILE__) .'/skipif.inc');
+die(info $HND handler used);
+?
+--FILE--
+?php
+require_once(dirname(__FILE__) .'/test.inc');
+echo database handler: $handler\n;
+
+if (($db_file=dba_open($db_file, n, $handler))!==FALSE) {
+dba_insert(array(a, b, c), Content String 2, $db_file);
+} else {
+echo Error creating database\n;
+}
+
+?
+--CLEAN--
+?php
+require(dirname(__FILE__) .'/clean.inc');
+?
+--EXPECTF--
+database handler: %s
+
+Catchable fatal error: dba_insert(): Key does not have exactly two elements:
(key, name) in %sdba014.php on line %d
Property changes on: php/php-src/branches/PHP_5_3/ext/dba/tests/dba014.phpt
___
Added: svn:keywords
+ Id Rev Revision
Added: svn:eol-style
+ native
Added: php/php-src/branches/PHP_5_3/ext/dba/tests/dba015.phpt
===
--- php/php-src/branches/PHP_5_3/ext/dba/tests/dba015.phpt
(rev 0)
+++ php/php-src/branches/PHP_5_3/ext/dba/tests/dba015.phpt 2010-03-12
00:27:57 UTC (rev 296095)
@@ -0,0 +1,76 @@
+--TEST--
+DBA with persistent connections
+--SKIPIF--
+?php
+$handler = flatfile;
+require_once(dirname(__FILE__) .'/skipif.inc');
+die(info $HND handler used);
+?
+--FILE--
+?php
+
+$handler = flatfile;
+require_once(dirname(__FILE__) .'/test.inc');
+echo database handler: $handler\n;
+
+echo
[PHP-CVS] svn: /php/php-src/branches/
jani Thu, 11 Mar 2010 16:09:37 + Revision: http://svn.php.net/viewvc?view=revisionrevision=296076 Log: Hello PHP 5.4, open for all new stuff. Changed paths: A + php/php-src/branches/PHP_5_4/ (from php/php-src/branches/PHP_5_3/:r296075) Property changes on: php/php-src/branches/PHP_5_4 ___ Added: svn:ignore + Makefile.objects Makefile.fragments Makefile acconfig.h aclocal.m4 autom4te.cache bsd_converted buildmk.stamp buildconf.stamp config.h.in config.cache config.log config.status config_vars.mk configuration-parser.c configuration-parser.h configuration-parser.output configuration-scanner.c configure configure.bat conftest conftest.c generated_lists meta_cc meta_ccld mkinstalldirs missing install-sh internal_functions.c libtool shlibtool php php5.spec stamp-h test.php3 *.lo *.la libs modules php-*.tar.gz want_dependencies deps config.nice php_version.h *.plg *.opt *.ncb Release Release_inline Debug Release_TS Release_TSDbg Release_TS_inline Debug_TS results.txt libs _libs include autom4te.cache FBCIndex FBCLockFolder debug.log confdefs.h configure.js config.nice.bat configure.bat ZendEngine1 php_test_results_*.txt *.gcda *.gcno lcov_data lcov_html php_lcov.info tmp-php.ini diff Added: svn:mergeinfo + /php/php-src/trunk:284726 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mbstring/config.m4 branches/PHP_5_3/ext/mbstring/config.w32 branches/PHP_5_3/ext/mbstring/libmbfl/Makefile.am branches/PHP_5_3/ext/mbstring/libmbfl/Ma
moriyoshiFri, 12 Mar 2010 04:55:37 + Revision: http://svn.php.net/viewvc?view=revisionrevision=296101 Log: - Update the bundled libmbfl to the latest on upstream. Changed paths: U php/php-src/branches/PHP_5_3/ext/mbstring/config.m4 U php/php-src/branches/PHP_5_3/ext/mbstring/config.w32 U php/php-src/branches/PHP_5_3/ext/mbstring/libmbfl/Makefile.am D php/php-src/branches/PHP_5_3/ext/mbstring/libmbfl/Makefile.bcc32 D php/php-src/branches/PHP_5_3/ext/mbstring/libmbfl/config.h.bcc32 U php/php-src/branches/PHP_5_3/ext/mbstring/libmbfl/config.h.in D php/php-src/branches/PHP_5_3/ext/mbstring/libmbfl/config.h.vc6 U php/php-src/branches/PHP_5_3/ext/mbstring/libmbfl/configure.in U php/php-src/branches/PHP_5_3/ext/mbstring/libmbfl/filters/Makefile.am D php/php-src/branches/PHP_5_3/ext/mbstring/libmbfl/filters/Makefile.bcc32 A php/php-src/branches/PHP_5_3/ext/mbstring/libmbfl/filters/mbfilter_cp5022x.c A php/php-src/branches/PHP_5_3/ext/mbstring/libmbfl/filters/mbfilter_cp5022x.h U php/php-src/branches/PHP_5_3/ext/mbstring/libmbfl/filters/mbfilter_cp51932.c U php/php-src/branches/PHP_5_3/ext/mbstring/libmbfl/filters/mbfilter_cp932.c U php/php-src/branches/PHP_5_3/ext/mbstring/libmbfl/filters/mbfilter_cp932.h U php/php-src/branches/PHP_5_3/ext/mbstring/libmbfl/filters/mbfilter_htmlent.c U php/php-src/branches/PHP_5_3/ext/mbstring/libmbfl/filters/mbfilter_iso2022_jp_ms.c U php/php-src/branches/PHP_5_3/ext/mbstring/libmbfl/filters/mbfilter_iso2022_kr.c U php/php-src/branches/PHP_5_3/ext/mbstring/libmbfl/filters/mbfilter_jis.c A php/php-src/branches/PHP_5_3/ext/mbstring/libmbfl/filters/mbfilter_sjis_open.c A php/php-src/branches/PHP_5_3/ext/mbstring/libmbfl/filters/mbfilter_sjis_open.h A php/php-src/branches/PHP_5_3/ext/mbstring/libmbfl/filters/mbfilter_tl_jisx0201_jisx0208.c A php/php-src/branches/PHP_5_3/ext/mbstring/libmbfl/filters/mbfilter_tl_jisx0201_jisx0208.h U php/php-src/branches/PHP_5_3/ext/mbstring/libmbfl/filters/mbfilter_utf7.c A php/php-src/branches/PHP_5_3/ext/mbstring/libmbfl/filters/translit_kana_jisx0201_jisx0208.h D php/php-src/branches/PHP_5_3/ext/mbstring/libmbfl/libmbfl.dsp D php/php-src/branches/PHP_5_3/ext/mbstring/libmbfl/libmbfl.dsw D php/php-src/branches/PHP_5_3/ext/mbstring/libmbfl/libmbfl.sln D php/php-src/branches/PHP_5_3/ext/mbstring/libmbfl/libmbfl.vcproj U php/php-src/branches/PHP_5_3/ext/mbstring/libmbfl/mbfl/Makefile.am D php/php-src/branches/PHP_5_3/ext/mbstring/libmbfl/mbfl/Makefile.bcc32 U php/php-src/branches/PHP_5_3/ext/mbstring/libmbfl/mbfl/eaw_table.h U php/php-src/branches/PHP_5_3/ext/mbstring/libmbfl/mbfl/mbfilter.c U php/php-src/branches/PHP_5_3/ext/mbstring/libmbfl/mbfl/mbfilter.h U php/php-src/branches/PHP_5_3/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.h U php/php-src/branches/PHP_5_3/ext/mbstring/libmbfl/mbfl/mbfilter_pass.h U php/php-src/branches/PHP_5_3/ext/mbstring/libmbfl/mbfl/mbfilter_wchar.h U php/php-src/branches/PHP_5_3/ext/mbstring/libmbfl/mbfl/mbfl_convert.c U php/php-src/branches/PHP_5_3/ext/mbstring/libmbfl/mbfl/mbfl_convert.h U php/php-src/branches/PHP_5_3/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c U php/php-src/branches/PHP_5_3/ext/mbstring/libmbfl/mbfl/mbfl_encoding.h U php/php-src/branches/PHP_5_3/ext/mbstring/libmbfl/mbfl/mbfl_filter_output.c U php/php-src/branches/PHP_5_3/ext/mbstring/libmbfl/mbfl/mbfl_filter_output.h U php/php-src/branches/PHP_5_3/ext/mbstring/libmbfl/mbfl/mbfl_ident.c D php/php-src/branches/PHP_5_3/ext/mbstring/libmbfl/mbfl.def D php/php-src/branches/PHP_5_3/ext/mbstring/libmbfl/mbfl.rc D php/php-src/branches/PHP_5_3/ext/mbstring/libmbfl/mksbcc32.bat U php/php-src/branches/PHP_5_3/ext/mbstring/libmbfl/nls/Makefile.am D php/php-src/branches/PHP_5_3/ext/mbstring/libmbfl/nls/Makefile.bcc32 D php/php-src/branches/PHP_5_3/ext/mbstring/libmbfl/rules.mak.bcc32 U php/php-src/branches/PHP_5_3/ext/mbstring/libmbfl/tests/conv_encoding.tests/Makefile.am A php/php-src/branches/PHP_5_3/ext/mbstring/libmbfl/tests/conv_encoding.tests/gen_exp.c A php/php-src/branches/PHP_5_3/ext/mbstring/libmbfl/tests/conv_encoding.tests/yensign.exp U php/php-src/branches/PHP_5_3/ext/mbstring/libmbfl/tests/sample.c U php/php-src/branches/PHP_5_3/ext/mbstring/libmbfl/tests/strcut.tests/iso2022jp.exp U php/php-src/trunk/ext/mbstring/config.m4 U php/php-src/trunk/ext/mbstring/config.w32 U php/php-src/trunk/ext/mbstring/libmbfl/Makefile.am D php/php-src/trunk/ext/mbstring/libmbfl/Makefile.bcc32 D php/php-src/trunk/ext/mbstring/libmbfl/config.h.bcc32 U php/php-src/trunk/ext/mbstring/libmbfl/config.h.in D php/php-src/trunk/ext/mbstring/libmbfl/config.h.vc6
