Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
lemonldap-ng
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
258
Issues
258
List
Boards
Labels
Service Desk
Milestones
Merge Requests
5
Merge Requests
5
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
LemonLDAP NG
lemonldap-ng
Commits
a61ef892
Commit
a61ef892
authored
Jan 29, 2016
by
Yadd
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Avoid object conflict
parent
6c6b582c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
20 deletions
+17
-20
Makefile
Makefile
+3
-2
lemonldap-ng-handler/lib/Lemonldap/NG/Handler/API.pm
lemonldap-ng-handler/lib/Lemonldap/NG/Handler/API.pm
+14
-18
No files found.
Makefile
View file @
a61ef892
...
...
@@ -318,7 +318,7 @@ start_web_server: all prepare_test_server
-
@[
-e
e2e-tests/conf/nginx.pid
]
&&
kill
`
cat
e2e-tests/conf/nginx.pid
`
||
true
-
@[
-e
e2e-tests/conf/plackup.pid
]
&&
kill
`
cat
e2e-tests/conf/plackup.pid
`
&&
rm
-f
e2e-tests/conf/plackup.pid
||
true
# Start web server
(
designed
for
Debian, path may be broken
else
)
if
test
"
$(TESTWEBSERVER)
"
=
"apache"
;
then
\
@
if
test
"
$(TESTWEBSERVER)
"
=
"apache"
;
then
\
LLNG_DEFAULTCONFFILE
=
`
pwd
`
/e2e-tests/conf/lemonldap-ng.ini /usr/sbin/apache2
-d
`
pwd
`
/e2e-tests
-f
apache2.conf
-k
start
;
\
elif
test
"
$(TESTWEBSERVER)
"
=
"nginx"
;
then
\
echo
"Launching nginx"
;
\
...
...
@@ -331,7 +331,8 @@ start_web_server: all prepare_test_server
--pidfile
e2e-tests/conf/plackup.pid
\
-d
`
pwd
`
-b
-m
\
--exec
/usr/bin/plackup
--
\
-s
FCGI
--listen
e2e-tests/conf/llng.sock
\
-s
FCGI
\
--listen
e2e-tests/conf/llng.sock
\
e2e-tests/handler-server.psgi
;
\
else
\
echo
"!!!!! Unknown test server:
$(TESTWEBSERVER)
!!!!!"
>
&2
;
\
...
...
lemonldap-ng-handler/lib/Lemonldap/NG/Handler/API.pm
View file @
a61ef892
...
...
@@ -32,8 +32,6 @@ BEGIN {
}
our
$mode
;
sub
AUTOLOAD
{
my
$func
=
$AUTOLOAD
;
$func
=~
s/^.*:://
;
...
...
@@ -42,24 +40,22 @@ sub AUTOLOAD {
# - Apache (modperl 2),
# - Apache (modperl1),
# - Nginx
unless
(
$mode
)
{
$mode
=
(
caller
(
6
)
and
(
caller
(
6
)
)[
0
]
eq
'
Lemonldap::NG::Handler::PSGI::Server
'
)
?
'
PSGI/Server
'
:
(
caller
(
6
)
and
(
caller
(
6
)
)[
0
]
=~
/Lemonldap::NG::Handler::PSGI/
)
?
'
PSGI
'
:
$ENV
{
GATEWAY_INTERFACE
}
?
'
CGI
'
:
(
MP
==
2
)
?
'
ApacheMP2
'
:
(
MP
==
1
)
?
'
ApacheMP1
'
:
$
main::
{'
nginx::
'}
?
'
Nginx
'
:
'
CGI
';
unless
(
$INC
{"
Lemonldap/NG/Handler/API/
$mode
.pm
"}
)
{
$mode
=~
s#/#::#g
;
eval
my
$mode
=
(
caller
(
6
)
and
(
caller
(
6
)
)[
0
]
eq
'
Lemonldap::NG::Handler::PSGI::Server
'
)
?
'
PSGI/Server
'
:
(
caller
(
6
)
and
(
caller
(
6
)
)[
0
]
=~
/Lemonldap::NG::Handler::PSGI/
)
?
'
PSGI
'
:
$ENV
{
GATEWAY_INTERFACE
}
?
'
CGI
'
:
(
MP
==
2
)
?
'
ApacheMP2
'
:
(
MP
==
1
)
?
'
ApacheMP1
'
:
$
main::
{'
nginx::
'}
?
'
Nginx
'
:
'
CGI
';
unless
(
$INC
{"
Lemonldap/NG/Handler/API/
$mode
.pm
"}
)
{
$mode
=~
s#/#::#g
;
eval
"
use Lemonldap::NG::Handler::API::
$mode
(':httpCodes', ':functions');
";
die
$@
if
(
$@
);
}
}
shift
;
return
"
Lemonldap::NG::Handler::API::
${mode}
"
->
$
{
func
}(
@
_
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment