mirror of
				https://github.com/go-gitea/gitea.git
				synced 2025-11-03 08:02:36 +09:00 
			
		
		
		
	Raw text file view returns correct charset in content-type header if not utf-8
This commit is contained in:
		@@ -26,11 +26,18 @@ func ServeBlob(ctx *middleware.Context, blob *git.Blob) error {
 | 
				
			|||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	_, isTextFile := base.IsTextFile(buf)
 | 
						_, isTextFile := base.IsTextFile(buf)
 | 
				
			||||||
 | 
						if isTextFile {
 | 
				
			||||||
 | 
							charset, _ := base.DetectEncoding(buf)
 | 
				
			||||||
 | 
							if charset != "utf-8" {
 | 
				
			||||||
 | 
								ctx.Resp.Header().Set("Content-Type", "text/plain; charset="+charset)
 | 
				
			||||||
 | 
							}
 | 
				
			||||||
 | 
						} else {
 | 
				
			||||||
		_, isImageFile := base.IsImageFile(buf)
 | 
							_, isImageFile := base.IsImageFile(buf)
 | 
				
			||||||
	if !isTextFile && !isImageFile {
 | 
							if !isImageFile {
 | 
				
			||||||
			ctx.Resp.Header().Set("Content-Disposition", "attachment; filename="+path.Base(ctx.Repo.TreeName))
 | 
								ctx.Resp.Header().Set("Content-Disposition", "attachment; filename="+path.Base(ctx.Repo.TreeName))
 | 
				
			||||||
			ctx.Resp.Header().Set("Content-Transfer-Encoding", "binary")
 | 
								ctx.Resp.Header().Set("Content-Transfer-Encoding", "binary")
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
	ctx.Resp.Write(buf)
 | 
						ctx.Resp.Write(buf)
 | 
				
			||||||
	_, err = io.Copy(ctx.Resp, dataRc)
 | 
						_, err = io.Copy(ctx.Resp, dataRc)
 | 
				
			||||||
	return err
 | 
						return err
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user