Skip to content

Commit c2f8e90

Browse files
laruencelaruence
committed
Merge branch 'PHP-5.3' into PHP-5.4
2 parents 2feea39 + bc11e6f commit c2f8e90

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+45
-45
lines changed

‎ext/mysqlnd/mysqlnd.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
+----------------------------------------------------------------------+
33
| PHP Version 5 |
44
+----------------------------------------------------------------------+
5-
| Copyright (c) 2006-2012 The PHP Group |
5+
| Copyright (c) 2006-2013 The PHP Group |
66
+----------------------------------------------------------------------+
77
| This source file is subject to version 3.01 of the PHP license, |
88
| that is bundled with this package in the file LICENSE, and is |

‎ext/mysqlnd/mysqlnd.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
+----------------------------------------------------------------------+
33
| PHP Version 5 |
44
+----------------------------------------------------------------------+
5-
| Copyright (c) 2006-2012 The PHP Group |
5+
| Copyright (c) 2006-2013 The PHP Group |
66
+----------------------------------------------------------------------+
77
| This source file is subject to version 3.01 of the PHP license, |
88
| that is bundled with this package in the file LICENSE, and is |

‎ext/mysqlnd/mysqlnd_block_alloc.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
+----------------------------------------------------------------------+
33
| PHP Version 5 |
44
+----------------------------------------------------------------------+
5-
| Copyright (c) 2006-2012 The PHP Group |
5+
| Copyright (c) 2006-2013 The PHP Group |
66
+----------------------------------------------------------------------+
77
| This source file is subject to version 3.01 of the PHP license, |
88
| that is bundled with this package in the file LICENSE, and is |

‎ext/mysqlnd/mysqlnd_block_alloc.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
+----------------------------------------------------------------------+
33
| PHP Version 5 |
44
+----------------------------------------------------------------------+
5-
| Copyright (c) 2006-2012 The PHP Group |
5+
| Copyright (c) 2006-2013 The PHP Group |
66
+----------------------------------------------------------------------+
77
| This source file is subject to version 3.01 of the PHP license, |
88
| that is bundled with this package in the file LICENSE, and is |

‎ext/mysqlnd/mysqlnd_charset.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
+----------------------------------------------------------------------+
33
| PHP Version 5 |
44
+----------------------------------------------------------------------+
5-
| Copyright (c) 2006-2012 The PHP Group |
5+
| Copyright (c) 2006-2013 The PHP Group |
66
+----------------------------------------------------------------------+
77
| This source file is subject to version 3.01 of the PHP license, |
88
| that is bundled with this package in the file LICENSE, and is |

‎ext/mysqlnd/mysqlnd_charset.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
+----------------------------------------------------------------------+
33
| PHP Version 5 |
44
+----------------------------------------------------------------------+
5-
| Copyright (c) 2006-2012 The PHP Group |
5+
| Copyright (c) 2006-2013 The PHP Group |
66
+----------------------------------------------------------------------+
77
| This source file is subject to version 3.01 of the PHP license, |
88
| that is bundled with this package in the file LICENSE, and is |

‎ext/mysqlnd/mysqlnd_debug.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
+----------------------------------------------------------------------+
33
| PHP Version 5 |
44
+----------------------------------------------------------------------+
5-
| Copyright (c) 2006-2012 The PHP Group |
5+
| Copyright (c) 2006-2013 The PHP Group |
66
+----------------------------------------------------------------------+
77
| This source file is subject to version 3.01 of the PHP license, |
88
| that is bundled with this package in the file LICENSE, and is |

‎ext/mysqlnd/mysqlnd_debug.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
+----------------------------------------------------------------------+
33
| PHP Version 5 |
44
+----------------------------------------------------------------------+
5-
| Copyright (c) 2006-2012 The PHP Group |
5+
| Copyright (c) 2006-2013 The PHP Group |
66
+----------------------------------------------------------------------+
77
| This source file is subject to version 3.01 of the PHP license, |
88
| that is bundled with this package in the file LICENSE, and is |

‎ext/mysqlnd/mysqlnd_enum_n_def.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
+----------------------------------------------------------------------+
33
| PHP Version 5 |
44
+----------------------------------------------------------------------+
5-
| Copyright (c) 2006-2012 The PHP Group |
5+
| Copyright (c) 2006-2013 The PHP Group |
66
+----------------------------------------------------------------------+
77
| This source file is subject to version 3.01 of the PHP license, |
88
| that is bundled with this package in the file LICENSE, and is |

‎ext/mysqlnd/mysqlnd_libmysql_compat.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
+----------------------------------------------------------------------+
33
| PHP Version 5 |
44
+----------------------------------------------------------------------+
5-
| Copyright (c) 2006-2012 The PHP Group |
5+
| Copyright (c) 2006-2013 The PHP Group |
66
+----------------------------------------------------------------------+
77
| This source file is subject to version 3.01 of the PHP license, |
88
| that is bundled with this package in the file LICENSE, and is |

