Use during connect the flags set with set_client_option()
Merge branch 'PHP-5.3' into PHP-5.4
fix compilation error after merge