diff options
| author | Anthony Ferrara <ircmaxell@gmail.com> | 2012-09-12 11:48:45 -0400 |
|---|---|---|
| committer | Anthony Ferrara <ircmaxell@gmail.com> | 2012-09-12 11:48:45 -0400 |
| commit | 3e383dc0d5d7eb957f6639ab38dd566e16bca92b (patch) | |
| tree | de03cafc9a8be0f61c0d17f05264ab5d81bc73d7 /ext/mysql/php_mysql.c | |
| parent | 76f3295cdfd6a3106297352e73b9691084582211 (diff) | |
| parent | 5246d6f02e52798e343bd5208692f1a5ed89b9d9 (diff) | |
| download | php-git-3e383dc0d5d7eb957f6639ab38dd566e16bca92b.tar.gz | |
Merge remote branch 'upstream/master' into hash_password
* upstream/master:
Generators & UPGRADING
Capitalize the warning message
Rearrange the codes, remove empty lines
Provide a specific error message if date.timezone value is invalid.
regenerate patch, and save a strlen
Fix the wrong use of snprintf which is introduced in 1d2f61904987133d542c68cd349cf313d0bef1c8
Fixed unintendent clearance of PHP_OUTPUT_ACTIVATED flag
Fix doc bug #63032 (Number of release in documentation).
fixed test for bug #52944 also for darwin
-enable VC11 (vc2012)
- Fixed bug #61767 (Shutdown functions not called in certain error situation) - Fixed bug #60909 (custom error handler throwing Exception + fatal error = no shutdown function)
year++
correct PHP version & year++
Correct PHP version
year++
- fix build, there was no tsrm context there, doing a fetch but this is horribly slow, this fix needs improvement (or simply add a TSRM context in the signature in master
- fix build, declarations must be 1st in a contextgit checkout -f master
Fixed bug #62907 (Double free when use traits)
Fixed bug #62991 (Segfault with generator and closure)
Diffstat (limited to 'ext/mysql/php_mysql.c')
0 files changed, 0 insertions, 0 deletions