[PHP-CVS] com php-src: Tweaks an add OPcache info to UPGRADING: UPGRADING
Commit:fd2b8df26562331fe1eccdc10efb3d8f98379a68 Author:Rasmus Lerdorf ras...@php.net Thu, 21 Mar 2013 23:14:16 -0700 Parents: 293d5defb4eb3962ac6b1ed6620ebc38836e5581 Branches: PHP-5.5 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=fd2b8df26562331fe1eccdc10efb3d8f98379a68 Log: Tweaks an add OPcache info to UPGRADING Changed paths: M UPGRADING Diff: diff --git a/UPGRADING b/UPGRADING index 126bc26..cc3aebb 100755 --- a/UPGRADING +++ b/UPGRADING @@ -29,7 +29,6 @@ PHP 5.5 UPGRADE NOTES - php_logo_guid(), php_egg_logo_guid(), php_real_logo_guid() and zend_logo_guid() have been removed - Removal of Logo GUIDs - - extensions can't override zend_execute() any more, they should override zend_execute_ex() instead. The EG(current_execute_data) is already initialized in zend_execute_ex(), so for compatibility extensions @@ -79,15 +78,17 @@ PHP 5.5 UPGRADE NOTES (https://wiki.php.net/rfc/generators) - ClassName::class syntax returning full class name for a class as a string constant. (https://wiki.php.net/rfc/class_name_scalars) -- Support for changing the process's title in CLI/CLI-Server SAPIs. (Keyur) - (https://wiki.php.net/rfc/cli_process_title) - Added support for non-scalar Iterator keys in foreach. (https://wiki.php.net/rfc/foreach-non-scalar-keys). +- Bundled Zend OPcache extension + (https://wiki.php.net/rfc/optimizerplus) 2. Changes in SAPI modules +- Support for changing the process's title in CLI/CLI-Server SAPIs. (Keyur) + (https://wiki.php.net/rfc/cli_process_title) 3. Deprecated Functionality @@ -277,6 +278,11 @@ PHP 5.5 UPGRADE NOTES - SPL: - SplFixedArray::__wakeup() +- Zend OPcache + - opcache_get_configuration() + - opcache_get_status() + - opcache_reset() + 6. New Classes and Interfaces @@ -333,7 +339,7 @@ PHP 5.5 UPGRADE NOTES - Core: - - Added sys_temp_dir INI directive, for specifying temp firectory. + - Added sys_temp_dir INI directive, for specifying temp directory. - Intl: - Added intl.use_exceptions INI directive, which controls what happens when @@ -344,6 +350,33 @@ PHP 5.5 UPGRADE NOTES APIs which use(are built) for mysqlnd. This allows ext/mysqli to be used with the new auth protocol, although at coarser level. +- Zend OPcache (See ext/opcache/README for more details) + - Added the following directives: +- opcache.enable (default 1) +- opcache.memory_consumption (default 64) +- opcache.interned_strings_buffer (default 4) +- opcache.max_accelerated_files (default 2000) +- opcache.max_wasted_percentage (default 5) +- opcache.use_cwd (default 1) +- opcache.validate_timestamps (default 1) +- opcache.revalidate_freq (default 2) +- opcache.revalidate_path (default 0) +- opcache.save_comments (default 1) +- opcache.load_comments (default 1) +- opcache.fast_shutdown (default 0) +- opcache.enable_file_override (default 0) +- opcache.optimization_level (default 0x) +- opcache.inherited_hack (default 1) +- opcache.blacklist_filename (default ) +- opcache.max_file_size (default 0) +- opcache.consistency_checks (default 0) +- opcache.force_restart_timeout (default 180) +- opcache.error_log (default which means stderr) +- opcache.log_verbosity_level (default 1) +- opcache.preferred_memory_model (default ) +- opcache.protect_memory (default 0) +- opcache.mmap_base (Windows-only) + 11. Windows Support -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: - fix regression (imagerotate_overflow.phpt): ext/gd/gd.c ext/gd/libgd/gd_interpolation.c
Commit:4e6d54f5a7003b73f12d86d7f5cba0a37ce40930
Author:Pierre Joye pierre@gmail.com Fri, 22 Mar 2013 08:28:11
+0100
Parents: 15ecea760284008ec755ab467f97d3987cca80fb
Branches: master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=4e6d54f5a7003b73f12d86d7f5cba0a37ce40930
Log:
- fix regression (imagerotate_overflow.phpt)
Changed paths:
M ext/gd/gd.c
M ext/gd/libgd/gd_interpolation.c
Diff:
diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index caf84e3..e291793 100644
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@ -83,6 +83,10 @@ static void php_free_ps_enc(zend_rsrc_list_entry *rsrc
TSRMLS_DC);
# endif
#endif
+#if defined(HAVE_GD_XPM) defined(HAVE_GD_BUNDLED)
+# include X11/xpm.h
+#endif
+
#ifndef M_PI
#define M_PI 3.14159265358979323846
#endif
@@ -124,6 +128,10 @@ int gdImageColorClosestHWB(gdImagePtr im, int r, int g,
int b);
#define gdNewDynamicCtxEx(len, data, val) gdNewDynamicCtx(len, data)
#endif
+/* as it is not really public, duplicate declaration here to avoid
+ pointless warnings */
+int overflow2(int a, int b);
+
/* Section Filters Declarations */
/* IMPORTANT NOTE FOR NEW FILTER
* Do not forget to update:
diff --git a/ext/gd/libgd/gd_interpolation.c b/ext/gd/libgd/gd_interpolation.c
index 5ad5de6..c44f504 100644
--- a/ext/gd/libgd/gd_interpolation.c
+++ b/ext/gd/libgd/gd_interpolation.c
@@ -1750,6 +1750,10 @@ gdImagePtr gdImageRotateGeneric(gdImagePtr src, const
float degrees, const int b
f_slop_x f_slop_y ?
gd_divfx(f_slop_y, f_slop_x) : gd_divfx(f_slop_x, f_slop_y)
: 0;
+ if (bgColor 0) {
+ return NULL;
+ }
+
/* impact perf a bit, but not that much. Implementation for palette
images can be done at a later point.
*/
--
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.5': ext/gd/gd.c
Commit:2a8a9c0007f4025d33693ec45a106adb81fc1376 Author:Pierre Joye pierre@gmail.com Fri, 22 Mar 2013 08:28:25 +0100 Parents: fa161e9a67b58a3a2f4dbebedce21c923ab80af1 4e6d54f5a7003b73f12d86d7f5cba0a37ce40930 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2a8a9c0007f4025d33693ec45a106adb81fc1376 Log: Merge branch 'PHP-5.5' * PHP-5.5: - fix regression (imagerotate_overflow.phpt) Changed paths: MM ext/gd/gd.c 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.5': ext/gd/gd.c
Commit:672f8525fbabf971afeebeed0c9d97aa760724c7 Author:Pierre Joye pierre@gmail.com Fri, 22 Mar 2013 09:21:23 +0100 Parents: 6512c44d8e645a8969b4c7cac55ca768b50cc5f6 f05972ddbf703da35ae9bde5c89d6f55f178b939 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=672f8525fbabf971afeebeed0c9d97aa760724c7 Log: Merge branch 'PHP-5.5' * PHP-5.5: - fix regression bug24155.phpt and bug39366.phpt Bugs: https://bugs.php.net/24155 https://bugs.php.net/39366 Changed paths: MM ext/gd/gd.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: - fix regression bug24155.phpt and bug39366.phpt: ext/gd/gd.c ext/gd/libgd/gd.h ext/gd/libgd/gd_interpolation.c
Commit:f05972ddbf703da35ae9bde5c89d6f55f178b939
Author:Pierre Joye pierre@gmail.com Fri, 22 Mar 2013 09:21:11
+0100
Parents: 4e6d54f5a7003b73f12d86d7f5cba0a37ce40930
Branches: master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=f05972ddbf703da35ae9bde5c89d6f55f178b939
Log:
- fix regression bug24155.phpt and bug39366.phpt
Bugs:
https://bugs.php.net/24155
https://bugs.php.net/39366
Changed paths:
M ext/gd/gd.c
M ext/gd/libgd/gd.h
M ext/gd/libgd/gd_interpolation.c
Diff:
diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index e291793..58027d7 100644
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@ -2271,7 +2271,7 @@ PHP_FUNCTION(imagerotate)
ZEND_FETCH_RESOURCE(im_src, gdImagePtr, SIM, -1, Image, le_gd);
- im_dst = gdImageRotateGeneric(im_src, (float)degrees, color);
+ im_dst = gdImageRotateInterpolated(im_src, (const float)degrees, color);
if (im_dst != NULL) {
ZEND_REGISTER_RESOURCE(return_value, im_dst, le_gd);
diff --git a/ext/gd/libgd/gd.h b/ext/gd/libgd/gd.h
index 28c8562..44c7c8a 100644
--- a/ext/gd/libgd/gd.h
+++ b/ext/gd/libgd/gd.h
@@ -844,8 +844,7 @@ gdImagePtr gdImageRotateNearestNeighbour(gdImagePtr src,
const float degrees, co
gdImagePtr gdImageRotateBilinear(gdImagePtr src, const float degrees, const
int bgColor);
gdImagePtr gdImageRotateBicubicFixed(gdImagePtr src, const float degrees,
const int bgColor);
gdImagePtr gdImageRotateGeneric(gdImagePtr src, const float degrees, const int
bgColor);
-
-
+gdImagePtr gdImageRotateInterpolated(const gdImagePtr src, const float angle,
int bgcolor);
typedef enum {
GD_AFFINE_TRANSLATE = 0,
diff --git a/ext/gd/libgd/gd_interpolation.c b/ext/gd/libgd/gd_interpolation.c
index c44f504..0215c23 100644
--- a/ext/gd/libgd/gd_interpolation.c
+++ b/ext/gd/libgd/gd_interpolation.c
@@ -1729,6 +1729,7 @@ gdImagePtr gdImageRotateNearestNeighbour(gdImagePtr src,
const float degrees, co
gdImagePtr gdImageRotateGeneric(gdImagePtr src, const float degrees, const int
bgColor)
{
float _angle = ((float) (-degrees / 180.0f) * (float)M_PI);
+ const int angle_rounded = (int)floor(degrees * 100);
const int src_w = gdImageSX(src);
const int src_h = gdImageSY(src);
const unsigned int new_width = (unsigned int)(abs((int)(src_w *
cos(_angle))) + abs((int)(src_h * sin(_angle))) + 0.5f);
@@ -2194,6 +2195,16 @@ gdImagePtr gdImageRotateBicubicFixed(gdImagePtr src,
const float degrees, const
gdImagePtr gdImageRotateInterpolated(const gdImagePtr src, const float angle,
int bgcolor)
{
+ const int angle_rounded = (int)floor(angle * 100);
+
+ switch (angle_rounded) {
+ case 9000:
+ return gdImageRotate90(src, 0);
+ case 18000:
+ return gdImageRotate180(src, 0);
+ case 27000:
+ return gdImageRotate270(src, 0);
+ }
if (src == NULL || src-interpolation_id 1 || src-interpolation_id
GD_METHOD_COUNT) {
return NULL;
@@ -2208,47 +2219,12 @@ gdImagePtr gdImageRotateInterpolated(const gdImagePtr
src, const float angle, in
return gdImageRotateBilinear(src, angle, bgcolor);
break;
- case GD_BICUBIC:
- return gdImageRotateBicubicFixed(src, angle, bgcolor);
- break;
-
case GD_BICUBIC_FIXED:
- return gdImageRotateNearestNeighbour(src, angle,
bgcolor);
- break;
-
- case GD_WEIGHTED4:
- return gdImageRotateNearestNeighbour(src, angle,
bgcolor);
- break;
-
- case GD_BSPLINE:
- return gdImageRotateNearestNeighbour(src, angle,
bgcolor);
- break;
-
- case GD_BOX:
- return gdImageRotateNearestNeighbour(src, angle,
bgcolor);
- break;
-
- case GD_HERMITE:
- return gdImageRotateNearestNeighbour(src, angle,
bgcolor);
+ return gdImageRotateBicubicFixed(src, angle, bgcolor);
break;
- case GD_HAMMING:
- break;
- case GD_SINC:
- break;
- case GD_BLACKMAN:
- break;
-
- case GD_GAUSSIAN:
- break;
- case GD_QUADRATIC:
- break;
- case GD_MITCHELL:
- break;
- case GD_CATMULLROM:
- break;
- case GD_POWER:
- break;
+ default:
+ gdImageRotateGeneric(src, angle, bgcolor);
}
return NULL;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: - fix regression (imagerotate_overflow.phpt), fix for all cases: ext/gd/gd.c ext/gd/libgd/gd_interpolation.c
Commit:f39a23696ba89d0dc77f7715f04ca7d1aa5b696e
Author:Pierre Joye pierre@gmail.com Fri, 22 Mar 2013 09:30:23
+0100
Parents: f05972ddbf703da35ae9bde5c89d6f55f178b939
Branches: master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=f39a23696ba89d0dc77f7715f04ca7d1aa5b696e
Log:
- fix regression (imagerotate_overflow.phpt), fix for all cases
Changed paths:
M ext/gd/gd.c
M ext/gd/libgd/gd_interpolation.c
Diff:
diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index 58027d7..74ce32c 100644
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@ -2271,6 +2271,10 @@ PHP_FUNCTION(imagerotate)
ZEND_FETCH_RESOURCE(im_src, gdImagePtr, SIM, -1, Image, le_gd);
+ if (color 0) {
+ RETURN_FALSE;
+ }
+
im_dst = gdImageRotateInterpolated(im_src, (const float)degrees, color);
if (im_dst != NULL) {
diff --git a/ext/gd/libgd/gd_interpolation.c b/ext/gd/libgd/gd_interpolation.c
index 0215c23..e1c8728 100644
--- a/ext/gd/libgd/gd_interpolation.c
+++ b/ext/gd/libgd/gd_interpolation.c
@@ -825,10 +825,6 @@ int getPixelInterpolated(gdImagePtr im, const double x,
const double y, const in
return -1;
}
- /* Default to full alpha */
- if (bgColor == -1) {
- }
-
if (im-interpolation_id == GD_WEIGHTED4) {
return getPixelInterpolateWeight(im, x, y, bgColor);
}
--
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.5': ext/gd/gd.c
Commit:dd9e4b34d67eccc66eca17ef4c9e12d6b410303d Author:Pierre Joye pierre@gmail.com Fri, 22 Mar 2013 09:30:32 +0100 Parents: 672f8525fbabf971afeebeed0c9d97aa760724c7 f39a23696ba89d0dc77f7715f04ca7d1aa5b696e Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=dd9e4b34d67eccc66eca17ef4c9e12d6b410303d Log: Merge branch 'PHP-5.5' * PHP-5.5: - fix regression (imagerotate_overflow.phpt), fix for all cases Changed paths: MM ext/gd/gd.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Add SplDoublyLinkedList::add to UPGRADING: UPGRADING
Commit:6af1b08482f2b3a3fdb58693d37e1ed51007b83c Author:Etienne Kneuss col...@php.net Fri, 22 Mar 2013 11:35:45 +0100 Parents: fd2b8df26562331fe1eccdc10efb3d8f98379a68 Branches: PHP-5.5 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6af1b08482f2b3a3fdb58693d37e1ed51007b83c Log: Add SplDoublyLinkedList::add to UPGRADING Changed paths: M UPGRADING Diff: diff --git a/UPGRADING b/UPGRADING index cc3aebb..19a08e4 100755 --- a/UPGRADING +++ b/UPGRADING @@ -277,6 +277,7 @@ PHP 5.5 UPGRADE NOTES - SPL: - SplFixedArray::__wakeup() + - SplDoublyLinkedList::add() - Zend OPcache - opcache_get_configuration() -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Note about bison version: README.RELEASE_PROCESS
Commit:defb08c705ac40ed9c77a57c98ebe2d856a45e07 Author:David Soria Parra d...@php.net Fri, 22 Mar 2013 17:44:32 +0100 Parents: 6af1b08482f2b3a3fdb58693d37e1ed51007b83c Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=defb08c705ac40ed9c77a57c98ebe2d856a45e07 Log: Note about bison version Changed paths: M README.RELEASE_PROCESS Diff: diff --git a/README.RELEASE_PROCESS b/README.RELEASE_PROCESS index c8eeb4e..58d3cd4 100644 --- a/README.RELEASE_PROCESS +++ b/README.RELEASE_PROCESS @@ -64,7 +64,8 @@ Do not use abbreviations for alpha and beta. ``git push --tags origin HEAD`` 8. run: ``./makedist 5.4.2RC2``, this will export the tree, create configure -and build three tarballs (gz,bz2 and xz). +and build three tarballs (gz,bz2 and xz). Make sure you use the same GNU Bison +version as snaps. Recent bison version are known to break ZTS. 9. Copy those three tarballs to www.php.net, in your homedir there should be a directory downloads/. Copy them into there, so that the system can generate -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] tag php-src: create tag php-5.3.21
Tag php-5.3.21 in php-src.git was created Tag: 92cdc2983fbad89703d336b3509a42e94d34a9d0 Tagger: Johannes Schlüterjohan...@php.net Wed Jan 16 17:35:13 2013 +0100 Log: PHP 5.3.21 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.17 (SunOS) iQEcBAABAgAGBQJQ9tbNAAoJEH3sTmn8nIPXrsUH/3hvbf4jTkvJX8TnPnBIscbe 4wZxMLUjsIk4IPVQ2rn0iL7RODU0ray0I7dn8Lu80BG0J5j1qjJZTo79UE2JuqfG emTIode3co7vKM76Lpa25D48N/QHALP3W/qhErefrQdMuzFbPU12wXS+9PXUPlae fFn+rF50VXdgO5VDhVESr97EAcJZRuT7VIM6/0ZsXQAQWOmArjGr5Yu6jpHBsC64 /3X1yfMSSx95lpdvZlmTW225eYF0qealE36V022loVr0I1YTIq233GxMBd/toHAI L/X3q8Q/IIi9/ClxyaeeRrI59/8Nyw/TY6ueKaS5VLzJPdcYAELcYyVEWmenIjg= =wDIu -END PGP SIGNATURE- Link: http://git.php.net/?p=php-src.git;a=tag;h=92cdc2983fbad89703d336b3509a42e94d34a9d0 Target: 854ababcc906677d4379fccab79adc783cd1f3a1 Author: Johannes Schlüter johan...@php.net Wed, 16 Jan 2013 17:34:41 +0100 Parents: ec04de6368427909491866cf658e6060f79429ea Target link: http://git.php.net/?p=php-src.git;a=commitdiff;h=854ababcc906677d4379fccab79adc783cd1f3a1 Target log: PHP 5.3.21 Changed paths: M NEWS M configure.in M main/php_version.h -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
