src/main/scala/s3/website/S3.scala in s3_website-2.9.0 vs src/main/scala/s3/website/S3.scala in s3_website-2.10.0

@@ -70,10 +70,10 @@
         } yield {
           val md = new ObjectMetadata()
           md setContentLength uploadFile.length
           md setContentType contentType
           upload.encodingOnS3.map(_ => "gzip") foreach md.setContentEncoding
-          val cacheControl: Option[String] = (upload.maxAge, config.cache_control) match {
+          val cacheControl: Option[String] = (upload.maxAge, upload.cacheControl) match {
             case (maxAge: Some[Int], cacheCtrl: Some[String]) =>
               logger.warn("Overriding the max_age setting with the cache_control setting")
               cacheCtrl
             case (_, cacheCtrl: Some[String]) =>
               cacheCtrl