Request #19827	pass filename to _addFile function - downstream patch
... and minor whitespace, CS fixes
Merge pull request #5 from pear/19827

Request #19827	pass filename to _addFile function - downstream patch