debian/0000755000000000000000000000000012151703314007163 5ustar debian/gbp.conf0000644000000000000000000000003712151703314010602 0ustar [DEFAULT] pristine-tar = False debian/rules0000755000000000000000000000031112151703314010236 0ustar #!/usr/bin/make -f CFLAGS = -DCACHE_FILENAME=\\\"/var/cache/apache2/upload_progress_cache\\\" %: dh $@ --with apache2 override_dh_auto_install: echo "Just let dh_install handle the installation." debian/libapache2-mod-upload-progress.apache20000644000000000000000000000010112151703314016273 0ustar mod .libs/mod_upload_progress.so mod debian/upload_progress.load debian/control0000644000000000000000000000163012151703314010566 0ustar Source: apache-upload-progress-module Section: httpd Priority: optional Maintainer: Jérémy Bobbio Build-Depends: debhelper (>= 7.0.50~), apache2-dev (>= 2.4.1-1~) Standards-Version: 3.9.4 Homepage: http://github.com/drogus/apache-upload-progress-module/ Vcs-Git: git://git.debian.org/collab-maint/apache-upload-progress-module.git Vcs-Browser: http://git.debian.org/?p=collab-maint/apache-upload-progress-module.git Package: libapache2-mod-upload-progress Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: upload progress support for the Apache web server mod_upload_progress enables monitoring the status of HTTP file uploads. . Website authors can then query the server using Javascript to provide better feedback (e.g. progress bar, throughput) while the browser is uploading. . This module produces output similar to the equivalent modules for other webservers. debian/libapache2-mod-upload-progress.docs0000644000000000000000000000000712151703314015725 0ustar README debian/upload.html0000644000000000000000000000542412151703314011342 0ustar mod_upload_progress test page

