Skip to content

Commit 8b7d4c1

Browse files
committed
Merge pull request #508
2 parents 4b49b1a + 7fbef00 commit 8b7d4c1

Some content is hidden

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

46 files changed

+644
-909
lines changed

phongo_compat.c

Lines changed: 14 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,18 @@
11
/*
2-
+---------------------------------------------------------------------------+
3-
| PHP Driver for MongoDB |
4-
+---------------------------------------------------------------------------+
5-
| Copyright 2013-2015 MongoDB, Inc. |
6-
| |
7-
| Licensed under the Apache License, Version 2.0 (the "License"); |
8-
| you may not use this file except in compliance with the License. |
9-
| You may obtain a copy of the License at |
10-
| |
11-
| http://www.apache.org/licenses/LICENSE-2.0 |
12-
| |
13-
| Unless required by applicable law or agreed to in writing, software |
14-
| distributed under the License is distributed on an "AS IS" BASIS, |
15-
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
16-
| See the License for the specific language governing permissions and |
17-
| limitations under the License. |
18-
+---------------------------------------------------------------------------+
19-
| Copyright (c) 2015 MongoDB, Inc. |
20-
+---------------------------------------------------------------------------+
21-
*/
22-
2+
* Copyright 2015-2017 MongoDB, Inc.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
2316

2417
/* Our Compatability header */
2518
#include "phongo_compat.h"

phongo_compat.h

Lines changed: 14 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,18 @@
11
/*
2-
+---------------------------------------------------------------------------+
3-
| PHP Driver for MongoDB |
4-
+---------------------------------------------------------------------------+
5-
| Copyright 2013-2015 MongoDB, Inc. |
6-
| |
7-
| Licensed under the Apache License, Version 2.0 (the "License"); |
8-
| you may not use this file except in compliance with the License. |
9-
| You may obtain a copy of the License at |
10-
| |
11-
| http://www.apache.org/licenses/LICENSE-2.0 |
12-
| |
13-
| Unless required by applicable law or agreed to in writing, software |
14-
| distributed under the License is distributed on an "AS IS" BASIS, |
15-
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
16-
| See the License for the specific language governing permissions and |
17-
| limitations under the License. |
18-
+---------------------------------------------------------------------------+
19-
| Copyright (c) 2015 MongoDB, Inc. |
20-
+---------------------------------------------------------------------------+
21-
*/
2+
* Copyright 2015-2017 MongoDB, Inc.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
2216

2317
#ifndef PHONGO_COMPAT_H
2418
#define PHONGO_COMPAT_H

php_bson.h

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,18 @@
11
/*
2-
+----------------------------------------------------------------------+
3-
| PHP Version 5 |
4-
+----------------------------------------------------------------------+
5-
| Copyright (c) 20142015 Hannes Magnusson |
6-
+----------------------------------------------------------------------+
7-
| This source file is subject to version 3.01 of the PHP license, |
8-
| that is bundled with this package in the file LICENSE, and is |
9-
| available through the world-wide-web at the following url: |
10-
| http://www.php.net/license/3_01.txt |
11-
| If you did not receive a copy of the PHP license and are unable to |
12-
| obtain it through the world-wide-web, please send a note to |
13-
| [email protected] so we can mail you a copy immediately. |
14-
+----------------------------------------------------------------------+
15-
| Author: Hannes Magnusson <[email protected]> |
16-
+----------------------------------------------------------------------+
17-
*/
18-
19-
/* $Id$ */
2+
* Copyright 2014-2017 MongoDB, Inc.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
2016

2117
#ifndef PHONGO_BSON_H
2218
#define PHONGO_BSON_H

php_phongo.c

Lines changed: 14 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,18 @@
11
/*
2-
+---------------------------------------------------------------------------+
3-
| PHP Driver for MongoDB |
4-
+---------------------------------------------------------------------------+
5-
| Copyright 2013-2015 MongoDB, Inc. |
6-
| |
7-
| Licensed under the Apache License, Version 2.0 (the "License"); |
8-
| you may not use this file except in compliance with the License. |
9-
| You may obtain a copy of the License at |
10-
| |
11-
| http://www.apache.org/licenses/LICENSE-2.0 |
12-
| |
13-
| Unless required by applicable law or agreed to in writing, software |
14-
| distributed under the License is distributed on an "AS IS" BASIS, |
15-
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
16-
| See the License for the specific language governing permissions and |
17-
| limitations under the License. |
18-
+---------------------------------------------------------------------------+
19-
| Copyright (c) 2014-2015 MongoDB, Inc. |
20-
+---------------------------------------------------------------------------+
21-
*/
2+
* Copyright 2014-2017 MongoDB, Inc.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
2216

2317
#ifdef HAVE_CONFIG_H
2418
# include "config.h"

