Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Cherrypick [8184f39d803f9ad6|8184f39d]: Fix crash in /reports page, when compiling with recent gcc. (this is NOT an -O2 optimization bug!) |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | branch-1.33 |
| Files: | files | file ages | folders |
| SHA1: |
08709aa79cfd1552efd94824196da207 |
| User & Date: | jan.nijtmans 2015-06-02 09:17:00 |
Context
|
2015-06-02
| ||
| 09:17 | Cherrypick [8184f39d803f9ad6|8184f39d]: Fix crash in /reports page, when compiling with recent gcc. (this is NOT an -O2 optimization bug!) (Closed-Leaf check-in: 08709aa7 user: jan.nijtmans tags: branch-1.33) | |
| 08:17 | Fix crash in /reports page, when compiling with recent gcc. (this is NOT an -O2 optimization bug!) (check-in: 8184f39d user: jan.nijtmans tags: trunk) | |
|
2015-05-23
| ||
| 11:11 | Version 1.33 (check-in: 9c65b543 user: drh tags: trunk, release, version-1.33) | |
Changes
Changes to Dockerfile.
3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 |
###
FROM fedora:21
### Now install some additional parts we will need for the build
RUN yum update -y && yum install -y gcc make zlib-devel openssl-devel tar && yum clean all && groupadd -r fossil -g 433 && useradd -u 431 -r -g fossil -d /opt/fossil -s /sbin/nologin -c "Fossil user" fossil
### If you want to build "release", change the next line accordingly.
ENV FOSSIL_INSTALL_VERSION trunk
RUN curl "http://core.tcl.tk/tcl/tarball/tcl-src.tar.gz?name=tcl-src&uuid=release" | tar zx
RUN cd tcl-src/unix && ./configure --prefix=/usr --disable-shared --disable-threads --disable-load && make && make install
RUN curl "http://www.fossil-scm.org/index.html/tarball/fossil-src.tar.gz?name=fossil-src&uuid=${FOSSIL_INSTALL_VERSION}" | tar zx
RUN cd fossil-src && ./configure --disable-lineedit --disable-fusefs --json --with-th1-docs --with-th1-hooks --with-tcl
RUN cd fossil-src && make && strip fossil && cp fossil /usr/bin && cd .. && rm -rf fossil-src && chmod a+rx /usr/bin/fossil && mkdir -p /opt/fossil && chown fossil:fossil /opt/fossil
|
| |
3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 |
###
FROM fedora:21
### Now install some additional parts we will need for the build
RUN yum update -y && yum install -y gcc make zlib-devel openssl-devel tar && yum clean all && groupadd -r fossil -g 433 && useradd -u 431 -r -g fossil -d /opt/fossil -s /sbin/nologin -c "Fossil user" fossil
### If you want to build "release", change the next line accordingly.
ENV FOSSIL_INSTALL_VERSION branch-1.33
RUN curl "http://core.tcl.tk/tcl/tarball/tcl-src.tar.gz?name=tcl-src&uuid=release" | tar zx
RUN cd tcl-src/unix && ./configure --prefix=/usr --disable-shared --disable-threads --disable-load && make && make install
RUN curl "http://www.fossil-scm.org/index.html/tarball/fossil-src.tar.gz?name=fossil-src&uuid=${FOSSIL_INSTALL_VERSION}" | tar zx
RUN cd fossil-src && ./configure --disable-lineedit --disable-fusefs --json --with-th1-docs --with-th1-hooks --with-tcl
RUN cd fossil-src && make && strip fossil && cp fossil /usr/bin && cd .. && rm -rf fossil-src && chmod a+rx /usr/bin/fossil && mkdir -p /opt/fossil && chown fossil:fossil /opt/fossil
|
Changes to src/statrep.c.
689
690
691
692
693
694
695
696
697
698
699
700
701
702
...
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
|
*/
void stats_report_page(){
HQuery url; /* URL for various branch links */
const char *zView = P("view"); /* Which view/report to show. */
int eType = RPT_NONE; /* Numeric code for view/report to show */
int i; /* Loop counter */
const char *zUserName; /* Name of user */
const struct {
const char *zName; /* Name of view= screen type */
const char *zVal; /* Value of view= query parameter */
int eType; /* Corresponding RPT_* define */
} aViewType[] = {
{ "File Changes","byfile", RPT_BYFILE },
{ "By Month", "bymonth", RPT_BYMONTH },
................................................................................
break;
}
}
url_initialize(&url, "reports");
cgi_query_parameters_to_url(&url);
if( eType!=RPT_NONE ){
int nView = 0; /* Slots used in azView[] */
const char *azView[16]; /* Drop-down menu of view types */
for(i=0; i<ArraySize(aViewType); i++){
azView[nView++] = aViewType[i].zVal;
azView[nView++] = aViewType[i].zName;
}
if( eType!=RPT_BYFILE ){
style_submenu_multichoice("type", ArraySize(azType)/2, azType, 0);
}
|
>
<
|
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
...
730
731
732
733
734
735
736
737
738
739
740
741
742
743
|
*/
void stats_report_page(){
HQuery url; /* URL for various branch links */
const char *zView = P("view"); /* Which view/report to show. */
int eType = RPT_NONE; /* Numeric code for view/report to show */
int i; /* Loop counter */
const char *zUserName; /* Name of user */
const char *azView[16]; /* Drop-down menu of view types */
const struct {
const char *zName; /* Name of view= screen type */
const char *zVal; /* Value of view= query parameter */
int eType; /* Corresponding RPT_* define */
} aViewType[] = {
{ "File Changes","byfile", RPT_BYFILE },
{ "By Month", "bymonth", RPT_BYMONTH },
................................................................................
break;
}
}
url_initialize(&url, "reports");
cgi_query_parameters_to_url(&url);
if( eType!=RPT_NONE ){
int nView = 0; /* Slots used in azView[] */
for(i=0; i<ArraySize(aViewType); i++){
azView[nView++] = aViewType[i].zVal;
azView[nView++] = aViewType[i].zName;
}
if( eType!=RPT_BYFILE ){
style_submenu_multichoice("type", ArraySize(azType)/2, azType, 0);
}
|