[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/php.ini-development branches/PHP_5_4/php.ini-production trunk/php.ini-development trunk/php.ini-production
salathe Mon, 03 Oct 2011 08:40:26 + Revision: http://svn.php.net/viewvc?view=revisionrevision=317640 Log: Fix php.ini comment (#55834) Bug: https://bugs.php.net/55834 (Open) The issue of configuration text in php.ini file. Changed paths: U php/php-src/branches/PHP_5_4/php.ini-development U php/php-src/branches/PHP_5_4/php.ini-production U php/php-src/trunk/php.ini-development U php/php-src/trunk/php.ini-production Modified: php/php-src/branches/PHP_5_4/php.ini-development === --- php/php-src/branches/PHP_5_4/php.ini-development2011-10-03 07:45:19 UTC (rev 317639) +++ php/php-src/branches/PHP_5_4/php.ini-development2011-10-03 08:40:26 UTC (rev 317640) @@ -598,7 +598,7 @@ ; This directive determines which super global arrays are registered when PHP ; starts up. G,P,C,E S are abbreviations for the following respective super ; globals: GET, POST, COOKIE, ENV and SERVER. There is a performance penalty -: paid for the registration of these arrays and because ENV is not as commonly +; paid for the registration of these arrays and because ENV is not as commonly ; used as the others, ENV is not recommended on productions servers. You ; can still get access to the environment variables through getenv() should you ; need to. Modified: php/php-src/branches/PHP_5_4/php.ini-production === --- php/php-src/branches/PHP_5_4/php.ini-production 2011-10-03 07:45:19 UTC (rev 317639) +++ php/php-src/branches/PHP_5_4/php.ini-production 2011-10-03 08:40:26 UTC (rev 317640) @@ -598,7 +598,7 @@ ; This directive determines which super global arrays are registered when PHP ; starts up. G,P,C,E S are abbreviations for the following respective super ; globals: GET, POST, COOKIE, ENV and SERVER. There is a performance penalty -: paid for the registration of these arrays and because ENV is not as commonly +; paid for the registration of these arrays and because ENV is not as commonly ; used as the others, ENV is not recommended on productions servers. You ; can still get access to the environment variables through getenv() should you ; need to. Modified: php/php-src/trunk/php.ini-development === --- php/php-src/trunk/php.ini-development 2011-10-03 07:45:19 UTC (rev 317639) +++ php/php-src/trunk/php.ini-development 2011-10-03 08:40:26 UTC (rev 317640) @@ -598,7 +598,7 @@ ; This directive determines which super global arrays are registered when PHP ; starts up. G,P,C,E S are abbreviations for the following respective super ; globals: GET, POST, COOKIE, ENV and SERVER. There is a performance penalty -: paid for the registration of these arrays and because ENV is not as commonly +; paid for the registration of these arrays and because ENV is not as commonly ; used as the others, ENV is not recommended on productions servers. You ; can still get access to the environment variables through getenv() should you ; need to. Modified: php/php-src/trunk/php.ini-production === --- php/php-src/trunk/php.ini-production2011-10-03 07:45:19 UTC (rev 317639) +++ php/php-src/trunk/php.ini-production2011-10-03 08:40:26 UTC (rev 317640) @@ -598,7 +598,7 @@ ; This directive determines which super global arrays are registered when PHP ; starts up. G,P,C,E S are abbreviations for the following respective super ; globals: GET, POST, COOKIE, ENV and SERVER. There is a performance penalty -: paid for the registration of these arrays and because ENV is not as commonly +; paid for the registration of these arrays and because ENV is not as commonly ; used as the others, ENV is not recommended on productions servers. You ; can still get access to the environment variables through getenv() should you ; need to. -- 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/php.ini-development branches/PHP_5_4/php.ini-production trunk/php.ini-development trunk/php.ini-production
salathe Mon, 03 Oct 2011 08:45:06 + Revision: http://svn.php.net/viewvc?view=revisionrevision=317641 Log: typofix (procgress to progress) Changed paths: U php/php-src/branches/PHP_5_4/php.ini-development U php/php-src/branches/PHP_5_4/php.ini-production U php/php-src/trunk/php.ini-development U php/php-src/trunk/php.ini-production Modified: php/php-src/branches/PHP_5_4/php.ini-development === --- php/php-src/branches/PHP_5_4/php.ini-development2011-10-03 08:40:26 UTC (rev 317640) +++ php/php-src/branches/PHP_5_4/php.ini-development2011-10-03 08:45:06 UTC (rev 317641) @@ -1561,7 +1561,7 @@ ; http://php.net/url-rewriter.tags url_rewriter.tags = a=href,area=href,frame=src,input=src,form=fakeentry -; Enable upload procgress tracking in $_SESSION +; Enable upload progress tracking in $_SESSION ; Default Value: On ; Development Value: On ; Production Value: On Modified: php/php-src/branches/PHP_5_4/php.ini-production === --- php/php-src/branches/PHP_5_4/php.ini-production 2011-10-03 08:40:26 UTC (rev 317640) +++ php/php-src/branches/PHP_5_4/php.ini-production 2011-10-03 08:45:06 UTC (rev 317641) @@ -1561,7 +1561,7 @@ ; http://php.net/url-rewriter.tags url_rewriter.tags = a=href,area=href,frame=src,input=src,form=fakeentry -; Enable upload procgress tracking in $_SESSION +; Enable upload progress tracking in $_SESSION ; Default Value: On ; Development Value: On ; Production Value: On Modified: php/php-src/trunk/php.ini-development === --- php/php-src/trunk/php.ini-development 2011-10-03 08:40:26 UTC (rev 317640) +++ php/php-src/trunk/php.ini-development 2011-10-03 08:45:06 UTC (rev 317641) @@ -1561,7 +1561,7 @@ ; http://php.net/url-rewriter.tags url_rewriter.tags = a=href,area=href,frame=src,input=src,form=fakeentry -; Enable upload procgress tracking in $_SESSION +; Enable upload progress tracking in $_SESSION ; Default Value: On ; Development Value: On ; Production Value: On Modified: php/php-src/trunk/php.ini-production === --- php/php-src/trunk/php.ini-production2011-10-03 08:40:26 UTC (rev 317640) +++ php/php-src/trunk/php.ini-production2011-10-03 08:45:06 UTC (rev 317641) @@ -1561,7 +1561,7 @@ ; http://php.net/url-rewriter.tags url_rewriter.tags = a=href,area=href,frame=src,input=src,form=fakeentry -; Enable upload procgress tracking in $_SESSION +; Enable upload progress tracking in $_SESSION ; Default Value: On ; Development Value: On ; Production Value: On -- 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/NEWS branches/PHP_5_4/Zend/tests/bug55825.phpt branches/PHP_5_4/Zend/zend_compile.c trunk/Zend/tests/bug55825.phpt trunk/Zend/zend_compile.c
laruence Mon, 03 Oct 2011 17:01:17 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=317672
Log:
Fixed bug #55825, and add test script
Bug: https://bugs.php.net/55825 (Assigned) Missing initial value of static
locals in trait methods
Changed paths:
U php/php-src/branches/PHP_5_4/NEWS
A php/php-src/branches/PHP_5_4/Zend/tests/bug55825.phpt
U php/php-src/branches/PHP_5_4/Zend/zend_compile.c
A php/php-src/trunk/Zend/tests/bug55825.phpt
U php/php-src/trunk/Zend/zend_compile.c
Modified: php/php-src/branches/PHP_5_4/NEWS
===
--- php/php-src/branches/PHP_5_4/NEWS 2011-10-03 16:59:17 UTC (rev 317671)
+++ php/php-src/branches/PHP_5_4/NEWS 2011-10-03 17:01:17 UTC (rev 317672)
@@ -12,6 +12,8 @@
(Felipe, Laruence)
. Fixed bug #55758 (Digest Authenticate missed in 5.4) . (Laruence)
. Fixed bug #55622 (memory corruption in parse_ini_string). (Pierre)
+ . Fixed bug #55825 (Missing initial value of static locals in trait methods).
+(Laruence)
- Zlib:
. Fixed bug #55544 (ob_gzhandler always conflicts with
Added: php/php-src/branches/PHP_5_4/Zend/tests/bug55825.phpt
===
--- php/php-src/branches/PHP_5_4/Zend/tests/bug55825.phpt
(rev 0)
+++ php/php-src/branches/PHP_5_4/Zend/tests/bug55825.phpt 2011-10-03
17:01:17 UTC (rev 317672)
@@ -0,0 +1,17 @@
+--TEST--
+Bug #55825 (Missing initial value of static locals in trait methods)
+--FILE--
+?php
+trait T1 {
+ public function inc() {
+ static $x=1;
+ echo $x++ . \n;
+ }
+}
+class C { use T1; }
+$c1 = new C;
+$c1-inc();
+$c1-inc();
+--EXPECT--
+1
+2
Modified: php/php-src/branches/PHP_5_4/Zend/zend_compile.c
===
--- php/php-src/branches/PHP_5_4/Zend/zend_compile.c2011-10-03 16:59:17 UTC
(rev 317671)
+++ php/php-src/branches/PHP_5_4/Zend/zend_compile.c2011-10-03 17:01:17 UTC
(rev 317672)
@@ -3695,7 +3695,7 @@
ALLOC_HASHTABLE(tmpHash);
zend_hash_init(tmpHash,
zend_hash_num_elements(fe-op_array.static_variables), NULL, ZVAL_PTR_DTOR, 0);
- zend_hash_apply_with_arguments(tmpHash TSRMLS_CC,
(apply_func_args_t)zval_copy_static_var, 1, fe-op_array.static_variables);
+ zend_hash_apply_with_arguments(fe-op_array.static_variables
TSRMLS_CC, (apply_func_args_t)zval_copy_static_var, 1, tmpHash);
fe-op_array.static_variables = tmpHash;
}
@@ -4101,6 +4101,7 @@
zend_hash_graceful_destroy(resulting_table);
free(resulting_table);
}
+/* }}} */
static zend_class_entry* find_first_definition(zend_class_entry *ce, size_t
current_trait, const char* prop_name, int prop_name_length, ulong prop_hash,
zend_class_entry *coliding_ce) /* {{{ */
{
Added: php/php-src/trunk/Zend/tests/bug55825.phpt
===
--- php/php-src/trunk/Zend/tests/bug55825.phpt (rev 0)
+++ php/php-src/trunk/Zend/tests/bug55825.phpt 2011-10-03 17:01:17 UTC (rev
317672)
@@ -0,0 +1,17 @@
+--TEST--
+Bug #55825 (Missing initial value of static locals in trait methods)
+--FILE--
+?php
+trait T1 {
+ public function inc() {
+ static $x=1;
+ echo $x++ . \n;
+ }
+}
+class C { use T1; }
+$c1 = new C;
+$c1-inc();
+$c1-inc();
+--EXPECT--
+1
+2
Modified: php/php-src/trunk/Zend/zend_compile.c
===
--- php/php-src/trunk/Zend/zend_compile.c 2011-10-03 16:59:17 UTC (rev
317671)
+++ php/php-src/trunk/Zend/zend_compile.c 2011-10-03 17:01:17 UTC (rev
317672)
@@ -3695,7 +3695,7 @@
ALLOC_HASHTABLE(tmpHash);
zend_hash_init(tmpHash,
zend_hash_num_elements(fe-op_array.static_variables), NULL, ZVAL_PTR_DTOR, 0);
- zend_hash_apply_with_arguments(tmpHash TSRMLS_CC,
(apply_func_args_t)zval_copy_static_var, 1, fe-op_array.static_variables);
+ zend_hash_apply_with_arguments(fe-op_array.static_variables
TSRMLS_CC, (apply_func_args_t)zval_copy_static_var, 1, tmpHash);
fe-op_array.static_variables = tmpHash;
}
@@ -4101,6 +4101,7 @@
zend_hash_graceful_destroy(resulting_table);
free(resulting_table);
}
+/* }}} */
static zend_class_entry* find_first_definition(zend_class_entry *ce, size_t
current_trait, const char* prop_name, int prop_name_length, ulong prop_hash,
zend_class_entry *coliding_ce) /* {{{ */
{
--
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/sysvshm/sysvshm.c branches/PHP_5_4/NEWS branches/PHP_5_4/ext/sysvshm/sysvshm.c trunk/ext/sysvshm/sysvshm.c
iliaaMon, 03 Oct 2011 18:17:12 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=317673
Log:
Fixed bug #55750 (memory copy issue in sysvshm extension).
Bug: https://bugs.php.net/55750 (Open) memory copy issue in sysvshm extension
Changed paths:
U php/php-src/branches/PHP_5_3/ext/sysvshm/sysvshm.c
U php/php-src/branches/PHP_5_4/NEWS
U php/php-src/branches/PHP_5_4/ext/sysvshm/sysvshm.c
U php/php-src/trunk/ext/sysvshm/sysvshm.c
Modified: php/php-src/branches/PHP_5_3/ext/sysvshm/sysvshm.c
===
--- php/php-src/branches/PHP_5_3/ext/sysvshm/sysvshm.c 2011-10-03 17:01:17 UTC
(rev 317672)
+++ php/php-src/branches/PHP_5_3/ext/sysvshm/sysvshm.c 2011-10-03 18:17:12 UTC
(rev 317673)
@@ -424,7 +424,7 @@
ptr-free += chunk_ptr-next;
ptr-end -= chunk_ptr-next;
if (memcpy_len 0) {
- memcpy(chunk_ptr, next_chunk_ptr, memcpy_len);
+ memmove(chunk_ptr, next_chunk_ptr, memcpy_len);
}
return 0;
}
Modified: php/php-src/branches/PHP_5_4/NEWS
===
--- php/php-src/branches/PHP_5_4/NEWS 2011-10-03 17:01:17 UTC (rev 317672)
+++ php/php-src/branches/PHP_5_4/NEWS 2011-10-03 18:17:12 UTC (rev 317673)
@@ -15,6 +15,10 @@
. Fixed bug #55825 (Missing initial value of static locals in trait methods).
(Laruence)
+- Sysvshm
+ . Fixed bug #55750 (memory copy issue in sysvshm extension).
+(Ilia, jeffhuang at gmail dot com)
+
- Zlib:
. Fixed bug #55544 (ob_gzhandler always conflicts with
zlib.output_compression). (Mike)
Modified: php/php-src/branches/PHP_5_4/ext/sysvshm/sysvshm.c
===
--- php/php-src/branches/PHP_5_4/ext/sysvshm/sysvshm.c 2011-10-03 17:01:17 UTC
(rev 317672)
+++ php/php-src/branches/PHP_5_4/ext/sysvshm/sysvshm.c 2011-10-03 18:17:12 UTC
(rev 317673)
@@ -424,7 +424,7 @@
ptr-free += chunk_ptr-next;
ptr-end -= chunk_ptr-next;
if (memcpy_len 0) {
- memcpy(chunk_ptr, next_chunk_ptr, memcpy_len);
+ memmove(chunk_ptr, next_chunk_ptr, memcpy_len);
}
return 0;
}
Modified: php/php-src/trunk/ext/sysvshm/sysvshm.c
===
--- php/php-src/trunk/ext/sysvshm/sysvshm.c 2011-10-03 17:01:17 UTC (rev
317672)
+++ php/php-src/trunk/ext/sysvshm/sysvshm.c 2011-10-03 18:17:12 UTC (rev
317673)
@@ -424,7 +424,7 @@
ptr-free += chunk_ptr-next;
ptr-end -= chunk_ptr-next;
if (memcpy_len 0) {
- memcpy(chunk_ptr, next_chunk_ptr, memcpy_len);
+ memmove(chunk_ptr, next_chunk_ptr, memcpy_len);
}
return 0;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/win-installer/trunk/ ExtensionsFeatures54.wxs ExtensionsFeatures60.wxs ExtensionsFragment54.wxs ExtensionsFragment60.wxs PHPInstallerBase54.wxs PHPInstallerBase54NTS.wxs PHPInstall
jmertic Mon, 03 Oct 2011 19:16:26 + Revision: http://svn.php.net/viewvc?view=revisionrevision=317677 Log: Renamed 60 installer components to 54 Changed paths: A php/win-installer/trunk/ExtensionsFeatures54.wxs D php/win-installer/trunk/ExtensionsFeatures60.wxs A php/win-installer/trunk/ExtensionsFragment54.wxs D php/win-installer/trunk/ExtensionsFragment60.wxs A php/win-installer/trunk/PHPInstallerBase54.wxs A php/win-installer/trunk/PHPInstallerBase54NTS.wxs D php/win-installer/trunk/PHPInstallerBase60.wxs D php/win-installer/trunk/PHPInstallerBase60NTS.wxs A php/win-installer/trunk/PHPInstallerCommon54.wxs A php/win-installer/trunk/PHPInstallerCommon54NTS.wxs D php/win-installer/trunk/PHPInstallerCommon60.wxs D php/win-installer/trunk/PHPInstallerCommon60NTS.wxs A php/win-installer/trunk/PHPInstallerScripts54.vbs D php/win-installer/trunk/PHPInstallerScripts60.vbs A php/win-installer/trunk/WebServerConfig54.wxs A php/win-installer/trunk/WebServerConfig54NTS.wxs D php/win-installer/trunk/WebServerConfig60.wxs D php/win-installer/trunk/WebServerConfig60NTS.wxs 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/win-installer/trunk/ PHPInstallerScripts52.vbs PHPInstallerScripts53.vbs PHPInstallerScripts54.vbs
jmertic Mon, 03 Oct 2011 19:24:19 + Revision: http://svn.php.net/viewvc?view=revisionrevision=317678 Log: Bug 55778 - Write out httpd.conf with forward slashes on Windows 7. Bug: https://bugs.php.net/55778 (Assigned) PHPIniDir only works correctly for forward slashes, not backward slashes Changed paths: U php/win-installer/trunk/PHPInstallerScripts52.vbs U php/win-installer/trunk/PHPInstallerScripts53.vbs U php/win-installer/trunk/PHPInstallerScripts54.vbs Modified: php/win-installer/trunk/PHPInstallerScripts52.vbs === --- php/win-installer/trunk/PHPInstallerScripts52.vbs 2011-10-03 19:16:26 UTC (rev 317677) +++ php/win-installer/trunk/PHPInstallerScripts52.vbs 2011-10-03 19:24:19 UTC (rev 317678) @@ -14,8 +14,14 @@ If ( right(strApacheDir,1) \ ) then strApacheDir = strApacheDir \ End If -strPHPPath = strInstallDir +' Bug 55778 - Use forward slashes in Windows 7 +If ( FormatNumber(GetWindowsVersion) = FormatNumber(7.0) ) Then +strPHPPath = Replace(strInstallDir,\,/) +Else +strPHPPath = strInstallDir +End If + strDirective = vbCrLf vbCrLf #BEGIN PHP INSTALLER EDITS - REMOVE ONLY ON UNINSTALL vbCrLf If ( strWebServerType = apacheCGI ) Then strDirective = strDirective ScriptAlias /php/ strPHPPath vbCrLf Modified: php/win-installer/trunk/PHPInstallerScripts53.vbs === --- php/win-installer/trunk/PHPInstallerScripts53.vbs 2011-10-03 19:16:26 UTC (rev 317677) +++ php/win-installer/trunk/PHPInstallerScripts53.vbs 2011-10-03 19:24:19 UTC (rev 317678) @@ -14,8 +14,14 @@ If ( right(strApacheDir,1) \ ) then strApacheDir = strApacheDir \ End If -strPHPPath = strInstallDir +' Bug 55778 - Use forward slashes in Windows 7 +If ( FormatNumber(GetWindowsVersion) = FormatNumber(7.0) ) Then +strPHPPath = Replace(strInstallDir,\,/) +Else +strPHPPath = strInstallDir +End If + strDirective = vbCrLf vbCrLf #BEGIN PHP INSTALLER EDITS - REMOVE ONLY ON UNINSTALL vbCrLf If ( strWebServerType = apacheCGI ) Then strDirective = strDirective ScriptAlias /php/ strPHPPath vbCrLf Modified: php/win-installer/trunk/PHPInstallerScripts54.vbs === --- php/win-installer/trunk/PHPInstallerScripts54.vbs 2011-10-03 19:16:26 UTC (rev 317677) +++ php/win-installer/trunk/PHPInstallerScripts54.vbs 2011-10-03 19:24:19 UTC (rev 317678) @@ -14,8 +14,14 @@ If ( right(strApacheDir,1) \ ) then strApacheDir = strApacheDir \ End If -strPHPPath = strInstallDir +' Bug 55778 - Use forward slashes in Windows 7 +If ( FormatNumber(GetWindowsVersion) = FormatNumber(7.0) ) Then +strPHPPath = Replace(strInstallDir,\,/) +Else +strPHPPath = strInstallDir +End If + strDirective = vbCrLf vbCrLf #BEGIN PHP INSTALLER EDITS - REMOVE ONLY ON UNINSTALL vbCrLf If ( strWebServerType = apacheCGI ) Then strDirective = strDirective ScriptAlias /php/ strPHPPath vbCrLf -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