php_phongo.h

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,18 @@
11
/*
2-
+----------------------------------------------------------------------+
3-
| PHP Version 5 |
4-
+----------------------------------------------------------------------+
5-
| Copyright (c) 2014-2015 Hannes Magnusson |
6-
+----------------------------------------------------------------------+
7-
| This source file is subject to version 3.01 of the PHP license, |
8-
| that is bundled with this package in the file LICENSE, and is |
9-
| available through the world-wide-web at the following url: |
10-
| http://www.php.net/license/3_01.txt |
11-
| If you did not receive a copy of the PHP license and are unable to |
12-
| obtain it through the world-wide-web, please send a note to |
13-
| [email protected] so we can mail you a copy immediately. |
14-
+----------------------------------------------------------------------+
15-
| Author: Hannes Magnusson <[email protected]> |
16-
+----------------------------------------------------------------------+
17-
*/
2+
* Copyright 2014-2017 MongoDB, Inc.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
1816

1917
#ifndef PHONGO_H
2018
#define PHONGO_H

php_phongo_classes.h

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,18 @@
11
/*
2-
+----------------------------------------------------------------------+
3-
| PHP Version 5 |
4-
+----------------------------------------------------------------------+
5-
| Copyright (c) 2014-2015 Hannes Magnusson |
6-
+----------------------------------------------------------------------+
7-
| This source file is subject to version 3.01 of the PHP license, |
8-
| that is bundled with this package in the file LICENSE, and is |
9-
| available through the world-wide-web at the following url: |
10-
| http://www.php.net/license/3_01.txt |
11-
| If you did not receive a copy of the PHP license and are unable to |
12-
| obtain it through the world-wide-web, please send a note to |
13-
| [email protected] so we can mail you a copy immediately. |
14-
+----------------------------------------------------------------------+
15-
| Author: Hannes Magnusson <[email protected]> |
16-
+----------------------------------------------------------------------+
17-
*/
2+
* Copyright 2014-2017 MongoDB, Inc.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
1816

1917
#ifndef PHONGO_CLASSES_H
2018
#define PHONGO_CLASSES_H

php_phongo_structs.h

Lines changed: 14 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,18 @@
11
/*
2-
+---------------------------------------------------------------------------+
3-
| PHP Driver for MongoDB |
4-
+---------------------------------------------------------------------------+
5-
| Copyright 2016 MongoDB, Inc. |
6-
| |
7-
| Licensed under the Apache License, Version 2.0 (the "License"); |
8-
| you may not use this file except in compliance with the License. |
9-
| You may obtain a copy of the License at |
10-
| |
11-
| http://www.apache.org/licenses/LICENSE-2.0 |
12-
| |
13-
| Unless required by applicable law or agreed to in writing, software |
14-
| distributed under the License is distributed on an "AS IS" BASIS, |
15-
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
16-
| See the License for the specific language governing permissions and |
17-
| limitations under the License. |
18-
+---------------------------------------------------------------------------+
19-
| Copyright (c) 2016 MongoDB, Inc. |
20-
+---------------------------------------------------------------------------+
21-
*/
2+
* Copyright 2015-2017 MongoDB, Inc.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
2216

2317
#ifndef PHONGO_STRUCTS_H
2418
#define PHONGO_STRUCTS_H

src/BSON/Binary.c

Lines changed: 14 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,18 @@
11
/*
2-
+---------------------------------------------------------------------------+
3-
| PHP Driver for MongoDB |
4-
+---------------------------------------------------------------------------+
5-
| Copyright 2013-2015 MongoDB, Inc. |
6-
| |
7-
| Licensed under the Apache License, Version 2.0 (the "License"); |
8-
| you may not use this file except in compliance with the License. |
9-
| You may obtain a copy of the License at |
10-
| |
11-
| http://www.apache.org/licenses/LICENSE-2.0 |
12-
| |
13-
| Unless required by applicable law or agreed to in writing, software |
14-
| distributed under the License is distributed on an "AS IS" BASIS, |
15-
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
16-
| See the License for the specific language governing permissions and |
17-
| limitations under the License. |
18-
+---------------------------------------------------------------------------+
19-
| Copyright (c) 2014-2015 MongoDB, Inc. |
20-
+---------------------------------------------------------------------------+
21-
*/
2+
* Copyright 2014-2017 MongoDB, Inc.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
2216

2317
#ifdef HAVE_CONFIG_H
2418
# include "config.h"

src/BSON/Decimal128.c

Lines changed: 14 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,18 @@
11
/*
2-
+---------------------------------------------------------------------------+
3-
| PHP Driver for MongoDB |
4-
+---------------------------------------------------------------------------+
5-
| Copyright 2013-2016 MongoDB, Inc. |
6-
| |
7-
| Licensed under the Apache License, Version 2.0 (the "License"); |
8-
| you may not use this file except in compliance with the License. |
9-
| You may obtain a copy of the License at |
10-
| |
11-
| http://www.apache.org/licenses/LICENSE-2.0 |
12-
| |
13-
| Unless required by applicable law or agreed to in writing, software |
14-
| distributed under the License is distributed on an "AS IS" BASIS, |
15-
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
16-
| See the License for the specific language governing permissions and |
17-
| limitations under the License. |
18-
+---------------------------------------------------------------------------+
19-
| Copyright (c) 2014-2016 MongoDB, Inc. |
20-
+---------------------------------------------------------------------------+
21-
*/
2+
* Copyright 2015-2017 MongoDB, Inc.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
2216

2317
#ifdef HAVE_CONFIG_H
2418
# include "config.h"

0 commit comments

Comments
 (0)