Resin Change Log

3.2.1

• web-app: add expand-fileset-cleanup to <web-app (#3001, rep by Bill Au)
• jni: openssl not timing out properly (#2988, rep by Tom Hintz)
• mod_caucho: use time(0) instead of request->time (#2974, rep by ahoogerhuis)
• mod_caucho: use ssl_var_lookup for SSL variables (#2871, rep by Michael Schiemer)
• jms: ejb-message-listener needs to use createXASession() call for XA sessions (#2937, rep by Reggie Vito)
• jni: jni_vfs.c missing #include <limits.h> (#2992, rep by thintz)
• config: include files for ${__DIR__} with spaces not properly handled (#2891, rep by cperz)
• quercus: dependency checking needs to use timeout (#2981, rep by Steven Grimm)
• quercus: compilation thread was blocking the execution thread (#2991, rep by Scott Landshof)
• (2008-10-08) error-page: xss issue with utf-7 encoding (#2965, rep by Moshe Ben-Abu)
• filter: added HeaderFilter for standard headers like P3P, and like the Apache "Header" command (#2953, rep by Sean Moore)
• comet: client disconnect needs to set isClosed flag (#2924, #2961, rep by Martin Thompson)
• jstl: Added org.xml.sax.XMLReader support for x:parse doc attribute
• quercus: Array expression fails to compile (#2986, rep by koreth)
• quercus: Call-time pass by reference returns screwy results from substr() (#2973, rep by koreth)
• quercus: printf() decimal format specifier doesn't work (#2972, rep by koreth)
• quercus: DOMImplementation creates XML parsers instead of HTML (#2975, rep by bago)
• quercus: moodle support (#2929, rep by D. Savill)
• quercus: Can't mix key/value and nonkeyed array autoinitialization (#2948, rep by koreth)
• quercus: iconv() doesn't support target encoding modifier (#2255, rep by koreth)
• quercus: Static class method can't access private instance fields (#2933, rep by koreth)
• quercus: array_fill_keys() needs to copy, not reference, values (#2930, rep by koreth)
• quercus: mb_detect_encoding not implemented in Quercus (#2868, rep by iRideSnow )
• mod_caucho: potential DOS issue with mod_caucho and virtual hosts (#2950, rep by Pieter Schoenmakers)
• file: remove cache timeout in FileServlet for coherency, since the performance is handled by the proxy cache (rep by Vinod Mehra)
• host: modified default virtual host handling to use "default" as the host name instead of "" (#2917, rep by Brad Bourne)
• build: add manifest version automatically as part of build (#2952, rep by stbu)
• database: increased default database connection-max dramatically and add threadDump if it's exceeded (#2897, rep by Dennis Devota)
• jsp: jsp:param for include needs to use form-url-encoding (#2838, rep by bearbibeault)
• boot: resin.jar "status" returns the PID of the started server (#2855, rep by Jens Christensen)
• server: scheduled-task needs to use Alarm.getExactTime to avoid extra calls (#2894, rep by Riccardo Cohen)
• server: http proxy handle multiple response headers (#2900, rep by ksullivan)
• jsp: tag fragment with tag variable compilation failure (#2904, rep by Herve Prisciandaro)
• jsp: taglib prefix was stored across jsp/tag files (#2936, rep by jlawrie)
• log: access logging adds '%v' for virtual hosts (#2949, rep by Alex Sharaz)
• quercus: type hinting checks for null (#2886, rep by PeterJanRoes)
• quercus: stream_get_meta_data not properly recording timeouts (#2944, rep by koreth)
• jms: jdbc/transaction session not properly setting expires time (#2939, rep by Vinay Reddy)
• quercus: regression for array assignment (#2946, rep by koreth)
• quercus: regexp with empty subexpression and disjunction (#2892, #2943, rep by koreth, cperz)
• quercus: support for (?R) in regexps (#2755, rep by atijms)
• jsf: Ice Faces Sample Apps throw exception (#2908, on behalf Eric T.)
• quercus: $a[3] = 'n' was modifying constants when $a is string (#2940, rep by koreth)
• quercus: php_uname('n') needs to return host name (#2931, rep by koreth)
• quercus: back out private handling (#2933, rep by koreth)
• quercus: try-catch not analyzed properly for variables (#2934, rep by koreth)
• quercus: Java method with Value needs to be converted to avoid Var (#2935, rep by koreth)
• quercus: array to object conversion was dropping integer keys (#2932, rep by koreth)
• quercus: isModified was not properly checked for compiled pages (#2926, rep by koreth)
• quercus: dynamic method with more than five arguments causing errors (#2927, rep by koreth)
• install: ./configure --prefix; make install wasn't copying doc/admin correctly (#2898, rep by moffermann)
• hessian: proxy equals should return false if the compared object is a non-matching proxy (#2878, rep by Christian Campo)
• hessian: missing case for long[] deserialization (#2909, rep by aloksingh)
• quercus: parsing php from Java string could run into encoding issues (#2920, rep by rgnitz)
• quercus: __destructor support (#2417, rep by Carl Lobo)
• quercus: conditional function refactor (#2918, rep by koreth)
• quercus: add require-source='false' and allow php to be deleted with compilation (#2217)
• quercus: class cache issues for performance (#2915, rep by koreth)
• quercus: Regex option 'A' ignored (#2907, rep by wikipo)
• quercus: PDO::getAvailableDrivers() not implemented (#2914, rep by A. Bonat)
• quercus: Dynamic members do not work properly (#2887, rep by PeterJanRoes)
• quercus: unserialize does not work properly with lot of dereferencing (#2697, rep by perololo)
• quercus: Calling mysql_close() twice results in NPE (#2911, rep by koreth)
• quercus: unserialize error for object references (#2895, rep by koreth)
• quercus: Quercus serialize/unserialize doesn't recognize protected and private field markers (#2910, rep by koreth)
• quercus: MySQL code assumes only one database name is ever used (#2880, rep by koreth)
• quercus: Add option to disable database connection pooling (#2877, rep by koreth)
• quercus: Username and password not used when connection pooling turned off (#2905, rep by koreth)
• quercus: Can't use "continue" any more in loop statements (#2901, rep by koreth)
• quercus: Class method can't access private array field (#2882, rep by koreth)
• quercus: long2ip() not implemented (#2881, rep by koreth)
• quercus: Quercus program cache is too small for large code bases (#2884, rep by koreth)
• quercus: Bogus "break" causes compilation failure (#2879, rep by koreth)
• quercus: diskfreespace(.) always return 0 (#2861, rep by mingfai)
• quercus: $object->x->x does not trigger __get in array define (#2874, rep by nbzx)
• quercus: $this->x does not trigger __get and trigger __set twice (#2873, rep by nbzx)
• quercus: $a * 1000000 not properly convert for non-long values (#2552, rep by lee)
• quercus: pg_fetch_assoc for bit(32) field was not calling correct jdbc method (#2506, rep by damjan)
• quercus: refactor database to avoid JdbcConnection close issues (#2721, rep by paulberto)
• quercus: pg_free_result needs to return true (#2546, rep by gjvc)
• quercus: mcrypt padding issues with blowfixh (#2561, rep by gjvc)
• quercus: in_array with Java adapter wasn't implemented (#2889, rep by Heimo Laukkanen)
• quercus: tempnam wasn't removing file at end of execution (#2097, rep by A Sharaz)
• quercus: debug_backtrace line numbers in compiled mode (#2158, rep by koreth)
• quercus: debug_backtrace arguments (interpreted only) (#1154, rep by koreth)
• quercus: add public QuercusScriptEngine method to allow for security overriding (#2072)
• quercus: NPE in curl_exec (#2902)
• quercus: Exception trace was not catching top location (#1774, rep by U Wohlfeil)
• quercus: json utf-8 fixes (#2092, rep by hendler)
• quercus: add PEAR path automatically to include path (#844)
• deploy: .git repository should only be created when used (#2885, rep by iRideSnow)
• server: add server to default error page (#2903, rep by Alex Sharaz)
• comet: avoid skip() at end of request for a comet call so input can be buffered (#2870, rep by David Peterson)
• (2008-09-02) quercus: Page cache NPE (rep by Steven Grimm)
• quercus: getSpecialRef loop (rep by Paul Fisher)
• example: possible xss in example (rep by Antonio Varni)
• admin: ResinAdmin.getServer() should return null if server isn't ready (rep by Vinod Mehra)
• quercus: issues with compiled continue statement with following content (#2156, rep by koreth)
• quercus: private field checking (#585)
• ext: upgrade to javamail 1.4.1 (#2863, rep by Matt Pangaro)
• quercus: Can't compile class with magic set/get/call methods (#2857, rep by koreth)
• quercus: curl_version() not implemented (Wordpress OpenID plugin) (#2852)
• quercus: Joomla 1.5 not working (#2302, rep by rfisk)
• quercus: call_user_method_array() not implemented (Wordpress) (#2854)
• quercus: Can't compile class with abstract method (#2851, rep by koreth)
• quercus: Can't compile function that calls func_get_args() (#2850, rep by koreth)
• quercus: SugarCRM 5.0 working (#1011, rep by Vic)
• quercus: Using Quercus with symfony under Glassfish/Tomcat (#2795, rep by Timo)
• quercus: WordPress 2.0.11 and 2.5.1 installers get stuck in step 2 (#2664, rep by falko)
• quercus: argument by reference and self:: (#2837, rep by wikipo)
• quercus: ereg_replace() vertical brace bug (#2835, rep by stephaneeybert)
• quercus: DotClear 2 doesn't work (#2828, rep by ebourg)
• quercus: db operation not allowed after ResultSet closed (FormTools) (#2811, rep by B. Youngblood)
• quercus: Conditional function definition fails to compile (#2830, rep by koreth)
• isapi: chunked encoding needs to filter out content-length (#2849, rep by Trieu Truong)
• jmx: update _parent handling for environment JMX to avoid loop (#2848, rep by Rajasekar Elango)
• jms: jdbc wasn't properly setting binary length (#2856, rep by Richard Grantham)
• hessian2: ref production changed to ref ::= R <int>
• hessian2: added compact date encoding (0x65) (rep by Fredrik Olsson)
• hessian2: 'v' and 'V' changed to be fixed and variable length, w/o Hessian 1.0 compat (#2823, rep by Niclas Olofsson)
• jni: when socket read fails due to ClientDisconnect, close the socket (#2843, rep by Malte Muenke)
• mail: added password authenticator support (#2822, rep by Daniel Lopez)
• watchdog: -D as Resin argument should be passed to child (#2841, rep by Rob Lockstone)
• admin: when JMX does not contain "Tenured Gen" or "Perm Gen", issue warning and continue (#2839, rep by George Buschbeck)
• quercus: callbacks with "A::foo" were not properly interpreted (#2836, rep by wikipo)
• watchdog: watchdog start needs synchronization to handle sites with multiple servers (#2840, rep by Philippe Collard)
• mod_caucho: static file handling for ;jsessionid= and query (#2825, rep by ckiehl)
• config: allow resin:if in <server> to define <http> (#2802, rep by Dana P'Simer)
• quercus: apc_cache_info needs @Optional 'limited' param (#2833, rep by koreth)
• amber: update cache size to 32 (#2821, rep by Riccardo Cohen)
• quercus: mail with to in the extraHeaders argument (#2754, rep by atijms)
• host: regexp vs static host priority (#2813, rep by Shane Cruz)
• jsp: virtual host should not add 'name' as webbean value (#2807, rep by hpri)
• jsp: validation of tag dynamic-attributes generated improper XML (#2808, rep by hpri)
• quercus: added php.ini for session.cookie_version="0" (#2649, rep by sgraf)
• quercus: precedence for $$foo->bar() (#2812)
• install: modified conf/minimal.xml for true minimal configuration (#2630, rep by wirah)
• quercus: all errors get logged at FINE level (#2608, rep by B. Youngblood)
• server: add port-default as a configuration item (#2798, rep by Eric Masson)
• configure: make install needs to work even if the libexec fails (#2815, rep by stephaneeybert)
• quercus: intval was ignoring base param (#2817, rep by stephaneeybert)

3.2.0a

• build error missing final JNI updates

3.2.0

• resin: renamed httpd.sh and httpd.exe to resin.sh and resin.exe respectively
• quercus: fixed compact() for variables with NULL values
• quercus: add replace() to UsesSymbolTable and split the array extract
• jsse: add 'protocols' attribute (#2794, rep by Maithili Deshpande)
• server: IllegalStateException: DESTROYED in TcpConnection (#2799, rep by Steffen Busch)
• install: MacOS-X configure update for 64-bit Java (#2448, 2771 rep by mmetcalfe)
• (2008-07-24) config: jpa-persistence replaces persistence-manager to avoid confusion with persistent-store
• quercus: Pages sidebar not found in a standard Wordpress installation (#2800, rep by PeterUnold)
• quercus: class_implements() is missing (#2788, rep by drhalogen)
• quercus: setlocale not working properly (#2752, rep s. eybert)
• mail: add properties attribute as <init> synonym (rep by Daniel Lopez)
• (2008-07-20) log: added mail: as a logging handler
• messaging: added caucho.log:, caucho.jms:, caucho.mail: as bam services
• messaging: added <bam-service> as a parallel to <ejb-message-bean>
• messaging: added BamClient for local bam messages
• (2008-07-18) amber: query/cache issues around chunk-size limit (#2777, rep by Riccardo Cohen)
• config: ${getenv['foo']} now returns environment variables (#2783, rep by Robert Heerdink)
• jsf: JSF Developer Aid. Displays Component Tree with values and request info.
• remote: remote-client was storing wrong object in jndi (#2780, rep by Sashidhar Guduri)
• config: xml errors now show context (#2781)
• quercus: sprintf locale printing (#2771, rep by fredo)
• quercus: web.xml sample init-param is incorrect (#2776, rep by mingfai)
• quercus: StringModule/sha1+md5 does not support raw output (#2769, rep by fredo)
• quercus: glob() doesn't work as in mod_php (#2761, znagy_k2004)
• quercus: session_regenerate_id() auto starts session (#2758, rep by stephaneeybert)
• quercus: curl callback support (#2762)
• jpa: add persistence-unit to persistence-manager (#2775, rep by Uwe Schaefer)
• jpa: add persistence-unit-default to persistence-manager (#2775, rep by Uwe Schaefer)
• jpa: amber should not be enabled by default (#2775, rep by Uwe Schaefer)
• netbeans plugin now distributed in maven repository (#2716, rep by N. Phadte)
• eclipse plugin now distributed in maven repository (#2710, rep by Vinod Mehra)
• (2008-07-07) jsp: reduce makeAll lock in MakeContainer/CompilingLoader for multithread (#2751, rep by Sri Satish)
• jsp: make JspPrecompileListener multithreaded (#2767, rep by stbu)
• admin: add check for PermGen free memory (#2760, rep by Andy Qu)
• admin: moved deadlock detection to ProManagement and enhanced logging (#2288, rep by Allen Servedio)
• admin: added TcpConnectionInfo for connection state and added to /resin-admin
• admin: restored logs to /resin-admin
• admin: added basic graphs to /resin-admin
• classloader: getResource/getResources issues with directories (#2763, rep by bregnvig)
• amber: basic @ElementCollection implementation (#2749, rep by Martin Aschoff)
• jsf: new JSF 'java' state serialization method introduced. Now supports methods 'hessian'-(default) and 'java'
• jsf: AjaxAnywhere fixes(#2644, rep by vladdy)
• quercus: missing synchronization in ModuleContext
• jms: add jndi/remote cluster client (#2476)
• boot: change -verbose display of CLASSPATH (#2751, rep by Martin Morawetz)
• jms: add backup to cluster queue (#2415)
• jms: add priority support to memory, file (#2433, rep by Malcolm)
• log: add rollover-cron to access-log (#2744, rep by Keith Fetterman)
• admin: add classpath to /resin-admin/config.php (#2750, rep by Martin Morawetz)
• jpa: limit improperly calculated (#2746, rep by Riccardo Cohen)
• jsp: content after forward should be ignored (#2748, rep by Vinod Mehra)
• session: update synchronization for ajax applications (#2333)
• plugin: win32 apache/iis timeout default needs to be greater than socket-timeout to avoid 503 (#2715, rep by bmeyns)
• xml: sax issue with Tapestry (#2723, rep by wirah)
• security: for ldap authentication, add security-authentication, security-principal and security-credentials (#2325, rep by Vinny)
• deploy: web-app-deploy should use dependency-check-interval, not redeploy-check-interval (#2745, rep by mzgubin)
• deploy: add command-line war deployment (#1167, rep by Serge Knystautas)
• quercus: include. include_once don't return a Boolean value (#2742, rep by kubazygmunt)
• database: after connection error in XA, the returned connection must still be the same object (#2708, rep by Takahiro Fukuda)
• win32: for services, avoid java restart on admin exit (#2701, rep by phenzler)
• jsf: fast-jsf is moved from jsp group to jsf group (<jsp fast-jsf='true'> becomes <jsf fast-jsf='true'>)
• session: add save-backup='false' to cluster store (#2626, rep by Allen Servedio)
• admin: add PortMX lifetime statistics (#2422, rep by Knut Forkalsrud)
• win32: lpt detection with jni (#2738, rep by T Fukuda)
• admin: resin-admin now allows start/stop/restart for webapps (#1882, rep by S Garrett)
• log: add hostname-dns-lookup for apache compatibility (#2732, rep by Michael O'Dea)
• admin: cpu-load for non-unix should not be logged (#2727, rep by Bradley Van Cleave)
• rewrite-dispatch: add absolute-target for forward (#2681, rep by Bill Au)
• rewrite-dispatch: add dispatcher-type for REQUEST, INCLUDE, FORWARD (#2675, rep by Vinod Mehra)
• (2008-06-15) jsp: jsp generation changes to reduce code size (#2347)
• log: added response.isCacheHit() for AbstractHttpResponse (#2733)
• classloader: scan of ext paths must only add directories and jars (#2659, rep by Brian Burke)
• classloader: windows updates to handled custom-modified class files (#2730, rep by axeon)
• jca: localTransactionStarted callback must not call LocalTransaction.begin (#2627, rep by Wesley)
• error: add development-mode-error-page to control error messages exposed to the user (#2714, rep by norlab)
• jsp: better handling of jsp classloading/compiling (#2702, rep by N. Maves)
• jsp: taglib needs to avoid Beans introspector to handle overloaded setters (#2634, rep by J. Reynaert)
• admin: test for alarm freeze failed for win32 dst updates, and was obsolete (#2509, rep by Michael Sengbusch)
• session: call sessionDestroy only on primary server (#2137, rep by Kai Virkki)
• security: custom ip-constraint extension IoC configuration issues (#2718, rep by Alex Victoria)
• quercus: "late static binding" implemented (static:: and get_called_class())
• quercus: extending SimpleXMLElement class fix
• quercus: self::$$var, self::$$var() fixes
• quercus: HessianPHP fixes (#2717, rep by M. Schmidt)
• quercus: When extending a built-in class (DOMXPath), parent constructor never gets called (#2362, rep by davidsklar)
• quercus: $HTTP_RAW_POST_DATA and "php://input" stream not implemented (#1770, rep by marlonj)
• quercus: Type casting fails to string fails (#2688, rep by rikus)
• cluster: distributed session writeback in separate threads (#2368, rep by resinossi)
• cluster: distributed objects now check hash for optimistic locking
• servlet: allow forward from include (#2481, rep by Ilya Kasnacheev and Huitang Li)
• vfs: windows getURL not properly converting /foo to file:/foo (#2725, rep by Vinod Mehra)
• cache: setStatus(500) needs to kill caching
• cache: avoid caching blank pages (#2610, rep by Shane Cruz)
• hessian: added FooSerializerFactory to handle legacy objects with non-zero constructors (#2584, rep by Matt Johnson)
• init: servlet init must have access to port mbean (#2683, rep by Vinod Mehra)
• ioc: synchronization on bean introspection (#2672, rep by Matthew Schmidt)
• ssl: synchronization issues with openssl init (#2712, rep by janecek)
• cache: InterruptedIOException needs to be treated like ClientDisconnectException and not stop cache (#2704, rep by Dmitry Zaburyanov)
• dynamicserver: add dynamic server support (#2314)
• boot: add watchdog-log/rollover-period (#2656, rep by Oscar Sumano)
• boot: log directory set by -log-directory and <watchdog-log> (#2685, rep by Jose Quinteiro)
• boot: log and admin need to relative to resin.root (#2682, rep by Maurice Volaski)
• security: authenticator stored in webapp as caucho.authenticator (#2686, rep by Anthony Blandran)
• database: driver-type needs to be an allowed database parameter (#2700, rep by altaman)
• quercus: readlink/realpath fixes for symlinks (#2175, rep by jumakill)
• quercus: grandparent super constructor callable by parent::B() (#2489)
• quercus: oci_fetch_all wasn't checking fetchArray return value properly (#1472, rep by osmedd)
• quercus: Foo:${${a}} support (#2666, rep by falko)
• quercus: spl_autoload fixes (#2367, rep by Torsten)
• quercus: ArrayListAdapter must not copy list (#2657, rep by skleinjung)
• quercus: describe issues with mysql_fetch_field_direct (#2541, rep by jarmstrong)
• quercus: mysql longvarchar issues in JdbcResultResource (#2606, rep by sgraf)
• quercus: setEscapeProcessing(false) for prepared statement not allowed by oracle (#2267, rep by sergpro)
• quercus: oci_new_connect was not working with a charset parameter (#2406, rep by ckchris)
• quercus: php://input for drupal (#2679, rep by M. Schmidt)
• quercus: allow_url_include and allow_url_fopen (#2690, rep by rhino4321)
• quercus: broken mysql_pconnect (#2671, rep by dberry)
• (2008-05-28) quercus: support for Java enum arguments (#2493)
• quercus: xml_parse with BOM (#2680)
• quercus: SERVER_ADDR and PHP_AUTH_USER (#2699, rep by perololo)
• quercus: apc_cache_info (#2696, rep by koreth)
• quercus: apc size configurable with apc.user_cache_hint (#2698, rep by koreth)
• quercus: unserialize cache key needs to be a softreference
• quercus: add ttf image handling (#1398, #2197, rep by dberry, koreth, perololo)
• quercus: support class definition in eval (#2547, rep by dobes_vendermeer)
• quercus: xml_parser_get_option type not correct for XML_OPTION_CASE_FOLDING (#1503, rep by at4u)
• quercus: NPE in StaticMethodExpr (#2678, rep by Matthew Schmidt)
• quercus: imagestringup (#2673, rep by rwankar)
• hessian: HessianOutput.flush() needs os.flush (rep by Dinesh Bolkensteyn)
• quercus: XMLWriter module (#2218, rep by koreth)
• quercus: hash module (#2122, rep by koreth)
• boot: init.resin.in script updates for debian (#2647, rep by wirah)
• classloader: add log when .jar is not readable (#2669, rep by chris_se)
• webapp: versioning wasn't handling ROOT-1.0.war properly (#2668, rep by A Servidio)
• windows: invocation decoding fixes
• (2008-05-17) quercus: cast with ResourceValue was sending fatal error instead of warning
• quercus: tempnam was not allowing short prefix for Seagull (#2663, rep by falko)
• quercus: cache include miss (#2196, rep by koreth)
• quercus: timestamp handling of 0000-00-00 with mysql driver (#2609, rep by sgraf)
• load balance: update load-balance-idle-time heuristic to increase gap to keepalive (#2660)
• mod_caucho: build issue with Apache 1.3 (#2655, rep by maxpil)
• quercus: new self needs to create the owning class (#2550, rep by mardala)
• quercus: top-level var not properly analyzed (#2303, rep by Dan)
• quercus: unset of global variables (#2259, rep by koreth)
• quercus: parser needs to use _peek instead of is.unread() for backtrack (#2432, rep by dkyriakis)
• quercus: fileperms on non-jni needs umask 002 (#2620, rep by B Youngblood)
• quercus: improved error message when javamail.jar missing (#2616, rep by B Youngblood)
• quercus: ctype fixes (#2436, rep by artenberg)
• proxy: ProxyServlet support for virtual hosts (#2639, rep by remilon)
• proxy: ProxyServlet support for x-forwarded-for (#2638, rep by remilon)
• proxy: ProxyServlet was not properly passing repeated headers (#2637, rep by remilon)
• admin: ping thread failure should only send page results at fine level (#2640, rep by remilon)
• quercus: mantis issue with compress_handler missing (ob_start callback) (#2575, rep by stargazer)
• quercus: spl_autoload_register needs callback argument (#2590, #2192, rep by mikebevz)
• webbeans: amber loading timing issue with webbeans (#2642, rep by markus)
• quercus: missing synchronization on getJavaClassDefinition (#2632, rep by stbu)
• servlet: RequestWrapper needs to use getRequest() instead of _request (#2651, rep by azenkov)
• boot: resin-root not properly handled (#2652, rep by Alex Sharaz)
• amber: EntityManagerFactory init must be lazy for 3rd party providers (#2648, rep by wesley)