mod_upload_progress test page

 
(throughput)

   
debian/compat0000644000000000000000000000000212151703314010361 0ustar 7 debian/upload_progress.load0000644000000000000000000000012212151703314013227 0ustar LoadModule upload_progress_module /usr/lib/apache2/modules/mod_upload_progress.so debian/README.Debian0000644000000000000000000000151212151703314011223 0ustar mod_upload_progress for Debian ============================== The following configuration snippet (to be added in a section) tracks upload made to "/upload.html", with progress data available on "/progress": # enable tracking uploads in /upload.html TrackUploads On # enable upload progress reports in /progress ReportUploads On This configuration should be enough to test upload progress, once `/usr/share/doc/libapache2-mod-upload-progress/examples/upload.html` is available at "/upload.html" (for example by copying it to `/var/www`). This example web page mostly borrows from the code snippets available at: * http://wiki.nginx.org/NginxHttpUploadProgressModule * http://blog.lighttpd.net/articles/2006/08/01/mod_uploadprogress-is-back debian/copyright0000644000000000000000000000311512151703314011116 0ustar Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135 Name: apache-upload-progress-module Maintainer: Piotr Sarnacki Source: http://github.com/drogus/apache-upload-progress-module/ Files: * Copyright: 2008-2010, Piotr Sarnacki License: Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: . The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. . THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. Files: debian/* Copyright: 2010, Jérémy Bobbio License: Copying and distribution of this package, with or without modification, are permitted in any medium without royalty provided the copyright notice and this notice are preserved. debian/changelog0000644000000000000000000000340512151703314011037 0ustar apache-upload-progress-module (0.2-2) unstable; urgency=low * Upload to unstable. (Closes: #709466) * Change section to httpd to align with ftpmaster choices. * Bump Standards-Version to 3.9.4, no changes required. * Update debian/watch, thanks to Bart Martens. -- Jérémy Bobbio Thu, 30 May 2013 19:02:02 +0200 apache-upload-progress-module (0.2-1) experimental; urgency=low * New upstream release (identical to previous snapshot). * Transition to Apache 2.4: (Closes: #666819) - Update Build-Depends for Apache 2.4. - Switch to dh_apache2. - Add compatibility patches. * Add git-buildpackage configuration file. * Bump Standards-Version to 3.9.3, no changes required. -- Jérémy Bobbio Fri, 06 Apr 2012 12:44:18 +0200 apache-upload-progress-module (0.1+git20110718-1) unstable; urgency=low * New upstream snapshot. * Do not mention Nginx and lighttpd in extended description. (Closes: #610805) * Fix spelling error in extended description spotted by lintian. * Bump Standards-Version to 3.9.2, no changes required. -- Jérémy Bobbio Tue, 19 Jul 2011 18:41:47 +0200 apache-upload-progress-module (0.1+git20110203-1) unstable; urgency=low * New upstream snapshot. * Fix debian/watch file. * Use upstream Makefile to build the module. * Put SHM file in /var/cache/apache2 instead of /tmp. * Add Vcs-* fields to debian/control. * Bump Standards-Version to 3.9.1, no changes required. -- Jérémy Bobbio Fri, 11 Feb 2011 10:55:10 +0100 apache-upload-progress-module (0.1+git20100316-1) unstable; urgency=low * Initial release. (Closes: #587218) -- Jérémy Bobbio Sat, 26 Jun 2010 14:53:37 +0200 debian/source/0000755000000000000000000000000012151703314010463 5ustar debian/source/format0000644000000000000000000000001412151703314011671 0ustar 3.0 (quilt) debian/watch0000644000000000000000000000014512151703314010214 0ustar version=3 https://github.com/drogus/apache-upload-progress-module/tags .*/archive/v?(\d\S*)\.tar\.gz debian/patches/0000755000000000000000000000000012151703314010612 5ustar debian/patches/0002-unixd_-functions-are-prefixed-with-ap_-in-Apache-2.4.patch0000644000000000000000000000326012151703314023652 0ustar From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Bobbio?= Date: Fri, 6 Apr 2012 13:36:20 +0200 Subject: unixd_* functions are prefixed with ap_ in Apache 2.4 Otherwise, the API is unchanged, so let's just add an extra define for older versions of Apache. --- ap_backports.h | 9 +++++++++ mod_upload_progress.c | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ap_backports.h b/ap_backports.h index b5ebbb0..e858bc8 100644 --- a/ap_backports.h +++ b/ap_backports.h @@ -1,3 +1,12 @@ +#include + +/** + * unixd_* functions are prefixed with ap_ since Apache 2.4 + */ +#if (AP_SERVER_MINORVERSION_NUMBER < 2) || ((AP_SERVER_MAJORVERSION_NUMBER == 2) && (AP_SERVER_MINORVERSION_NUMBER < 4)) +# define unixd_set_global_mutex_perms ap_unixd_set_global_mutex_perms +#endif + /** * This macro is not present in Apache HTTP server version 2.2.3 * Red-Hat 5 / CentOS 5 diff --git a/mod_upload_progress.c b/mod_upload_progress.c index c0b57f7..8bf3567 100644 --- a/mod_upload_progress.c +++ b/mod_upload_progress.c @@ -2,6 +2,7 @@ #include #include #include +#include #include #include #include @@ -617,7 +618,7 @@ static int upload_progress_init(apr_pool_t *p, apr_pool_t *plog, } #ifdef AP_NEED_SET_MUTEX_PERMS - result = unixd_set_global_mutex_perms(config->cache_lock); + result = ap_unixd_set_global_mutex_perms(config->cache_lock); if (result != APR_SUCCESS) { ap_log_error(APLOG_MARK, APLOG_CRIT, result, s, "Upload progress cache: failed to set mutex permissions"); debian/patches/series0000644000000000000000000000032512151703314012027 0ustar 0001-Add-support-for-Apache-2.4-log-API.patch 0002-unixd_-functions-are-prefixed-with-ap_-in-Apache-2.4.patch 0003-Add-missing-header-for-tolower-toupper.patch 0004-Add-missing-header-for-ap_hook_-functions.patch debian/patches/0004-Add-missing-header-for-ap_hook_-functions.patch0000644000000000000000000000106112151703314022146 0ustar From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Bobbio?= Date: Fri, 6 Apr 2012 13:41:55 +0200 Subject: Add missing header for ap_hook_* functions --- mod_upload_progress.c | 1 + 1 file changed, 1 insertion(+) diff --git a/mod_upload_progress.c b/mod_upload_progress.c index 65273ef..908677c 100644 --- a/mod_upload_progress.c +++ b/mod_upload_progress.c @@ -4,6 +4,7 @@ #include #include #include +#include #include #include #include debian/patches/0001-Add-support-for-Apache-2.4-log-API.patch0000644000000000000000000000144312151703314020047 0ustar From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Bobbio?= Date: Fri, 6 Apr 2012 13:23:15 +0200 Subject: Add support for Apache 2.4 log API --- mod_upload_progress.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mod_upload_progress.c b/mod_upload_progress.c index 9970b61..c0b57f7 100644 --- a/mod_upload_progress.c +++ b/mod_upload_progress.c @@ -61,8 +61,12 @@ # define ARG_MAXLEN_JSONPCALLBACK 64 #endif +#ifdef APLOG_USE_MODULE +APLOG_USE_MODULE(upload_progress); +#endif + #if UP_DEBUG > 0 -# if UP_DEBUG > 1 +# if !defined(APLOG_USE_MODULE) && UP_DEBUG > 1 # define up_log(m,s,err,srv,fmtstr,...) ap_log_error( m, s, err, srv, "pid:%" APR_PID_T_FMT " " fmtstr, getpid(), ##__VA_ARGS__ ) # else # define up_log(...) ap_log_error( __VA_ARGS__ ) debian/patches/0003-Add-missing-header-for-tolower-toupper.patch0000644000000000000000000000075712151703314021562 0ustar From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Bobbio?= Date: Fri, 6 Apr 2012 13:38:06 +0200 Subject: Add missing header for tolower()/toupper() --- mod_upload_progress.c | 1 + 1 file changed, 1 insertion(+) diff --git a/mod_upload_progress.c b/mod_upload_progress.c index 8bf3567..65273ef 100644 --- a/mod_upload_progress.c +++ b/mod_upload_progress.c @@ -1,4 +1,5 @@ #include +#include #include #include #include debian/libapache2-mod-upload-progress.examples0000644000000000000000000000002312151703314016611 0ustar debian/upload.html debian/README.source0000644000000000000000000000074512151703314011350 0ustar README.source for the apache-upload-progress-module package =========================================================== apache-upload-progress-module is using Git. The upstream 'master' branch is tracked in the 'upstream' branch of the Debian package repository. apache-upload-progress-module is managed in a Git repository using git-buildpackage (_without_ pristine-tar). It follows most of the advice provided by Russ Allbery at: http://www.eyrie.org/~eagle/notes/debian/git.html