‎ext/mysqlnd/mysqlnd_loaddata.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
+----------------------------------------------------------------------+
33
| PHP Version 5 |
44
+----------------------------------------------------------------------+
5-
| Copyright (c) 2006-2012 The PHP Group |
5+
| Copyright (c) 2006-2013 The PHP Group |
66
+----------------------------------------------------------------------+
77
| This source file is subject to version 3.01 of the PHP license, |
88
| that is bundled with this package in the file LICENSE, and is |

‎ext/mysqlnd/mysqlnd_net.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
+----------------------------------------------------------------------+
33
| PHP Version 5 |
44
+----------------------------------------------------------------------+
5-
| Copyright (c) 2006-2012 The PHP Group |
5+
| Copyright (c) 2006-2013 The PHP Group |
66
+----------------------------------------------------------------------+
77
| This source file is subject to version 3.01 of the PHP license, |
88
| that is bundled with this package in the file LICENSE, and is |

‎ext/mysqlnd/mysqlnd_net.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
+----------------------------------------------------------------------+
33
| PHP Version 5 |
44
+----------------------------------------------------------------------+
5-
| Copyright (c) 2006-2012 The PHP Group |
5+
| Copyright (c) 2006-2013 The PHP Group |
66
+----------------------------------------------------------------------+
77
| This source file is subject to version 3.01 of the PHP license, |
88
| that is bundled with this package in the file LICENSE, and is |

‎ext/mysqlnd/mysqlnd_priv.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
+----------------------------------------------------------------------+
33
| PHP Version 5 |
44
+----------------------------------------------------------------------+
5-
| Copyright (c) 2006-2012 The PHP Group |
5+
| Copyright (c) 2006-2013 The PHP Group |
66
+----------------------------------------------------------------------+
77
| This source file is subject to version 3.01 of the PHP license, |
88
| that is bundled with this package in the file LICENSE, and is |

‎ext/mysqlnd/mysqlnd_ps.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
+----------------------------------------------------------------------+
33
| PHP Version 5 |
44
+----------------------------------------------------------------------+
5-
| Copyright (c) 2006-2012 The PHP Group |
5+
| Copyright (c) 2006-2013 The PHP Group |
66
+----------------------------------------------------------------------+
77
| This source file is subject to version 3.01 of the PHP license, |
88
| that is bundled with this package in the file LICENSE, and is |

‎ext/mysqlnd/mysqlnd_ps_codec.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
+----------------------------------------------------------------------+
33
| PHP Version 5 |
44
+----------------------------------------------------------------------+
5-
| Copyright (c) 2006-2012 The PHP Group |
5+
| Copyright (c) 2006-2013 The PHP Group |
66
+----------------------------------------------------------------------+
77
| This source file is subject to version 3.01 of the PHP license, |
88
| that is bundled with this package in the file LICENSE, and is |

‎ext/mysqlnd/mysqlnd_result.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
+----------------------------------------------------------------------+
33
| PHP Version 5 |
44
+----------------------------------------------------------------------+
5-
| Copyright (c) 2006-2012 The PHP Group |
5+
| Copyright (c) 2006-2013 The PHP Group |
66
+----------------------------------------------------------------------+
77
| This source file is subject to version 3.01 of the PHP license, |
88
| that is bundled with this package in the file LICENSE, and is |

‎ext/mysqlnd/mysqlnd_result.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
+----------------------------------------------------------------------+
33
| PHP Version 5 |
44
+----------------------------------------------------------------------+
5-
| Copyright (c) 2006-2012 The PHP Group |
5+
| Copyright (c) 2006-2013 The PHP Group |
66
+----------------------------------------------------------------------+
77
| This source file is subject to version 3.01 of the PHP license, |
88
| that is bundled with this package in the file LICENSE, and is |

‎ext/mysqlnd/mysqlnd_result_meta.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
+----------------------------------------------------------------------+
33
| PHP Version 5 |
44
+----------------------------------------------------------------------+
5-
| Copyright (c) 2006-2012 The PHP Group |
5+
| Copyright (c) 2006-2013 The PHP Group |
66
+----------------------------------------------------------------------+
77
| This source file is subject to version 3.01 of the PHP license, |
88
| that is bundled with this package in the file LICENSE, and is |

‎ext/mysqlnd/mysqlnd_result_meta.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
+----------------------------------------------------------------------+
33
| PHP Version 5 |
44
+----------------------------------------------------------------------+
5-
| Copyright (c) 2006-2012 The PHP Group |
5+
| Copyright (c) 2006-2013 The PHP Group |
66
+----------------------------------------------------------------------+
77
| This source file is subject to version 3.01 of the PHP license, |
88
| that is bundled with this package in the file LICENSE, and is |

‎ext/mysqlnd/mysqlnd_statistics.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
+----------------------------------------------------------------------+
33
| PHP Version 5 |
44
+----------------------------------------------------------------------+
5-
| Copyright (c) 2006-2012 The PHP Group |
5+
| Copyright (c) 2006-2013 The PHP Group |
66
+----------------------------------------------------------------------+
77
| This source file is subject to version 3.01 of the PHP license, |
88
| that is bundled with this package in the file LICENSE, and is |

