A four-day riot that left six inmates dead and exposed security failings at Afghanistan's main prison ended today after 1,300 prisoners who had run amok in their cell block surrendered to authorities.