[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/sapi/fpm/fpm/fpm_events.c branches/PHP_5_3/sapi/fpm/fpm/fpm_process_ctl.c branches/PHP_5_3/sapi/fpm/fpm/fpm_request.c branches/PHP_5_3/sapi/fpm/fpm/fpm_sh
fat Mon, 27 Jun 2011 11:33:03 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=312523
Log:
- fixed request_timeout and slowlog_timeout from last FPM commit (r312496)
- typo
Changed paths:
U php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_events.c
U php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_process_ctl.c
U php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_request.c
U php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_shm.c
U php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_shm.h
U php/php-src/branches/PHP_5_4/sapi/fpm/fpm/fpm_events.c
U php/php-src/branches/PHP_5_4/sapi/fpm/fpm/fpm_process_ctl.c
U php/php-src/branches/PHP_5_4/sapi/fpm/fpm/fpm_request.c
U php/php-src/branches/PHP_5_4/sapi/fpm/fpm/fpm_shm.c
U php/php-src/branches/PHP_5_4/sapi/fpm/fpm/fpm_shm.h
U php/php-src/trunk/sapi/fpm/fpm/fpm_events.c
U php/php-src/trunk/sapi/fpm/fpm/fpm_process_ctl.c
U php/php-src/trunk/sapi/fpm/fpm/fpm_request.c
U php/php-src/trunk/sapi/fpm/fpm/fpm_shm.c
U php/php-src/trunk/sapi/fpm/fpm/fpm_shm.h
Modified: php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_events.c
===
--- php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_events.c 2011-06-27 11:08:27 UTC (rev 312522)
+++ php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_events.c 2011-06-27 11:33:03 UTC (rev 312523)
@@ -263,6 +263,7 @@
if (!err) {
fpm_pctl_perform_idle_server_maintenance_heartbeat(NULL, 0, NULL);
+ zlog(ZLOG_DEBUG, %zu bytes have been reserved in SHM, fpm_shm_get_size_allocated());
zlog(ZLOG_NOTICE, ready to handle connections);
}
Modified: php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_process_ctl.c
===
--- php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_process_ctl.c 2011-06-27 11:08:27 UTC (rev 312522)
+++ php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_process_ctl.c 2011-06-27 11:33:03 UTC (rev 312523)
@@ -352,7 +352,7 @@
}
#endif
}
- fpm_scoreboard_update(-1, -1, cur_lq, -1, -1, -1, FPM_SCOREBOARD_ACTION_SET, wp-scoreboard);
+ fpm_scoreboard_update(idle, active, cur_lq, -1, -1, -1, FPM_SCOREBOARD_ACTION_SET, wp-scoreboard);
}
Modified: php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_request.c
===
--- php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_request.c 2011-06-27 11:08:27 UTC (rev 312522)
+++ php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_request.c 2011-06-27 11:33:03 UTC (rev 312523)
@@ -32,7 +32,7 @@
proc = fpm_scoreboard_proc_acquire(NULL, -1, 0);
if (proc == NULL) {
- zlog(ZLOG_WARNING, unable to aquire proc scoreboard);
+ zlog(ZLOG_WARNING, unable to acquire proc scoreboard);
return;
}
@@ -67,7 +67,7 @@
proc = fpm_scoreboard_proc_acquire(NULL, -1, 0);
if (proc == NULL) {
- zlog(ZLOG_WARNING, unable to aquire proc scoreboard);
+ zlog(ZLOG_WARNING, unable to acquire proc scoreboard);
return;
}
@@ -101,7 +101,7 @@
proc = fpm_scoreboard_proc_acquire(NULL, -1, 0);
if (proc == NULL) {
- zlog(ZLOG_WARNING, unable to aquire proc scoreboard);
+ zlog(ZLOG_WARNING, unable to acquire proc scoreboard);
return;
}
@@ -145,7 +145,7 @@
proc = fpm_scoreboard_proc_acquire(NULL, -1, 0);
if (proc == NULL) {
- zlog(ZLOG_WARNING, unable to aquire proc scoreboard);
+ zlog(ZLOG_WARNING, unable to acquire proc scoreboard);
return;
}
@@ -171,7 +171,7 @@
proc = fpm_scoreboard_proc_acquire(NULL, -1, 0);
if (proc == NULL) {
- zlog(ZLOG_WARNING, unable to aquire proc scoreboard);
+ zlog(ZLOG_WARNING, unable to acquire proc scoreboard);
return;
}
proc-request_stage = FPM_REQUEST_FINISHED;
@@ -194,7 +194,7 @@
proc = fpm_scoreboard_proc_acquire(NULL, -1, 0);
if (proc == NULL) {
- zlog(ZLOG_WARNING, unable to aquire proc scoreboard);
+ zlog(ZLOG_WARNING, unable to acquire proc scoreboard);
return;
}
@@ -210,8 +210,9 @@
{
struct fpm_scoreboard_proc_s proc, *proc_p;
- proc_p = fpm_scoreboard_proc_acquire(0, child-scoreboard_i, 1);
+ proc_p = fpm_scoreboard_proc_acquire(child-wp-scoreboard, child-scoreboard_i, 1);
if (!proc_p) {
+ zlog(ZLOG_WARNING, unable to acquire scoreboard);
return;
}
Modified: php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_shm.c
===
--- php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_shm.c 2011-06-27 11:08:27 UTC (rev 312522)
+++ php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_shm.c 2011-06-27 11:33:03 UTC (rev 312523)
@@ -15,6 +15,8 @@
#define MAP_ANONYMOUS MAP_ANON
#endif
+static size_t fpm_shm_size = 0;
+
void *fpm_shm_alloc(size_t size) /* {{{ */
{
void *mem;
@@ -34,6 +36,7 @@
}
memset(mem, size, 0);
+ fpm_shm_size += size;
return mem;
}
/* }}} */
@@ -50,8 +53,18 @@
return 0;
}
+ if (fpm_shm_size - size 0) {
+ fpm_shm_size -= size;
+ } else {
+
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/date/lib/timezonedb.h branches/PHP_5_4/ext/date/lib/timezonedb.h trunk/ext/date/lib/timezonedb.h
derick Mon, 27 Jun 2011 11:47:43 + Revision: http://svn.php.net/viewvc?view=revisionrevision=312526 Log: - Updated to version 2011.8 (2011h) Changed paths: U php/php-src/branches/PHP_5_3/ext/date/lib/timezonedb.h U php/php-src/branches/PHP_5_4/ext/date/lib/timezonedb.h U php/php-src/trunk/ext/date/lib/timezonedb.h diffs exceeded maximum size -- 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/oci8/ package.xml php_oci8.h
sixd Mon, 27 Jun 2011 17:24:55 + Revision: http://svn.php.net/viewvc?view=revisionrevision=312535 Log: missed version sync with 5.4 Changed paths: U php/php-src/branches/PHP_5_3/ext/oci8/package.xml U php/php-src/branches/PHP_5_3/ext/oci8/php_oci8.h Modified: php/php-src/branches/PHP_5_3/ext/oci8/package.xml === --- php/php-src/branches/PHP_5_3/ext/oci8/package.xml 2011-06-27 15:26:07 UTC (rev 312534) +++ php/php-src/branches/PHP_5_3/ext/oci8/package.xml 2011-06-27 17:24:55 UTC (rev 312535) @@ -33,12 +33,12 @@ activeno/active /lead - date2010-12-09/date - time20:00:00/time + date2011-06-10/date + time12:00:00/time version - release1.4.5/release - api1.4.5/api + release1.4.6/release + api1.4.6/api /version stability releasestable/release @@ -46,7 +46,8 @@ /stability license uri=http://www.php.net/license;PHP/license notes -Protect against null bytes in LOB filenames (http://news.php.net/php.internals/50202) + Added oci_client_version() returning the runtime Oracle client library version + Made OCI8 extension buildable with PHP 5.4-development code /notes contents dir name=/ @@ -87,8 +88,20 @@ file name=bind_empty.phpt role=test / file name=bind_long.phpt role=test / file name=bind_long_raw.phpt role=test / +file name=bind_misccoltypes_errs.phpt role=test / +file name=bind_misccoltypes.phpt role=test / +file name=bind_number.phpt role=test / +file name=bind_query.phpt role=test / file name=bind_raw.phpt role=test / file name=bind_rowid.phpt role=test / +file name=bind_sqltafc.phpt role=test / +file name=bind_sqltchr_1.phpt role=test / +file name=bind_sqltchr_2.phpt role=test / +file name=bind_sqltint.phpt role=test / +file name=bind_sqltnum.phpt role=test / +file name=bind_unsupported_1.phpt role=test / +file name=bind_unsupported_2.phpt role=test / +file name=bind_unsupported_3.phpt role=test / file name=bug26133.phpt role=test / file name=bug27303_1_11gR1.phpt role=test / file name=bug27303_1.phpt role=test / @@ -125,8 +138,12 @@ file name=bug46994.phpt role=test / file name=bug47189.phpt role=test / file name=bug47281.phpt role=test / +file name=bug47281_tt.phpt role=test / file name=bug51253.phpt role=test / -file name=bug51291.phpt role=test / +file name=bug51291_1.phpt role=test / +file name=bug51291_2.phpt role=test / +file name=clientversion_92.phpt role=test / +file name=clientversion.phpt role=test / file name=close.phpt role=test / file name=coll_001.phpt role=test / file name=coll_002_func.phpt role=test / @@ -193,15 +210,19 @@ file name=cursor_bind.phpt role=test / file name=cursors_old.phpt role=test / file name=cursors.phpt role=test / +file name=dbmsoutput.phpt role=test / file name=debug.phpt role=test / +file name=default_prefetch0.phpt role=test / file name=default_prefetch1.phpt role=test / file name=default_prefetch2.phpt role=test / file name=default_prefetch.phpt role=test / +file name=define0.phpt role=test / file name=define1.phpt role=test / file name=define2.phpt role=test / file name=define3.phpt role=test / file name=define4.phpt role=test / file name=define5.phpt role=test / +file name=define6.phpt role=test / file name=define_old.phpt role=test / file name=define.phpt role=test / file name=descriptors.phpt role=test / @@ -225,6 +246,7 @@ file name=driver_name.phpt role=test / file name=drop_table.inc role=test / file name=drop_type.inc role=test / +file name=dupcolnames.phpt role=test / file name=edition_1.phpt role=test / file name=edition_2.phpt role=test / file name=error1.phpt role=test / @@ -239,6 +261,7 @@ file name=extauth_02.phpt role=test / file name=extauth_03.phpt role=test / file name=extauth_04.phpt role=test / +file name=fetch_all1.phpt role=test / file name=fetch_all2.phpt role=test / file name=fetch_all3.phpt role=test / file name=fetch_all4.phpt role=test / @@ -249,12 +272,15 @@ file name=fetch_into1.phpt role=test / file name=fetch_into2.phpt role=test / file name=fetch_into.phpt role=test / +file name=fetch_object_1.phpt role=test / file name=fetch_object_2.phpt role=test / file name=fetch_object.phpt role=test / file name=fetch.phpt role=test / file name=fetch_row.phpt role=test / +file name=field_funcs0.phpt role=test / file name=field_funcs1.phpt role=test / file name=field_funcs2.phpt role=test / +file name=field_funcs3.phpt role=test / file name=field_funcs_old.phpt role=test / file name=field_funcs.phpt role=test / file name=function_aliases.phpt role=test / @@ -302,6 +328,7 @@ file name=lob_041.phpt role=test
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/dba/config.m4 branches/PHP_5_4/ext/dba/config.m4 trunk/ext/dba/config.m4
bjoriMon, 27 Jun 2011 20:28:30 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=312536
Log:
Fix 5.1 detection on ubuntu natty
Changed paths:
U php/php-src/branches/PHP_5_3/ext/dba/config.m4
U php/php-src/branches/PHP_5_4/ext/dba/config.m4
U php/php-src/trunk/ext/dba/config.m4
Modified: php/php-src/branches/PHP_5_3/ext/dba/config.m4
===
--- php/php-src/branches/PHP_5_3/ext/dba/config.m4 2011-06-27 17:24:55 UTC
(rev 312535)
+++ php/php-src/branches/PHP_5_3/ext/dba/config.m4 2011-06-27 20:28:30 UTC
(rev 312536)
@@ -276,7 +276,7 @@
PHP_DBA_STD_BEGIN
dbdp4=/usr/local/BerkeleyDB.4.
dbdp5=/usr/local/BerkeleyDB.5.
- for i in $PHP_DB4 ${dbdp5}0 ${dbdp4}8 ${dbdp4}7 ${dbdp4}6 ${dbdp4}5
${dbdp4}4 ${dbdp4}3 ${dbdp4}2 ${dbdp4}1 ${dbdp}0 /usr/local /usr; do
+ for i in $PHP_DB4 ${dbdp5}1 ${dbdp5}0 ${dbdp4}8 ${dbdp4}7 ${dbdp4}6
${dbdp4}5 ${dbdp4}4 ${dbdp4}3 ${dbdp4}2 ${dbdp4}1 ${dbdp}0 /usr/local /usr; do
if test -f $i/db5/db.h; then
THIS_PREFIX=$i
THIS_INCLUDE=$i/db5/db.h
@@ -285,6 +285,10 @@
THIS_PREFIX=$i
THIS_INCLUDE=$i/db4/db.h
break
+elif test -f $i/include/db5.1/db.h; then
+ THIS_PREFIX=$i
+ THIS_INCLUDE=$i/include/db5.1/db.h
+ break
elif test -f $i/include/db5.0/db.h; then
THIS_PREFIX=$i
THIS_INCLUDE=$i/include/db5.0/db.h
@@ -323,7 +327,7 @@
break
fi
done
- PHP_DBA_DB_CHECK(4, db-5.0 db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2
db-4.1 db-4.0 db-4 db4 db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)])
+ PHP_DBA_DB_CHECK(4, db-5.1 db-5.0 db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db-4.3
db-4.2 db-4.1 db-4.0 db-4 db4 db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)])
fi
PHP_DBA_STD_RESULT(db4,Berkeley DB4)
Modified: php/php-src/branches/PHP_5_4/ext/dba/config.m4
===
--- php/php-src/branches/PHP_5_4/ext/dba/config.m4 2011-06-27 17:24:55 UTC
(rev 312535)
+++ php/php-src/branches/PHP_5_4/ext/dba/config.m4 2011-06-27 20:28:30 UTC
(rev 312536)
@@ -311,7 +311,7 @@
PHP_DBA_STD_BEGIN
dbdp4=/usr/local/BerkeleyDB.4.
dbdp5=/usr/local/BerkeleyDB.5.
- for i in $PHP_DB4 ${dbdp5}0 ${dbdp4}8 ${dbdp4}7 ${dbdp4}6 ${dbdp4}5
${dbdp4}4 ${dbdp4}3 ${dbdp4}2 ${dbdp4}1 ${dbdp}0 /usr/local /usr; do
+ for i in $PHP_DB4 ${dbdp5}1 ${dbdp5}0 ${dbdp4}8 ${dbdp4}7 ${dbdp4}6
${dbdp4}5 ${dbdp4}4 ${dbdp4}3 ${dbdp4}2 ${dbdp4}1 ${dbdp}0 /usr/local /usr; do
if test -f $i/db5/db.h; then
THIS_PREFIX=$i
THIS_INCLUDE=$i/db5/db.h
@@ -320,6 +320,10 @@
THIS_PREFIX=$i
THIS_INCLUDE=$i/db4/db.h
break
+elif test -f $i/include/db5.1/db.h; then
+ THIS_PREFIX=$i
+ THIS_INCLUDE=$i/include/db5.1/db.h
+ break
elif test -f $i/include/db5.0/db.h; then
THIS_PREFIX=$i
THIS_INCLUDE=$i/include/db5.0/db.h
@@ -358,7 +362,7 @@
break
fi
done
- PHP_DBA_DB_CHECK(4, db-5.0 db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2
db-4.1 db-4.0 db-4 db4 db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)])
+ PHP_DBA_DB_CHECK(4, db-5.1 db-5.0 db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db-4.3
db-4.2 db-4.1 db-4.0 db-4 db4 db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)])
fi
PHP_DBA_STD_RESULT(db4,Berkeley DB4)
Modified: php/php-src/trunk/ext/dba/config.m4
===
--- php/php-src/trunk/ext/dba/config.m4 2011-06-27 17:24:55 UTC (rev 312535)
+++ php/php-src/trunk/ext/dba/config.m4 2011-06-27 20:28:30 UTC (rev 312536)
@@ -311,7 +311,7 @@
PHP_DBA_STD_BEGIN
dbdp4=/usr/local/BerkeleyDB.4.
dbdp5=/usr/local/BerkeleyDB.5.
- for i in $PHP_DB4 ${dbdp5}0 ${dbdp4}8 ${dbdp4}7 ${dbdp4}6 ${dbdp4}5
${dbdp4}4 ${dbdp4}3 ${dbdp4}2 ${dbdp4}1 ${dbdp}0 /usr/local /usr; do
+ for i in $PHP_DB4 ${dbdp5}1 ${dbdp5}0 ${dbdp4}8 ${dbdp4}7 ${dbdp4}6
${dbdp4}5 ${dbdp4}4 ${dbdp4}3 ${dbdp4}2 ${dbdp4}1 ${dbdp}0 /usr/local /usr; do
if test -f $i/db5/db.h; then
THIS_PREFIX=$i
THIS_INCLUDE=$i/db5/db.h
@@ -320,6 +320,10 @@
THIS_PREFIX=$i
THIS_INCLUDE=$i/db4/db.h
break
+elif test -f $i/include/db5.1/db.h; then
+ THIS_PREFIX=$i
+ THIS_INCLUDE=$i/include/db5.1/db.h
+ break
elif test -f $i/include/db5.0/db.h; then
THIS_PREFIX=$i
THIS_INCLUDE=$i/include/db5.0/db.h
@@ -358,7 +362,7 @@
break
fi
done
- PHP_DBA_DB_CHECK(4, db-5.0 db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2
db-4.1 db-4.0 db-4 db4 db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)])
+ PHP_DBA_DB_CHECK(4, db-5.1 db-5.0 db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db-4.3
db-4.2 db-4.1 db-4.0 db-4 db4 db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)])
fi
PHP_DBA_STD_RESULT(db4,Berkeley DB4)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /SVNROOT/ header.ezt
bjoriMon, 27 Jun 2011 22:48:53 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=312539
Log:
use https to fetch data from static.php.net
Changed paths:
U SVNROOT/header.ezt
Modified: SVNROOT/header.ezt
===
--- SVNROOT/header.ezt 2011-06-27 22:31:08 UTC (rev 312538)
+++ SVNROOT/header.ezt 2011-06-27 22:48:53 UTC (rev 312539)
@@ -5,9 +5,9 @@
title[if-any rootname][[][rootname]][else]ViewVC[end] [page_title]/title
meta name=generator content=ViewVC [vsn] /
link rel=stylesheet href=[docroot]/styles.css type=text/css /
- link rel=stylesheet
href=http://static.php.net/www.php.net/styles/site.css; /
- link rel=stylesheet
href=http://static.php.net/www.php.net/styles/phpnet.css; /
- link rel=shortcut icon
href=http://static.php.net/www.php.net/favicon.ico; /
+ link rel=stylesheet
href=https://static.php.net/www.php.net/styles/site.css; /
+ link rel=stylesheet
href=https://static.php.net/www.php.net/styles/phpnet.css; /
+ link rel=shortcut icon
href=https://static.php.net/www.php.net/favicon.ico; /
style type=text/css
.paddinghack { margin-left: 5px; margin-top: 5px; }
/style
@@ -17,7 +17,7 @@
div
table border=0 cellspacing=0 cellpadding=0 width=100%
tr bgcolor=#cc
- td align=left rowspan=2a href=/img
src=http://static.php.net/www.php.net/images/php.gif; alt=PHP width=120
height=67 hspace=3 //a/td
+ td align=left rowspan=2a href=/img
src=https://static.php.net/www.php.net/images/php.gif; alt=PHP width=120
height=67 hspace=3 //a/td
tdnbsp;/td
/tr
tr bgcolor=#cc
--
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 branches/PHP_5_3/ext/dba/dba_db4.c branches/PHP_5_4/ext/dba/dba_db4.c trunk/ext/dba/dba_db4.c
sixd Mon, 27 Jun 2011 22:58:59 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=312540
Log:
Keep the DBA DB4 test status quo after Berkeley DB 5.2 introduced error message
prefixes
Changed paths:
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/ext/dba/dba_db4.c
U php/php-src/branches/PHP_5_4/ext/dba/dba_db4.c
U php/php-src/trunk/ext/dba/dba_db4.c
Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS 2011-06-27 22:48:53 UTC (rev 312539)
+++ php/php-src/branches/PHP_5_3/NEWS 2011-06-27 22:58:59 UTC (rev 312540)
@@ -7,8 +7,11 @@
- DateTime extension:
. Fixed bug where the DateTime object got changed while using date_diff().
(Derick)
+
+- DBA extension:
+ . Supress warning on non-existent file open with Berkeley DB 5.2 (Chris
Jones)
-- PDO ODBC:
+- PDO ODBC driver:
. Fixed data type usage in 64bit. (leocsilva at gmail dot com)
Modified: php/php-src/branches/PHP_5_3/ext/dba/dba_db4.c
===
--- php/php-src/branches/PHP_5_3/ext/dba/dba_db4.c 2011-06-27 22:48:53 UTC
(rev 312539)
+++ php/php-src/branches/PHP_5_3/ext/dba/dba_db4.c 2011-06-27 22:58:59 UTC
(rev 312540)
@@ -46,11 +46,12 @@
#if (DB_VERSION_MAJOR == 5 || (DB_VERSION_MAJOR == 4 DB_VERSION_MINOR == 8))
/* Bug 51086, Berkeley DB 4.8.26 */
-/* This code suppresses a BDB 4.8 error message that BDB incorrectly emits */
+/* This code suppresses a BDB 4.8+ error message, thus keeping PHP test
compatibility */
{
char *function = get_active_function_name(TSRMLS_C);
if (function (!strcmp(function,dba_popen) ||
!strcmp(function,dba_open))
-!strncmp(msg, fop_read_meta,
sizeof(fop_read_meta)-1)) {
+(!strncmp(msg, fop_read_meta,
sizeof(fop_read_meta)-1)
+ || !strncmp(msg, BDB0004 fop_read_meta,
sizeof(BDB0004 fop_read_meta)-1))) {
return;
}
}
Modified: php/php-src/branches/PHP_5_4/ext/dba/dba_db4.c
===
--- php/php-src/branches/PHP_5_4/ext/dba/dba_db4.c 2011-06-27 22:48:53 UTC
(rev 312539)
+++ php/php-src/branches/PHP_5_4/ext/dba/dba_db4.c 2011-06-27 22:58:59 UTC
(rev 312540)
@@ -46,11 +46,12 @@
#if (DB_VERSION_MAJOR == 5 || (DB_VERSION_MAJOR == 4 DB_VERSION_MINOR == 8))
/* Bug 51086, Berkeley DB 4.8.26 */
-/* This code suppresses a BDB 4.8 error message that BDB incorrectly emits */
+/* This code suppresses a BDB 4.8+ error message, thus keeping PHP test
compatibility */
{
char *function = get_active_function_name(TSRMLS_C);
if (function (!strcmp(function,dba_popen) ||
!strcmp(function,dba_open))
-!strncmp(msg, fop_read_meta,
sizeof(fop_read_meta)-1)) {
+(!strncmp(msg, fop_read_meta,
sizeof(fop_read_meta)-1)
+ || !strncmp(msg, BDB0004 fop_read_meta,
sizeof(BDB0004 fop_read_meta)-1))) {
return;
}
}
Modified: php/php-src/trunk/ext/dba/dba_db4.c
===
--- php/php-src/trunk/ext/dba/dba_db4.c 2011-06-27 22:48:53 UTC (rev 312539)
+++ php/php-src/trunk/ext/dba/dba_db4.c 2011-06-27 22:58:59 UTC (rev 312540)
@@ -46,11 +46,12 @@
#if (DB_VERSION_MAJOR == 5 || (DB_VERSION_MAJOR == 4 DB_VERSION_MINOR == 8))
/* Bug 51086, Berkeley DB 4.8.26 */
-/* This code suppresses a BDB 4.8 error message that BDB incorrectly emits */
+/* This code suppresses a BDB 4.8+ error message, thus keeping PHP test
compatibility */
{
char *function = get_active_function_name(TSRMLS_C);
if (function (!strcmp(function,dba_popen) ||
!strcmp(function,dba_open))
-!strncmp(msg, fop_read_meta,
sizeof(fop_read_meta)-1)) {
+(!strncmp(msg, fop_read_meta,
sizeof(fop_read_meta)-1)
+ || !strncmp(msg, BDB0004 fop_read_meta,
sizeof(BDB0004 fop_read_meta)-1))) {
return;
}
}
--
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/sapi/cli/php_cli_server.c trunk/sapi/cli/php_cli_server.c
felipe Mon, 27 Jun 2011 23:18:26 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=312541
Log:
- Fixed crash on invalid addr:port (Chris Jones, Felipe)
Changed paths:
U php/php-src/branches/PHP_5_4/sapi/cli/php_cli_server.c
U php/php-src/trunk/sapi/cli/php_cli_server.c
Modified: php/php-src/branches/PHP_5_4/sapi/cli/php_cli_server.c
===
--- php/php-src/branches/PHP_5_4/sapi/cli/php_cli_server.c 2011-06-27
22:58:59 UTC (rev 312540)
+++ php/php-src/branches/PHP_5_4/sapi/cli/php_cli_server.c 2011-06-27
23:18:26 UTC (rev 312541)
@@ -360,6 +360,9 @@
static int sapi_cli_server_ub_write(const char *str, uint str_length
TSRMLS_DC) /* {{{ */
{
php_cli_server_client *client = SG(server_context);
+ if (!client) {
+ return 0;
+ }
if (client-capturing) {
php_cli_server_chunk *chunk =
php_cli_server_chunk_heap_new_self_contained(str_length);
if (!chunk) {
@@ -400,7 +403,7 @@
sapi_header_struct *h;
zend_llist_position pos;
- if (client-capturing || SG(request_info).no_headers) {
+ if (client == NULL || client-capturing || SG(request_info).no_headers)
{
return SAPI_HEADER_SENT_SUCCESSFULLY;
}
@@ -1506,7 +1509,9 @@
php_cli_server_client_begin_capture(client);
zend_try {
php_info_print_style(TSRMLS_C);
-
php_cli_server_buffer_append(client-content_sender.buffer,
client-capture_buffer.first);
+ if (client-capture_buffer.first) {
+
php_cli_server_buffer_append(client-content_sender.buffer,
client-capture_buffer.first);
+ }
client-capture_buffer.first =
client-capture_buffer.last = NULL;
} zend_catch {
err = 1;
@@ -1785,7 +1790,11 @@
php_socket_t server_sock = SOCK_ERR;
host = pestrdup(addr, 1);
- if (!host) {
+ if (!host || *host == ':' ) {
+ if (host) {
+ pefree(host, 1);
+ }
+ fprintf(stderr, Invalid built-in web-server addr:port
argument\n);
return FAILURE;
}
Modified: php/php-src/trunk/sapi/cli/php_cli_server.c
===
--- php/php-src/trunk/sapi/cli/php_cli_server.c 2011-06-27 22:58:59 UTC (rev
312540)
+++ php/php-src/trunk/sapi/cli/php_cli_server.c 2011-06-27 23:18:26 UTC (rev
312541)
@@ -360,6 +360,9 @@
static int sapi_cli_server_ub_write(const char *str, uint str_length
TSRMLS_DC) /* {{{ */
{
php_cli_server_client *client = SG(server_context);
+ if (!client) {
+ return 0;
+ }
if (client-capturing) {
php_cli_server_chunk *chunk =
php_cli_server_chunk_heap_new_self_contained(str_length);
if (!chunk) {
@@ -400,7 +403,7 @@
sapi_header_struct *h;
zend_llist_position pos;
- if (client-capturing || SG(request_info).no_headers) {
+ if (client == NULL || client-capturing || SG(request_info).no_headers)
{
return SAPI_HEADER_SENT_SUCCESSFULLY;
}
@@ -1506,7 +1509,9 @@
php_cli_server_client_begin_capture(client);
zend_try {
php_info_print_style(TSRMLS_C);
-
php_cli_server_buffer_append(client-content_sender.buffer,
client-capture_buffer.first);
+ if (client-capture_buffer.first) {
+
php_cli_server_buffer_append(client-content_sender.buffer,
client-capture_buffer.first);
+ }
client-capture_buffer.first =
client-capture_buffer.last = NULL;
} zend_catch {
err = 1;
@@ -1785,7 +1790,11 @@
php_socket_t server_sock = SOCK_ERR;
host = pestrdup(addr, 1);
- if (!host) {
+ if (!host || *host == ':' ) {
+ if (host) {
+ pefree(host, 1);
+ }
+ fprintf(stderr, Invalid built-in web-server addr:port
argument\n);
return FAILURE;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