‎ext/mysqlnd/mysqlnd_statistics.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
+----------------------------------------------------------------------+
33
| PHP Version 5 |
44
+----------------------------------------------------------------------+
5-
| Copyright (c) 2006-2012 The PHP Group |
5+
| Copyright (c) 2006-2013 The PHP Group |
66
+----------------------------------------------------------------------+
77
| This source file is subject to version 3.01 of the PHP license, |
88
| that is bundled with this package in the file LICENSE, and is |

‎ext/mysqlnd/mysqlnd_structs.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
+----------------------------------------------------------------------+
33
| PHP Version 5 |
44
+----------------------------------------------------------------------+
5-
| Copyright (c) 2006-2012 The PHP Group |
5+
| Copyright (c) 2006-2013 The PHP Group |
66
+----------------------------------------------------------------------+
77
| This source file is subject to version 3.01 of the PHP license, |
88
| that is bundled with this package in the file LICENSE, and is |

‎ext/mysqlnd/mysqlnd_wireprotocol.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
+----------------------------------------------------------------------+
33
| PHP Version 5 |
44
+----------------------------------------------------------------------+
5-
| Copyright (c) 2006-2012 The PHP Group |
5+
| Copyright (c) 2006-2013 The PHP Group |
66
+----------------------------------------------------------------------+
77
| This source file is subject to version 3.01 of the PHP license, |
88
| that is bundled with this package in the file LICENSE, and is |

‎ext/mysqlnd/mysqlnd_wireprotocol.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
+----------------------------------------------------------------------+
33
| PHP Version 5 |
44
+----------------------------------------------------------------------+
5-
| Copyright (c) 2006-2012 The PHP Group |
5+
| Copyright (c) 2006-2013 The PHP Group |
66
+----------------------------------------------------------------------+
77
| This source file is subject to version 3.01 of the PHP license, |
88
| that is bundled with this package in the file LICENSE, and is |

‎ext/mysqlnd/php_mysqlnd.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
+----------------------------------------------------------------------+
33
| PHP Version 5 |
44
+----------------------------------------------------------------------+
5-
| Copyright (c) 2006-2012 The PHP Group |
5+
| Copyright (c) 2006-2013 The PHP Group |
66
+----------------------------------------------------------------------+
77
| This source file is subject to version 3.01 of the PHP license, |
88
| that is bundled with this package in the file LICENSE, and is |

‎ext/mysqlnd/php_mysqlnd.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
+----------------------------------------------------------------------+
33
| PHP Version 5 |
44
+----------------------------------------------------------------------+
5-
| Copyright (c) 2006-2012 The PHP Group |
5+
| Copyright (c) 2006-2013 The PHP Group |
66
+----------------------------------------------------------------------+
77
| This source file is subject to version 3.01 of the PHP license, |
88
| that is bundled with this package in the file LICENSE, and is |

‎ext/phar/dirstream.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
+----------------------------------------------------------------------+
33
| phar:// stream wrapper support |
44
+----------------------------------------------------------------------+
5-
| Copyright (c) 2005-2012 The PHP Group |
5+
| Copyright (c) 2005-2013 The PHP Group |
66
+----------------------------------------------------------------------+
77
| This source file is subject to version 3.01 of the PHP license, |
88
| that is bundled with this package in the file LICENSE, and is |

‎ext/phar/dirstream.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
+----------------------------------------------------------------------+
33
| phar php single-file executable PHP extension |
44
+----------------------------------------------------------------------+
5-
| Copyright (c) 2006-2012 The PHP Group |
5+
| Copyright (c) 2006-2013 The PHP Group |
66
+----------------------------------------------------------------------+
77
| This source file is subject to version 3.01 of the PHP license, |
88
| that is bundled with this package in the file LICENSE, and is |

‎ext/phar/func_interceptors.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
+----------------------------------------------------------------------+
33
| phar php single-file executable PHP extension |
44
+----------------------------------------------------------------------+
5-
| Copyright (c) 2005-2012 The PHP Group |
5+
| Copyright (c) 2005-2013 The PHP Group |
66
+----------------------------------------------------------------------+
77
| This source file is subject to version 3.01 of the PHP license, |
88
| that is bundled with this package in the file LICENSE, and is |

‎ext/phar/func_interceptors.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
+----------------------------------------------------------------------+
33
| phar php single-file executable PHP extension |
44
+----------------------------------------------------------------------+
5-
| Copyright (c) 2006-2012 The PHP Group |
5+
| Copyright (c) 2006-2013 The PHP Group |
66
+----------------------------------------------------------------------+
77
| This source file is subject to version 3.01 of the PHP license, |
88
| that is bundled with this package in the file LICENSE, and is |

‎ext/phar/phar.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
+----------------------------------------------------------------------+
33
| phar php single-file executable PHP extension |
44
+----------------------------------------------------------------------+
5-
| Copyright (c) 2005-2012 The PHP Group |
5+
| Copyright (c) 2005-2013 The PHP Group |
66
+----------------------------------------------------------------------+
77
| This source file is subject to version 3.01 of the PHP license, |
88
| that is bundled with this package in the file LICENSE, and is |

0 commit comments

Comments
 (0)