fix protos
Merge branch 'PHP-5.5'

* PHP-5.5:
  fix protos