Changeset 12897

Show
Ignore:
Timestamp:
10/23/11 00:06:57 (2 years ago)
Author:
tm1000
Message:

Merge branch 'develop' into freepbx210_local

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • modules/branches/2.10/endpointman/provisioning/.htaccess

    r12041 r12897  
    11RewriteEngine on 
    2 RewriteRule ([^/]+\.cfg) provision_processing.php?request=$1 [L] 
    3 RewriteRule ([^/]+\.tuz) provision_processing.php?request=$1 [L] 
    4 RewriteRule ([^/]+\.xml) provision_processing.php?request=$1 [L] 
    5 RewriteRule ([0-9a-f]{12}.*) provision_processing.php?request=$1 [L] 
     2RewriteRule ([^/]+\.cfg) p.php?request=$1 [L] 
     3RewriteRule ([^/]+\.tuz) p.php?request=$1 [L] 
     4RewriteRule ([^/]+\.xml) p.php?request=$1 [L] 
     5RewriteRule ([0-9a-f]{12}.*) p.php?request=$1 [L] 
    66 
    77RewriteCond %{THE_REQUEST} ^PUT* 
    8 RewriteRule /prov/[^/]+/([^/]+)\.log /prov/polycom_log.php?file=$1 
     8RewriteRule /prov/[^/]+/([^/]+)\.log p.php?file=$1