[PHP-CVS] com php-src: MFH: fixed a mistake on reverting my previous patch.: ext/standard/exec.c
Commit:07679e98d6f28a8a71e27ead479ae65a72c0d58d
Author:Rui Hirokawa rui.hirok...@gmail.com Mon, 9 Apr 2012
23:49:18 +0900
Committer: Stanislav Malyshev s...@php.net Fri, 13 Apr 2012 17:02:32
-0700
Parents: fa1437b144683eae4d253473c35e375f7b743811
Branches: PHP-5.4.1
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=07679e98d6f28a8a71e27ead479ae65a72c0d58d
Log:
MFH: fixed a mistake on reverting my previous patch.
Changed paths:
M ext/standard/exec.c
Diff:
diff --git a/ext/standard/exec.c b/ext/standard/exec.c
index b0ccdec..a5ca84b 100644
--- a/ext/standard/exec.c
+++ b/ext/standard/exec.c
@@ -272,8 +272,8 @@ PHPAPI char *php_escape_shell_cmd(char *str)
p = NULL;
} else {
cmd[y++] = '\\';
- cmd[y++] = str[x];
}
+ cmd[y++] = str[x];
break;
#else
/* % is Windows specific for enviromental variables,
^%PATH% will
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Fixed bug #61761 ('Overriding' a private static method with a different signature causes crash): NEWS Zend/tests/bug61761.phpt Zend/zend_compile.c
Commit:1b29ba61de23f1e4d10472bf5dc1bf1db3f96328
Author:Xinchen Hui larue...@php.net Wed, 18 Apr 2012 17:40:18
+0800
Parents: 885e57517ad6057b497b2c90482ddb2d58ac1a2b
Branches: PHP-5.4
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=1b29ba61de23f1e4d10472bf5dc1bf1db3f96328
Log:
Fixed bug #61761 ('Overriding' a private static method with a different
signature causes crash)
Bugs:
https://bugs.php.net/61761
Changed paths:
M NEWS
A Zend/tests/bug61761.phpt
M Zend/zend_compile.c
Diff: Diff exceeded maximum size
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Revert Fixed bug #61761 ('Overriding' a private static method with a different signature causes crash): NEWS Zend/tests/bug61761.phpt Zend/zend_compile.c
Commit:1bbb5069ff794f812ea0a67bdcbc928cecd0b10a
Author:Xinchen Hui larue...@php.net Wed, 18 Apr 2012 17:47:39
+0800
Parents: 1b29ba61de23f1e4d10472bf5dc1bf1db3f96328
Branches: PHP-5.4
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=1bbb5069ff794f812ea0a67bdcbc928cecd0b10a
Log:
Revert Fixed bug #61761 ('Overriding' a private static method with a different
signature causes crash)
This reverts commit 1b29ba61de23f1e4d10472bf5dc1bf1db3f96328.
Pushed to wrong branch..
Bugs:
https://bugs.php.net/61761
Changed paths:
M NEWS
D Zend/tests/bug61761.phpt
M Zend/zend_compile.c
Diff: Diff exceeded maximum size
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Fixed bug #61761 ('Overriding' a private static method with a different signature causes crash): NEWS Zend/tests/bug61761.phpt Zend/zend_compile.c
Commit:da6465a268d9ece2ffd38447890b206dd94b3250
Author:Xinchen Hui larue...@php.net Wed, 18 Apr 2012 18:13:27
+0800
Parents: d55afe4df63945a6e3abe9892ba7836f83c74265
Branches: PHP-5.4
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=da6465a268d9ece2ffd38447890b206dd94b3250
Log:
Fixed bug #61761 ('Overriding' a private static method with a different
signature causes crash)
Bugs:
https://bugs.php.net/61761
Changed paths:
M NEWS
A Zend/tests/bug61761.phpt
M Zend/zend_compile.c
Diff:
diff --git a/NEWS b/NEWS
index 2eafb98..1b0278c 100644
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,10 @@ PHP
NEWS
$_SERVER['SCRIPT_FILENAME'] when using router). (Laruence)
. Connection: close instead of Connection: closed (Gustavo)
+- Core:
+ . Fixed bug #61761 ('Overriding' a private static method with a different
+signature causes crash). (Laruence)
+
- JSON
. Fixed bug #61537 (json_encode() incorrectly truncates/discards
information). (Adam)
@@ -17,7 +21,8 @@ PHP
NEWS
(merge after 5.3.11 release)
- Core:
- . Fixed bug #61728 (PHP crash when calling ob_start in request_shutdown
phase). (Laruence)
+ . Fixed bug #61728 (PHP crash when calling ob_start in request_shutdown
+phase). (Laruence)
. Fixed bug #61660 (bin2hex(hex2bin($data)) != $data). (Nikita Popov)
. Fixed bug #61650 (ini parser crashes when using ${} ini variables
(without apache2)). (Laruence)
diff --git a/Zend/tests/bug61761.phpt b/Zend/tests/bug61761.phpt
new file mode 100755
index 000..631f566
--- /dev/null
+++ b/Zend/tests/bug61761.phpt
@@ -0,0 +1,18 @@
+--TEST--
+Bug #61761 ('Overriding' a private static method with a different signature
causes crash)
+--FILE--
+?php
+
+class A
+{
+private static function test($a) { }
+}
+
+class B extends A
+{
+private static function test($a, $b) { }
+}
+
+?
+--EXPECTF--
+Strict Standards: Declaration of B::test() should be compatible with
A::test($a) in %sbug61761.php on line %d
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index c3c35eb..602b600 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -3260,11 +3260,11 @@ static void
do_inheritance_check_on_method(zend_function *child, zend_function *
if (child-common.prototype
(child-common.prototype-common.fn_flags ZEND_ACC_ABSTRACT)) {
if (!zend_do_perform_implementation_check(child,
child-common.prototype TSRMLS_CC)) {
- zend_error(E_COMPILE_ERROR, Declaration of %s::%s()
must be compatible with %s, ZEND_FN_SCOPE_NAME(child),
child-common.function_name,
zend_get_function_declaration(child-common.prototype TSRMLS_CC));
+ zend_error(E_COMPILE_ERROR, Declaration of %s::%s()
must be compatible with %s, ZEND_FN_SCOPE_NAME(child),
child-common.function_name,
zend_get_function_declaration(child-common.prototype? child-common.prototype
: parent TSRMLS_CC));
}
} else if (EG(error_reporting) E_STRICT || EG(user_error_handler)) {
/* Check E_STRICT (or custom error handler) before the check so that we save
some time */
if (!zend_do_perform_implementation_check(child, parent
TSRMLS_CC)) {
- char *method_prototype =
zend_get_function_declaration(child-common.prototype TSRMLS_CC);
+ char *method_prototype =
zend_get_function_declaration(child-common.prototype? child-common.prototype
: parent TSRMLS_CC);
zend_error(E_STRICT, Declaration of %s::%s() should be
compatible with %s, ZEND_FN_SCOPE_NAME(child), child-common.function_name,
method_prototype);
efree(method_prototype);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Add NEWS: NEWS
Commit:d6394e66a31e788560e664d6823d30b2e759d7cb Author:Yasuo Ohgaki yohg...@ohgaki.net Tue, 17 Apr 2012 16:34:47 +0900 Committer: Johannes Schlüter johan...@php.net Wed, 18 Apr 2012 12:21:05 +0200 Parents: cce0f8e507c05ecc7c8222efa5005991f04ce4c0 Branches: PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d6394e66a31e788560e664d6823d30b2e759d7cb Log: Add NEWS Changed paths: M NEWS Diff: diff --git a/NEWS b/NEWS index 2eafb98..c862a6f 100644 --- a/NEWS +++ b/NEWS @@ -788,6 +788,7 @@ PHP NEWS - Postgres: . Fixed bug #60244 (pg_fetch_* functions do not validate that row param is 0). (Ilia) + . Added PGSQL_LIBPQ_VERSION/PGSQL_LIBPQ_VERSION_STR constants. (Yasuo) - Reflection: . Fixed bug #60367 (Reflection and Late Static Binding). (Laruence) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Implement Request #47570 libpq's PG_VERSION should be exported to userland: ext/pgsql/pgsql.c
Commit:cce0f8e507c05ecc7c8222efa5005991f04ce4c0 Author:Yasuo Ohgaki yohg...@ohgaki.net Fri, 30 Mar 2012 09:45:33 +0900 Committer: Johannes Schlüter johan...@php.net Wed, 18 Apr 2012 12:20:35 +0200 Parents: d55afe4df63945a6e3abe9892ba7836f83c74265 Branches: PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=cce0f8e507c05ecc7c8222efa5005991f04ce4c0 Log: Implement Request #47570libpq's PG_VERSION should be exported to userland Bugs: https://bugs.php.net/47570 Changed paths: M ext/pgsql/pgsql.c Diff: diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c index d8127af..54a86a8 100644 --- a/ext/pgsql/pgsql.c +++ b/ext/pgsql/pgsql.c @@ -934,6 +934,11 @@ PHP_MINIT_FUNCTION(pgsql) le_result = zend_register_list_destructors_ex(_free_result, NULL, pgsql result, module_number); le_lofp = zend_register_list_destructors_ex(_free_ptr, NULL, pgsql large object, module_number); le_string = zend_register_list_destructors_ex(_free_ptr, NULL, pgsql string, module_number); +#if HAVE_PG_CONFIG_H + /* PG_VERSION - libpq version */ + REGISTER_STRING_CONSTANT(PGSQL_LIBPQ_VERSION, PG_VERSION, CONST_CS | CONST_PERSISTENT); + REGISTER_STRING_CONSTANT(PGSQL_LIBPQ_VERSION_STR, PG_VERSION_STR, CONST_CS | CONST_PERSISTENT); +#endif /* For connection option */ REGISTER_LONG_CONSTANT(PGSQL_CONNECT_FORCE_NEW, PGSQL_CONNECT_FORCE_NEW, CONST_CS | CONST_PERSISTENT); /* For pg_fetch_array() */ @@ -1048,6 +1053,7 @@ PHP_MINFO_FUNCTION(pgsql) php_info_print_table_header(2, PostgreSQL Support, enabled); #if HAVE_PG_CONFIG_H php_info_print_table_row(2, PostgreSQL(libpq) Version, PG_VERSION); + php_info_print_table_row(2, PostgreSQL(libpq) , PG_VERSION_STR); #ifdef HAVE_PGSQL_WITH_MULTIBYTE_SUPPORT php_info_print_table_row(2, Multibyte character support, enabled); #else -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] HEADS UP: Force pushed to revert to d55afe4df63945a6e3abe9892ba7836f83c74265
Hi,
the master branch was accidentally merged into the 5.4 branch. I
reverted that by force pushing the old revision
d55afe4df63945a6e3abe9892ba7836f83c74265 into PHP-5.4 and then
cherry-picking all revisions since then. Please take a look and
double-check that nothing was lost.
If you pulled within the last few minutes please make sure that you do
not have the revision 885e57517ad6057b497b2c90482ddb2d58ac1a2b and don't
push that revision to the repository.
johannes
Changes reapplied:
commit 0618e33b5dbac73efc0893884051b5c24e7ab409
Merge: d6394e6 da6465a
Author: Johannes Schlüter johan...@php.net
Date: Wed Apr 18 12:22:27 2012 +0200
Merge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4
* 'PHP-5.4' of git.php.net:/php-src:
Fixed bug #61761 ('Overriding' a private static method with a
different signature causes crash)
commit d6394e66a31e788560e664d6823d30b2e759d7cb
Author: Yasuo Ohgaki yohg...@ohgaki.net
Date: Tue Apr 17 16:34:47 2012 +0900
Add NEWS
commit cce0f8e507c05ecc7c8222efa5005991f04ce4c0
Author: Yasuo Ohgaki yohg...@ohgaki.net
Date: Fri Mar 30 09:45:33 2012 +0900
Implement Request #47570libpq's PG_VERSION should be exported to
userland
commit da6465a268d9ece2ffd38447890b206dd94b3250
Author: Xinchen Hui larue...@php.net
Date: Wed Apr 18 18:13:27 2012 +0800
Fixed bug #61761 ('Overriding' a private static method with a
different signature causes crash)
commit d55afe4df63945a6e3abe9892ba7836f83c74265
Merge: 3d106ae f3d86b3
Author: Anatoliy Belsky a...@php.net
Date: Mon Apr 16 17:07:33 2012 +0200
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Fix bug 61746 Failing tests in
ext/standard/tests/file/windows_links/*
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] Re: [PHP-DEV] HEADS UP: Force pushed to revert to d55afe4df63945a6e3abe9892ba7836f83c74265
On Wed, 2012-04-18 at 12:35 +0200, Johannes Schlüter wrote: Hi, the master branch was accidentally merged into the 5.4 branch. I reverted that by force pushing the old revision d55afe4df63945a6e3abe9892ba7836f83c74265 into PHP-5.4 and then cherry-picking all revisions since then. Please take a look and double-check that nothing was lost. I've pushed the messed branch to https://github.com/johannes/php-src/tree/php-5.4-messup in case somebody wants to verify something. johannes -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: update NEWS: NEWS
Commit:172aa3c6d77ab4af9439131e960307659e0195ef
Author:Xinchen Hui larue...@php.net Wed, 18 Apr 2012 18:42:39
+0800
Parents: 0618e33b5dbac73efc0893884051b5c24e7ab409
Branches: PHP-5.4
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=172aa3c6d77ab4af9439131e960307659e0195ef
Log:
update NEWS
Changed paths:
M NEWS
Diff:
diff --git a/NEWS b/NEWS
index c862a6f..94c75c8 100644
--- a/NEWS
+++ b/NEWS
@@ -17,7 +17,10 @@ PHP
NEWS
(merge after 5.3.11 release)
- Core:
- . Fixed bug #61728 (PHP crash when calling ob_start in request_shutdown
phase). (Laruence)
+ . Fixed bug #61761 ('Overriding' a private static method with a different
+signature causes crash). (Laruence)
+ . Fixed bug #61728 (PHP crash when calling ob_start in request_shutdown
+phase). (Laruence)
. Fixed bug #61660 (bin2hex(hex2bin($data)) != $data). (Nikita Popov)
. Fixed bug #61650 (ini parser crashes when using ${} ini variables
(without apache2)). (Laruence)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Fix NEWS, the previous wrong was introduced in commit cb2a1c71c96d7c9b2ee03d77beae0c8e0d385f1b: NEWS
Commit:56d8d353009dbe9678fd292f205eaf32aca59b9e
Author:Xinchen Hui larue...@php.net Wed, 18 Apr 2012 18:43:46
+0800
Parents: 172aa3c6d77ab4af9439131e960307659e0195ef
Branches: PHP-5.4
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=56d8d353009dbe9678fd292f205eaf32aca59b9e
Log:
Fix NEWS, the previous wrong was introduced in commit
cb2a1c71c96d7c9b2ee03d77beae0c8e0d385f1b
http://git.php.net/?p=php-src.git;a=commitdiff;h=cb2a1c71c96d7c9b2ee03d77beae0c8e0d385f1b
Changed paths:
M NEWS
Diff:
diff --git a/NEWS b/NEWS
index 94c75c8..e09e1ab 100644
--- a/NEWS
+++ b/NEWS
@@ -8,14 +8,6 @@ PHP
NEWS
$_SERVER['SCRIPT_FILENAME'] when using router). (Laruence)
. Connection: close instead of Connection: closed (Gustavo)
-- JSON
- . Fixed bug #61537 (json_encode() incorrectly truncates/discards
-information). (Adam)
-
-?? ??? 2012, PHP 5.3.11
-
-(merge after 5.3.11 release)
-
- Core:
. Fixed bug #61761 ('Overriding' a private static method with a different
signature causes crash). (Laruence)
@@ -71,6 +63,10 @@ PHP
NEWS
. Fixed bug #61487 (Incorrent bounds checking in grapheme_strpos).
(Stas)
+- JSON
+ . Fixed bug #61537 (json_encode() incorrectly truncates/discards
+information). (Adam)
+
- Libxml:
. Fixed bug #61617 (Libxml tests failed(ht is already destroyed)).
(Laruence)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Update generated file.: ext/pdo/pdo_sql_parser.c
Commit:e946eaca0bc747615fabd0fedb8a92ea800ed158
Author:Johannes Schlüter johan...@php.net Wed, 18 Apr 2012
22:47:14 +0200
Parents: dda60f3014743fcbfc1078a8e52b4d7b2e09b839
Branches: PHP-5.3 PHP-5.4 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=e946eaca0bc747615fabd0fedb8a92ea800ed158
Log:
Update generated file.
Changed paths:
M ext/pdo/pdo_sql_parser.c
Diff:
diff --git a/ext/pdo/pdo_sql_parser.c b/ext/pdo/pdo_sql_parser.c
index d67f0e0..ed8af84 100644
--- a/ext/pdo/pdo_sql_parser.c
+++ b/ext/pdo/pdo_sql_parser.c
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Sat Jun 4 18:42:25 2011 */
+/* Generated by re2c 0.13.5 on Wed Apr 18 22:30:06 2012 */
#line 1 ext/pdo/pdo_sql_parser.re
/*
+--+
@@ -569,7 +569,7 @@ safe:
param-param_type TSRMLS_CC)) {
/* bork */
ret = -1;
-
strcpy(stmt-error_code, stmt-dbh-error_code);
+
strncpy(stmt-error_code, stmt-dbh-error_code, 6);
if (buf) {
efree(buf);
}
@@ -592,6 +592,9 @@ safe:
plc-freeq = 0;
break;
+ case IS_BOOL:
+
convert_to_long(param-parameter);
+
case IS_LONG:
case IS_DOUBLE:
convert_to_string(param-parameter);
@@ -600,8 +603,6 @@ safe:
plc-freeq = 0;
break;
- case IS_BOOL:
-
convert_to_long(param-parameter);
default:
convert_to_string(param-parameter);
if
(!stmt-dbh-methods-quoter(stmt-dbh, Z_STRVAL_P(param-parameter),
@@ -609,7 +610,7 @@ safe:
param-param_type TSRMLS_CC)) {
/* bork */
ret = -1;
-
strcpy(stmt-error_code, stmt-dbh-error_code);
+
strncpy(stmt-error_code, stmt-dbh-error_code, 6);
goto clean_up;
}
plc-freeq = 1;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Ensure the SQL parser is regenerated after changes.: ext/pdo/Makefile.frag
Commit:dda60f3014743fcbfc1078a8e52b4d7b2e09b839 Author:Johannes Schlüter johan...@php.net Wed, 18 Apr 2012 22:45:59 +0200 Parents: f3d86b314f4977f95844aa4eaa41759c8d71c247 Branches: PHP-5.3 PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=dda60f3014743fcbfc1078a8e52b4d7b2e09b839 Log: Ensure the SQL parser is regenerated after changes. Changed paths: M ext/pdo/Makefile.frag Diff: diff --git a/ext/pdo/Makefile.frag b/ext/pdo/Makefile.frag index 283a6e2..98f5c5f 100644 --- a/ext/pdo/Makefile.frag +++ b/ext/pdo/Makefile.frag @@ -4,6 +4,10 @@ PDO_HEADER_FILES= \ php_pdo.h \ php_pdo_driver.h + +$(srcdir)/pdo_sql_parser.c: $(srcdir)/pdo_sql_parser.re + (cd $(top_srcdir); $(RE2C) -o ext/pdo/pdo_sql_parser.c ext/pdo/pdo_sql_parser.re) + install-pdo-headers: @echo Installing PDO headers: $(INSTALL_ROOT)$(phpincludedir)/ext/pdo/ @$(mkinstalldirs) $(INSTALL_ROOT)$(phpincludedir)/ext/pdo -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Fix slight grammar glitch (thanks Dan Brown): php.ini-development php.ini-production
Commit:710021d1d4a57941450b7ed482e3c19cfe62fecf Author:Johannes Schlüter johan...@php.net Thu, 19 Apr 2012 00:07:40 +0200 Parents: e946eaca0bc747615fabd0fedb8a92ea800ed158 Branches: PHP-5.3 PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=710021d1d4a57941450b7ed482e3c19cfe62fecf Log: Fix slight grammar glitch (thanks Dan Brown) Changed paths: M php.ini-development M php.ini-production Diff: diff --git a/php.ini-development b/php.ini-development index 7effd70..c198ccc 100644 --- a/php.ini-development +++ b/php.ini-development @@ -19,7 +19,7 @@ ; See the PHP docs for more specific information. ; http://php.net/configuration.file -; The syntax of the file is extremely simple. Whitespace and Lines +; The syntax of the file is extremely simple. Whitespace and lines ; beginning with a semicolon are silently ignored (as you probably guessed). ; Section headers (e.g. [Foo]) are also silently ignored, even though ; they might mean something in the future. diff --git a/php.ini-production b/php.ini-production index 499807a..3c0ae21 100644 --- a/php.ini-production +++ b/php.ini-production @@ -19,7 +19,7 @@ ; See the PHP docs for more specific information. ; http://php.net/configuration.file -; The syntax of the file is extremely simple. Whitespace and Lines +; The syntax of the file is extremely simple. Whitespace and lines ; beginning with a semicolon are silently ignored (as you probably guessed). ; Section headers (e.g. [Foo]) are also silently ignored, even though ; they might mean something in the future. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: php.ini-development php.ini-production
Commit:cc85e7c31391de9acdd348c947c9165520a924a2 Author:Johannes Schlüter johan...@php.net Thu, 19 Apr 2012 00:08:36 +0200 Parents: 900751e8ae4ed2af3e63e7c355fac59f6f932254 710021d1d4a57941450b7ed482e3c19cfe62fecf Branches: PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=cc85e7c31391de9acdd348c947c9165520a924a2 Log: Merge branch 'PHP-5.3' into PHP-5.4 * PHP-5.3: Fix slight grammar glitch (thanks Dan Brown) Changed paths: MM php.ini-development MM php.ini-production Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.4': php.ini-development php.ini-production
Commit:9ca4710c9fb09bca31726e902e2eedab6c6abc94 Author:Johannes Schlüter johan...@php.net Thu, 19 Apr 2012 00:08:42 +0200 Parents: f3b3450f010a8368a142034cef56fbab7f26212e cc85e7c31391de9acdd348c947c9165520a924a2 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9ca4710c9fb09bca31726e902e2eedab6c6abc94 Log: Merge branch 'PHP-5.4' * PHP-5.4: Fix slight grammar glitch (thanks Dan Brown) Changed paths: MM php.ini-development MM php.ini-production Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Drop old README: README.Zeus
Commit:4650b2164b641ba3fd9d733e8cc82e386aa98772
Author:Johannes Schlüter johan...@php.net Thu, 19 Apr 2012
00:29:24 +0200
Parents: 710021d1d4a57941450b7ed482e3c19cfe62fecf
Branches: PHP-5.3 PHP-5.4 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=4650b2164b641ba3fd9d733e8cc82e386aa98772
Log:
Drop old README
Changed paths:
D README.Zeus
Diff:
diff --git a/README.Zeus b/README.Zeus
deleted file mode 100644
index 7fecaf0..000
--- a/README.Zeus
+++ /dev/null
@@ -1,112 +0,0 @@
-Using PHP 5 with the Zeus Web Server
-
-Zeus fully supports running PHP in combination with our
-webserver. There are three different interfaces that can be used to
-enable PHP:
-
-* CGI
-* ISAPI
-* FastCGI
-
-Of the three, we recommend using FastCGI, which has been tested and
-benchmarked as providing the best performance and reliability.
-
-Full details of how to install PHP are available from our
-website, at:
-
-http://support.zeus.com/products/php.html
-
-If you have any problems, please check the support site for more
-up-to-date information and advice.
-
-
-Quick guide to installing CGI/FastCGI with Zeus
-
-Step 1 - Compile PHP as FastCGI.
-
-Compile as follows:
-./configure --enable-fastcgi
-make
-
-Note that PHP has many options to the configure script -
-e.g. --with-mysql. You will probably want to select your usual options
-before compiling; the above is just a bare minimum, for illustration.
-
-After compilation finishes, you will be left with an executable
-program called 'php'. Copy this into your document root, under a
-dedicated FastCGI directory (e.g. $DOCROOT/fcgi-bin/php)
-
-
-Step 2 - configure Zeus
-
-Four stages:
-- enable FastCGI
-- configure FastCGI
-- setup alias for FastCGI
-- setup alias for PHP
-
-1) Using the admin server, go to the 'module configuration' page for
-your virtual server, and ensure that 'fastcgi' is enabled (select the
-tickbox to the left).
-
-2) While we can run FastCGI's locally, there are known problems with
-some OS's (specifically, the communication between web server and
-FastCGI happens over a unix domain socket, and some OS's have trouble
-sustaining high connection rates over these sockets). So instead, we
-are going to set up the PHP FastCGI to run 'remotely' over localhost
-(this uses TCP sockets, which do not suffer this problem). Go to the
-'fastcgi configuration' page, and under 'add remote fastcgi':
-Add Remote FastCGI
-Docroot path/fcgi-bin/php
-Remote machine localhost:8002
-The first entry is where you saved PHP, above.
-The second entry is localhost:any unused port
-We will start the FastCGI listening on this port shortly.
-Click 'update' to commit these changes.
-
-3) Go to the path mapping module and add an alias for FastCGI:
-Add Alias
-Docroot path/fcgi-bin
-Filesystem directory/path/to/docroot/fcgi-bin
-Alias type fastcgi
-Click 'update' to commit these changes
-
-4) Also on the path mapping module, add a handler for PHP:
-Add handler
-File extension php
-Handler /fcgi-bin/php
-Click 'update' to commit these changes
-
-Finally restart your virtual server for these changes to take effect.
-
-
-Step 3 - start PHP as a FastCGI runner
-
-When you start PHP, it will pre-fork a given number of child processes
-to handle incoming PHP requests. Each process will handle a given
-number of requests before exiting (and being replaced by a newly
-forked process). You can control these two parameters by setting the
-following environment variables BEFORE starting the FastCGI runner:
-
-PHP_FCGI_CHILDREN - the number of child processes to pre-fork. This
-variable MUST be set, if not then the PHP will not run as a FastCGI.
-We recommend a value of 8 for a fairly busy site. If you have many,
-long-running PHP scripts, then you may need to increase this further.
-
-PHP_FCGI_MAX_REQUESTS - the number of requests each PHP child process
-handles before exiting. If not set, defaults to 500.
-
-To start the FastCGI runner, execute '$ZEUSHOME/web/bin/fcgirunner
-8002 $DOCROOT/fcgi-bin/php'. Substitute the appropriate values for
-$ZEUSHOME and $DOCROOT; also substitute for 8002 the port you chose,
-above.
-
-To stop the runner (e.g. to experiment with the above environment
-variables) you will need to manually stop and running PHP
-processes. (Use 'ps' and 'kill'). As it is PHP which is forking lots
-of children and not the runner, Zeus unfortunately cannot keep track
-of what processes are running, sorry. A typical command line may look
-like 'ps -efl | grep $DOCROOT/fcgi-bin/php | grep -v grep | awk
-'{print $4}' | xargs kill'
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit:
